Skip to content

Commit 5169556

Browse files
heiglandreasheiglandreas
committed
Merge pull request #125 from heiglandreas/feature/integrateBower
Adds bower-integration
2 parents 9404c6e + c56a4de commit 5169556

File tree

240 files changed

+223
-53325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+223
-53325
lines changed

Diff for: ‎.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "src/public/lib"
3+
}

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ src/config/autoload/*.local.php
77
*.ini
88
*.properties
99
phpunit.xml
10+
src/public/lib
11+
build.property

Diff for: ‎bower.json

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"name": "php.ug",
3+
"version": "1.0.0",
4+
"homepage": "https://github.com/php_ug/php.ug",
5+
"authors": [
6+
"Andreas Heigl <[email protected]>"
7+
],
8+
"main": "public/index.php",
9+
"license": "MIT",
10+
"private": true,
11+
"ignore": [
12+
"**/.*",
13+
"node_modules",
14+
"bower_components",
15+
"src/public/lib",
16+
"test",
17+
"tests"
18+
],
19+
"dependencies": {
20+
"jquery": "~2.1.3",
21+
"bootstrap": "~3.3.1",
22+
"fontawesome": "~4.2.0",
23+
"leaflet": "~0.7.3",
24+
"icomoon": "~0.0.3",
25+
"leaflet-layerjson": "~0.1.5",
26+
"leaflet-search": "~1.5.6",
27+
"overlapping_marker_spiderfier-leaflet": "~0.2.6",
28+
"fullcalendar": "~2.2.5",
29+
"jbox": "~0.3.2",
30+
"html5shiv": "~3.7.2",
31+
"jquery-cookie": "~1.4.1"
32+
}
33+
}

Diff for: ‎build.property.dist

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
;; Propertyfile for phing
2+
;;
3+
;;
4+
; deploy.target
5+
deploy.target = server:port
6+
;
7+
; deploy.user
8+
deploy.user = user
9+
;
10+
; deployLocation
11+
deploy.location = /path
12+
;
13+
; deploy.post_deploy_script
14+
; the script will be called relative to the deploy.path
15+
deploy.post_deploy_script = deploy_post.sh
16+
;
17+
; deploy.local_folder
18+
deploy.local_folder = deploy2
19+
;
20+
;
21+
deploy.pre_deploy_script = deploy_pre.sh
22+
;
23+
; deploy.method
24+
; can be one of
25+
; copy - Copy the stuff via scp to the server
26+
; sync - Sync the stuff cia rsync to the server.
27+
deploy.method = copy
28+
;
29+
;
30+
deploy.path_to_rsync = /usr/bin/rsync
31+
;
32+
;
33+
deploy.identity_file = ~/.ssh/id_rsa
34+

Diff for: ‎build.xml

+95
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
-->
3737
<project name="php.ug" default="build" basedir=".">
3838

39+
<property file="./build.property"/>
40+
<property file="./build.property.dist"/>
41+
3942
<target name="update">
4043
<echo message="Updating composer-binary"/>
4144
<exec command="composer self-update"/>
@@ -53,4 +56,96 @@
5356
</batchtest>
5457
</phpunit>
5558
</target>
59+
60+
<target name="build">
61+
62+
</target>
63+
64+
<target name="updatePhp">
65+
<composer command="install"/>
66+
</target>
67+
68+
<target name="updateAssets">
69+
<exec command="bower install"/>
70+
</target>
71+
72+
<target name="createDeployFolder">
73+
<mkdir dir="${deploy.local_folder}" />
74+
<copy todir="${deploy.local_folder}">
75+
<fileset dir=".">
76+
<include name="LICENSE" />
77+
<include name="README.md" />
78+
<include name="src/**" />
79+
<include name="vendor/**" />
80+
<exclude name=".git"/>
81+
<exclude name="doc" />
82+
<exclude name="tests" />
83+
</fileset>
84+
</copy>
85+
<!--mkdir dir="log" /-->
86+
<!--mkdir dir="tmp" /-->
87+
</target>
88+
89+
<target name="copyDeployFolderToServer">
90+
<echo>Copying files to target ${deploy.target}</echo>
91+
<exec command="ssh -i ${deploy.identity_file} ${deploy.user}@${deploy.target} 'mkdir -p ${deploy.location}'" />
92+
<exec dir="${deploy.local_folder}" command="scp -rv ./* $deploy.user@${deploy.target}:${deploy.location}" />
93+
</target>
94+
95+
<target name="syncDeployFolderToServer">
96+
<echo>Synching files to target ${deploy.target}</echo>
97+
<exec command="ssh -i ${deploy.identity_file} ${deploy.user}@${deploy.target} 'mkdir -p ${deploy.location}'" />
98+
<filesync destinationDir="${deploy.user}@${deploy.target}:${deploy.location}"
99+
rsyncPath="${deploy.path_to_rsync}"
100+
sourceDir="${deploy.local_folder}/."
101+
checksum="true"
102+
options="-e 'ssh -i ${deploy.identity_file}' -aKz"
103+
/>
104+
</target>
105+
106+
<target name="callPostDeployScriptOnServer">
107+
<echo>Calling post-deploy-script on target ${deploy.target}</echo>
108+
<exec command="ssh -i ${deploy.identity_file} ${deploy.user}@${deploy.target} '${deploy.location}/${deploy.post_deploy_script}'"/>
109+
</target>
110+
111+
<target name="callPreDeployScriptOnServer" >
112+
<available property="deploy.pre_deploy_script_exists" file="${deploy.local_folder}/${deploy.pre_deploy_script}"/>
113+
<if>
114+
<isset property="deploy.pre_deploy_script_exists"/>
115+
<then>
116+
<echo>Calling pre-deploy-script on target ${deploy.target}</echo>
117+
<loadfile property="deploy.pre_deploy_script_content" file="${deploy.local_folder}/${deploy.pre_deploy_script}"/>
118+
<exec command="ssh -i ${deploy.identity_file} ${deploy.user}@${deploy.target} '${deploy.pre_deploy_script_content}'"/>
119+
</then>
120+
</if>
121+
</target>
122+
123+
<target name="deployFolderToServer">
124+
<if>
125+
<equals arg1="sync" arg2="${deploy.method}"/>
126+
<then>
127+
<phingcall inheritAll="true" target="syncDeployFolderToServer"/>
128+
</then>
129+
<elseif>
130+
<equals arg1="copy" arg2="${deploy.method}"/>
131+
<then>
132+
<phingcall target="copyDeployFolderToServer" inheritAll="true"/>
133+
</then>
134+
</elseif>
135+
</if>
136+
</target>
137+
138+
<target name="removeDeployFolder">
139+
<delete dir="${deploy.local_folder}" includeemptydirs="true"/>
140+
</target>
141+
142+
<target name="deploy" depends="update, updateAssets">
143+
<echo>Deploying application</echo>
144+
<phingcall inheritAll="true" target="createDeployFolder"/>
145+
<phingcall inheritAll="true" target="callPreDeployScriptOnServer"/>
146+
<phingcall inheritAll="true" target="deployFolderToServer"/>
147+
<phingcall inheritAll="true" target="callPostDeployScriptOnServer"/>
148+
<phingcall inheritAll="true" target="removeDeployFolder"/>
149+
</target>
150+
56151
</project>

