wait #7140 @1

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index f72ae964a7d411675c846c02f5c0d939b7042571..1343a3ce3633f18372af28d8f4eeba1abd38a3d0 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-243.26053.27">
+  <component name="dataSourceStorageLocal" created-in="IU-251.25410.129">
     <data-source name="MySQL - dev.fluidbook.com" uuid="9a7a0ad9-c6dc-4e29-b76d-f95d9cb2182a">
       <database-info product="MySQL" version="5.6.27-0ubuntu0.15.04.1-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )" dbms="MYSQL" exact-version="5.6.27">
         <extra-name-characters>#@</extra-name-characters>

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index e32bfbcaeed4b62e3b9b4681e83c4c2ea24d305f..458779dc5afcbc3f86c0b1eb592a0ae9424a57f1 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="dev.fluidbook.com" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" showAutoUploadSettingsWarning="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="www.fluidbook.com" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" showAutoUploadSettingsWarning="false">
     <option name="confirmBeforeDeletion" value="false" />
     <option name="confirmBeforeUploading" value="false" />
     <serverData>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3ac1527f7cb14af2c461ef80a708e33d9f9cf2e2..56fddfc9cbabbae460cb3ffa6a3273a2d0ffd507 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7480 @1">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7482 @0.5">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/controllers/AjaxController.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/controllers/AjaxController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/forms/RequestQuote.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/forms/RequestQuote.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/languages/en.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/languages/en.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,6 +64,7 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="PUSH_AUTO_UPDATE" value="true" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="MarkdownSettingsMigration">
@@ -250,7 +254,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+  <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
     <ConfirmationsSetting value="2" id="Add" />
     <ConfirmationsSetting value="2" id="Remove" />
@@ -631,8 +635,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-a94e463ab2e7-intellij.indexing.shared.core-IU-243.26053.27" />
-        <option value="bundled-js-predefined-d6986cc7102b-1632447f56bf-JavaScript-IU-243.26053.27" />
+        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.25410.129" />
+        <option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-IU-251.25410.129" />
       </set>
     </attachedChunks>
   </component>
@@ -848,7 +852,8 @@
       <workItem from="1744211486656" duration="5649000" />
       <workItem from="1744294067933" duration="116000" />
       <workItem from="1744297988591" duration="226000" />
-      <workItem from="1744391230839" duration="4576000" />
+      <workItem from="1744391230839" duration="6198000" />
+      <workItem from="1747127803785" duration="1921000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1193,7 +1198,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="183" />
+    <option name="localTasksCounter" value="184" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1214,6 +1219,17 @@
     <option featureType="dependencySupport" implementationName="executable:docker" />
     <option featureType="dependencySupport" implementationName="executable:kubectl" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
       <collection />
@@ -1225,7 +1241,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #3912 @0:20" />
     <MESSAGE value="fix #3915 @0.25" />
     <MESSAGE value="wait #4191 @0.75" />
     <MESSAGE value="wip #4191 @0.5" />
@@ -1250,7 +1265,8 @@
     <MESSAGE value="wip #7474 @0.25" />
     <MESSAGE value="wip #7474" />
     <MESSAGE value="wait #7480 @1" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #7480 @1" />
+    <MESSAGE value="wait #7482 @0.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #7482 @0.5" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index d0b1aaf650433272eedb82932cbd9c2194e814ff..578f649ad3d1d72de443f7eb28569de1f732af89 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -59,7 +59,7 @@ privacy.analytics = 1
 
 dev = false
 
-seo.robots = false
+seo.robots = true
 
 webhost = elearning.fluidbook.com
 

diff --git a/framework/application/forms/RequestQuote.php b/framework/application/forms/RequestQuote.php
index 97c0374b59c1e096a9087ea09697d56fd038c3b7..cb23f1dd2b6864529e8dd2799bb8b578e51a856c 100644 (file)
--- a/framework/application/forms/RequestQuote.php
+++ b/framework/application/forms/RequestQuote.php
@@ -25,13 +25,25 @@ class Fluidbook_Form_RequestQuote extends CubeIT_Form
 
                $contact_type = new Zend_Form_Element_Select('contact_type');
                $contact_type->setLabel(__('Vous êtes'));
