[General] removes obsolet symlinks. Adjusts build.xml

cross-solution · May 9, 2017 · d2ab57c · d2ab57c
1 parent a7a24c2
commit d2ab57c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 26 deletions.
diff --git a/build.xml b/build.xml
@@ -147,10 +147,12 @@
 
         <copy file="${project.basedir}/module/Geo/public/js/jquery.geolocationfield.photon.js" tofile="${builddir}/public/Geo/js/jquery.geolocationfield.photon.js"/>
         <copy file="${project.basedir}/module/Geo/public/js/jquery.geolocationfield.geo.js" tofile="${builddir}/public/Geo/js/jquery.geolocationfield.geo.js"/>
-        <copy file="${project.basedir}/public/js/jquery.bootstrapwizard.min.js" tofile="${builddir}/public/js/jquery.bootstrapwizard.min.js"/>
+        <copy file="${project.basedir}/module/Geo/public/js/geoselect.js" tofile="${builddir}/public/Geo/js/geoselect.js"/>
 
         <mkdir dir="${builddir}/log"/>
         <chmod file="${builddir}/log" mode="0777"/>
+        <mkdir dir="${builddir}/log/tracy"/>
+        <chmod file="${builddir}/log/tracy" mode="0777"/>
         <mkdir dir="${builddir}/cache"/>
         <chmod file="${builddir}/cache" mode="0777"/>
         <mkdir dir="${builddir}/cache/DoctrineMongoODMModule/Hydrator"/>
@@ -269,7 +271,16 @@
         <!-- ============================================  -->
 
         <fileset id="core" dir="${project.basedir}">
-            <include name="module/**"/>
+            <include name="module/Core/**"/>
+            <include name="module/Auth/**"/>
+            <include name="module/Install/**"/>
+            <include name="module/Pdf/**"/>
+            <include name="module/Jobs/**"/>
+            <include name="module/Applications/**"/>
+            <include name="module/Organizations/**"/>
+            <include name="module/Geo/**"/>
+            <include name="module/Settings/**"/>
+            <include name="module/Cv/**"/>
             <include name="public/**"/>
             <include name="bin/console"/>
             <include name="config/config.php"/>
@@ -278,6 +289,8 @@
             <include name="vendor/zendframework/**"/>
             <include name="vendor/container-interop/**"/>
             <include name="vendor/hybridauth/**"/>
+            <include name="vendor/facebook/**"/>
+            <include name="vendor/tracy/**"/>
             <include name="vendor/doctrine/**"/>
             <include name="vendor/symfony/polyfill-mbstring/**"/>
             <include name="vendor/jmikola/geojson/src/**"/>
@@ -289,21 +302,6 @@
             <include name="LICENCE"/>
             <include name="README"/>
             <exclude name="public/js/*"/>
-            <exclude name="**/YawikDemo*/**"/>
-            <exclude name="**/Solr/**"/>
-            <exclude name="**/YawikXingVendorApi/**"/>
-            <exclude name="**/YawikCompanyRegistration/**"/>
-            <exclude name="**/CamMediaintown/**"/>
-            <exclude name="**/NextKraftwerke/**"/>
-            <exclude name="**/JobsDeutschland/**"/>
-            <exclude name="**/Karrierelounge/**"/>
-            <exclude name="**/Greenjobs/**"/>
-            <exclude name="**/Xenagos/**"/>
-            <exclude name="**/Karriere24/**"/>
-            <exclude name="**/Phoenixdesign/**"/>
-            <exclude name="**/PxSkin/**"/>
-            <exclude name="**/mhq-yawik-modul/**"/>
-            <exclude name="**/Acpages/**"/>
             <exclude name="public/Applications"/>
             <exclude name="public/Auth"/>
             <exclude name="public/Core"/>

diff --git a/module/Auth/config/module.auth.global.php.dist b/module/Auth/config/module.auth.global.php.dist
@@ -5,18 +5,19 @@ return array(
         "Facebook" => array ( 
             "enabled" => true,
             "keys"    => array ( "id" => "###Your Facebook AppID ###", "secret" => "###Your Facebook Secret ###" ),
-            "scope"   => "%%facebook.scope%%",// optional
+            "scope"   => "email, user_about_me, user_birthday, user_hometown, user_work_history, user_education_history",// optional
             "display" => "popup"
+
         ),
         "LinkedIn" => array (
             "enabled" => true,
-            "keys"    => array ( "key" => "###Your LinkedIn AppID ###", "secret" => "###Your LinkedIn AppID ###" ),
-            "scope"   => "%%linkedin.scope%%"
+            "keys"    => array ( "id" => "###Your LinkedIn AppID ###", "secret" => "###Your LinkedIn AppID ###" ),
+            "scope"   => "r_basicprofile, r_emailaddress"
         ),
         "XING" => array(
             "enabled" => true,
             'keys'    => array ( "key" => '###Your XING AppID ###', 'secret' => '###Your XING Secret ###'),
-            "scope"   => '%%xing.scope%%'
+            "scope"   => ''
         ),
         "Github" => array(
             "enabled" => true,

diff --git a/module/Jobs/view/jobs/index/approval.phtml b/module/Jobs/view/jobs/index/approval.phtml
@@ -1,9 +1,9 @@
 <?php //description: Renders the list of jobs. used by applicants and recruiters ?>
 <?php $this->headTitle($this->translate('Jobs'));
       $this->headScript()->appendFile($this->basepath('/Core/js/core.pagination-container.js'))
-                         ->appendFile($this->basePath('/js/bootstrap-dialog.min.js'))
+                         ->appendFile($this->basePath('/assets/bootstrap3-dialog/js/bootstrap-dialog.min.js'))
                          ->appendFile($this->basePath('/Jobs/js/index.assign-users.js'))
-                         ->appendFile($this->basePath('/js/select2.min.js'));
+                         ->appendFile($this->basePath('/assets/select2/js/select2.min.js'));
 $this->headScript()->captureStart() ?>
 /* This code is generated in jobs/index/approval.phtml
  *

diff --git a/public/js/bootstrap-datepicker.js b/public/js/bootstrap-datepicker.js
diff --git a/public/js/bootstrap-dialog.js b/public/js/bootstrap-dialog.js
diff --git a/public/js/pnotify.custom.min.js b/public/js/pnotify.custom.min.js