Diff for: ‎composer.json

+14-13
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
"minimum-stability": "dev",
33
"require": {
44
"ext-curl": "*",
5-
"doctrine/doctrine-module": "0.8.*",
6-
"doctrine/doctrine-orm-module": "0.8.*",
7-
"zendframework/zendframework": "2.3.1",
5+
"doctrine/doctrine-module": "~0.8@stable",
6+
"doctrine/doctrine-orm-module": "~0.8@stable",
7+
"zendframework/zendframework": "~2.3@stable",
88
"org_heigl/contact" : "dev-master",
9-
"org_heigl/mailproxy" : "dev-master",
9+
"org_heigl/mailproxy" : "~1.0@stable",
1010
"org_heigl/hybridauth" : "dev-feature/multipleProviders",
11-
"org_heigl/geolocation" : "1.0.*",
12-
"sabre/vobject" : "3.0.*",
13-
"monolog/monolog" : "1.9.1",
14-
"willdurand/geocoder" : ">=2.4.2",
15-
"zendframework/zendservice-twitter": "2.1.0",
16-
"org_heigl/piwik" : ">=1.0.0",
17-
"rwoverdijk/assetmanager" : "1.*"
11+
"org_heigl/geolocation" : "~1.0@stable",
12+
"sabre/vobject" : "~3.0@stable",
13+
"monolog/monolog" : "~1.9@stable",
14+
"willdurand/geocoder" : "~2.4@stable",
15+
"zendframework/zendservice-twitter": "~2.1@stable",
16+
"org_heigl/piwik" : "~1.0@stable",
17+
"rwoverdijk/assetmanager" : "~1.4@stable"
1818
},
1919
"require-dev" : {
20-
"mockery/mockery": "dev-master",
21-
"zendframework/zend-developer-tools" : "dev-master"
20+
"mockery/mockery": "~0.9",
21+
"zendframework/zend-developer-tools" : "dev-master",
22+
"phing/phing" : "~2.0"
2223
},
2324
"autoload" : {
2425
"psr-0" : {

Diff for: ‎deploy_post.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+

Diff for: ‎src/module/Phpug/public/css/phpugteam.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#team dt {clear: both; width:100px; height:100px; display:inline-block; margin: 10px;padding:0px;}
22
#team dd {display:inline-block;height:100px;}
3-
#team .email {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../../img/phpug/mail.png) center no-repeat;}
4-
#team .twitter {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../../img/phpug/twitter.png) center no-repeat;}
5-
#team .googleplus {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../../img/phpug/google+.png) center no-repeat;}
3+
#team .email {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/mail.png) center no-repeat;}
4+
#team .twitter {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/twitter.png) center no-repeat;}
5+
#team .googleplus {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/google+.png) center no-repeat;}

Diff for: ‎src/module/Phpug/public/js/phpug.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -431,14 +431,18 @@ oms.addListener('click', function(marker) {
431431
map.openPopup(popup, info.shortname);
432432
});
433433

434-
435-
new L.Control.GeoSearch({
436-
provider: new L.GeoSearch.Provider.OpenStreetMap(),
437-
position: 'topcenter',
438-
showMarker: false,
439-
retainZoomLevel: true
440-
}).addTo(map);
441-
434+
map.addControl( new L.Control.Search({
435+
url: 'http://nominatim.openstreetmap.org/search?format=json&q={s}',
436+
jsonpParam: 'json_callback',
437+
propertyName: 'display_name',
438+
propertyLoc: ['lat','lon'],
439+
circleLocation: true,
440+
markerLocation: false,
441+
autoType: false,
442+
autoCollapse: true,
443+
minLength: 2,
444+
zoom:10
445+
}) );
442446

443447

444448
var pushNextMeeting = function(popup, id)

0 commit comments

Comments
 (0)