BUG: fixed bug #176 Removed flags

Author: Charles Ma

core/controllers/InstallController.php

@@ -247,7 +247,6 @@ function step3Action()
     $formArray['description']->setValue($applicationConfig['global']['application.description']);
     $formArray['smartoptimizer']->setValue($applicationConfig['global']['smartoptimizer']);
     $formArray['timezone']->setValue($applicationConfig['global']['default.timezone']);
-    $formArray['process']->setValue($applicationConfig['global']['processing']);
 
     $assetstrores = $this->Assetstore->getAll();
 
@@ -272,7 +271,6 @@ function step3Action()
       $applicationConfig['global']['defaultassetstore.id'] = $assetstrores[0]->getKey();
       $applicationConfig['global']['smartoptimizer'] = $form->getValue('smartoptimizer');
       $applicationConfig['global']['default.timezone'] = $form->getValue('timezone');
-      $applicationConfig['global']['processing'] = $form->getValue('process');
 
       $this->Component->Utility->createInitFile(BASE_PATH.'/core/configs/application.local.ini', $applicationConfig);
       $this->_redirect("/admin?checkRecentItem=true#tabs-modules");

core/layouts/layout.phtml

@@ -130,16 +130,40 @@ echo $this->doctype()
               <a href="#" > <?= $this->t('Help') ?></a>
             </li>
             <li>
-              <?php if($this->lang=='fr')
-                {
-                echo '<a href="'.$this->webroot.'?lang=en"><img src="'.$this->coreWebroot.'/public/images/icons/english.png" alt="English"/>';
-                }
-              else
-                {
-                echo '<a href="'.$this->webroot.'?lang=fr"><img src="'.$this->coreWebroot.'/public/images/icons/french.png" alt="French"/>';
-                }
+              
+                <a href="#" style="margin-right: 20px">
+                
+               <?php 
+               echo $this->t('My Language');
                 ?>
-              </a>
+              <img class="languageIcon" src="<?php echo $this->coreWebroot?>/public/images/icons/language.png" alt ="" /> 
+                </a>
+                <ul>
+                  <li>
+                  <?php 
+                  if($this->lang=='en')
+                    {
+                    echo '<a href="#"><b>English</b></a>';
+                    }
+                  else
+                    {
+                    echo '<a href="'.$this->webroot.'?lang=en">English</a>';
+                    }
+                    ?>
+                  </li>
+                  <li>
+                  <?php 
+                  if($this->lang=='fr')
+                    {
+                    echo '<a href="#"><b>Français</b></a>';
+                    }
+                  else
+                    {
+                    echo '<a href="'.$this->webroot.'?lang=fr">Français</a>';
+                    }
+                    ?>
+                  </li>
+                </ul>
             </li>
           </ul>
         </div>

core/public/css/layout/main.css

@@ -549,6 +549,13 @@ div.TopbarRight img.arrowUser{
   position:relative;
   top:1px;
 }
+
+div.TopbarRight img.languageIcon{
+  position: absolute;
+  right: 0px;
+  top: 0px;
+}
+
 div.TopbarRight  li li {
   display:block;
   float:none;

core/public/images/icons/language.png

@@ -251,4 +251,5 @@ Add in group;Ajouter au groupe
 Set as moderator;Promouvoir en tant que mod�rateur
 Remove from community;Retirer de la communaut�
 Remove from group;Retirer du groupe
-Add Metadata;Ajouter M�tadonn�e
+Add Metadata;Ajouter M�tadonn�e
+My Language;Ma Langue

core/translation/fr-main.csv

@@ -41,10 +41,6 @@ PURPOSE.  See the above copyright notices for more information.
               <div class='installEnvironment'>
                 <label for='environment'>Environment</label>
                 {$this->form['environment']}
-              </div>
-               <div class='installProcess'>
-                <label for='process'>Select process type</label>
-                {$this->form['process']}
               </div>
               <div class='installTimezone'>
                 <label for='environment'>Timezone</label>