-               $contact_type->setMultiOptions(array(
-                       '' => '',
-                       'elearning-provider' => __('Une agence de communication'),
-                       'freelancer' => __('Un créatif freelance'),
-                       'company' => __('Une société'),
-                       'other' => __('Autre'),
-               ));
+        if(strstr(APPLICATION_ENV, 'learning')) {
+            $options=[
+                '' => '',
+                'elearning-provider' => __('Une agence de e-learning'),
+                'freelancer' => __('Un créatif freelance'),
+                'company' => __('Une société'),
+                'other' => __('Autre'),
+            ];
+        }else{
+            $options=[
+                '' => '',
+                'agency' => __('Une agence de communication'),
+                'freelancer' => __('Un créatif freelance'),
+                'company' => __('Une société'),
+                'other' => __('Autre'),
+            ];
+
+        }
+               $contact_type->setMultiOptions($options);
                $contact_type->setAttrib('required', 'required'); // Needed so we can style the first element when nothing selected
                $contact_type->setRequired(true);
                $contact_type->addErrorMessage(__('Veuillez indiquer le type de votre société'));

diff --git a/framework/languages/en.php b/framework/languages/en.php
index b49ea7b7d84e6e801e38dd9a0e215c376f72ce03..8c38fa35961a21bf18a2399827f02491879c8601 100644 (file)
--- a/framework/languages/en.php
+++ b/framework/languages/en.php
@@ -1,12 +1,27 @@
 <?php
 $translations = array (
+  'Photo' => 'Photo',
+  'Author Name' => 'Author Name',
+  'E-mail address' => 'E-mail address',
+  'Author Bio' => 'Author Bio',
+  'Authors' => 'Authors',
+  'New Author' => 'New Author',
+  'Editing author « $name »' => 'Editing author « $name »',
+  'Published?' => 'Published?',
+  'Publish Date' => 'Publish Date',
+  'Post Title' => 'Post Title',
+  'Intro Excerpt' => 'Intro Excerpt',
+  'Intro Image' => 'Intro Image',
+  'Blog Posts' => 'Blog Posts',
+  'New Post' => 'New Post',
+  'Edition du post « $title »' => 'Edition du post « $title »',
   'Prénom' => 'First name',
   'Nom' => 'Last name',
   'Veuillez indiquer votre nom' => 'Please indicate your name',
   'Nom de la société' => 'Company name',
   'Veuillez indiquer le nom de votre société' => 'Please indicate the name of your company',
   'Vous êtes' => 'You are',
-  'Une agence de communication' => 'A communication agency',
+  'Une agence de communication' => 'An elearning provider',
   'Un créatif freelance' => 'A freelancer',
   'Une société' => 'A company',
   'Autre' => 'Other',
@@ -14,15 +29,24 @@ $translations = array (
   'Email professionnel' => 'Work email',
   'Veuillez indiquer une adresse e-mail valide' => 'Please enter a valid email address',
   'Téléphone' => 'Telephone',
+  'Fax' => 'Fax',
   'Commentaires sur votre projet' => 'Remarks about your project',
+  'Code promo' => 'Code promo',
   'Envoyer la demande' => 'Send the request',
-  'Tél :' => 'Tel:',
-  'email :' => 'email:',
+  'Mention vie privée' => 'Mention vie privée',
   'Tél.' => 'Tel.',
   'Plan du site' => 'Site map',
   'Demander un devis' => 'Ask for a quote',
   'Contactez-nous' => 'Contact us',
-  'Voir le Fluidbook' => 'See the Fluidbook',
-  'Demandez un devis' => 'Ask for a quote',
   'Contact' => 'Contact',
+  'Agences' => 'Agencies',
+  'Demandez un devis' => 'Ask for a quote',
+  'Lire la suite' => 'Lire la suite',
+  'Tél :' => 'Tel:',
+  'email :' => 'email:',
+  'Voir le Fluidbook' => 'See the Fluidbook',
+  'Une erreur s\'est produite' => 'An error occured',
+  'Certaines modifications n\'ont pas été sauvegardées. Souhaitez-vous néanmoins quitter cette page ?' => 'Some changes are not saved. Are you sure you want to leave this page?',
+  'Chargement en cours' => 'Loading',
+  'Annuler' => 'Cancel',
 );
\ No newline at end of file