Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Aug 5, 2016 · 9b84f13 · 9b84f13
2 parents e4105b7 + d1ce539
commit 9b84f13
Show file tree

Hide file tree

Showing 33 changed files with 120 additions and 62 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -144,7 +144,7 @@ public function getRegisterErrors($iSurveyId){
 
             if (!$captchaCorrect)
             {
-                $this->aRegisterErrors[] = gT("The answer to the security question is incorrect.");
+                $this->aRegisterErrors[] = gT("Your answer to the security question was not correct - please try again.");
             }
         }
 

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -986,7 +986,7 @@ function buildsurveysession($surveyid,$preview=false)
         {
             if (isset($loadsecurity))
             { // was a bad answer
-                $FlashError.=gT("The content of the captcha is incorrect.")."<br/>\n";
+                $FlashError.=gT("Your answer to the security question was not correct - please try again.")."<br/>\n";
             }
             $renderCaptcha='main';
         }

diff --git a/application/views/admin/notifications/notifications.php b/application/views/admin/notifications/notifications.php
@@ -1,22 +1,26 @@
-<div id="notif-container" class="col-lg-12 content-right" style="z-index: 999">
-    <?php foreach($aMessage as $message):?>
-        <?php
-            if(isset($message['type']) && in_array($message['type'],array('error','success','danger','warning','info')))
-            {
-                $sType=$message['type'];
-                if($sType=='error')
-                {
-                    $sType='danger';
-                }
-            }
-            else
-            {
-                $sType='success';
-            }
-            echo CHtml::openTag("div",array('class'=>"alert alert-{$sType} alert-dismissible",'role'=>'alert'));
-            echo CHtml::htmlButton("<span >&times;</span>",array('type'=>'button','class'=>'close','data-dismiss'=>'alert','aria-label'=>gT("Close")));
-            echo $message['message'];
-            echo CHtml::closeTag("div");
-        ?>
-    <?php endforeach;?>
-</div>
+<div class="container-fluid">
+    <div class="row">
+        <div id="notif-container" class="col-sm-12 content-right" style="z-index: 999">
+            <?php foreach($aMessage as $message):?>
+                <?php
+                    if(isset($message['type']) && in_array($message['type'],array('error','success','danger','warning','info')))
+                    {
+                        $sType=$message['type'];
+                        if($sType=='error')
+                        {
+                            $sType='danger';
+                        }
+                    }
+                    else
+                    {
+                        $sType='success';
+                    }
+                    echo CHtml::openTag("div",array('class'=>"alert alert-{$sType} alert-dismissible",'role'=>'alert'));
+                    echo CHtml::htmlButton("<span >&times;</span>",array('type'=>'button','class'=>'close','data-dismiss'=>'alert','aria-label'=>gT("Close")));
+                    echo $message['message'];
+                    echo CHtml::closeTag("div");
+                ?>
+            <?php endforeach;?>
+        </div>
+    </div>
+</div>
diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php
@@ -7,7 +7,7 @@
 
 
 <div class='menubar surveybar' id="surveybarid">
-    <div class='row container-fluid'>
+    <div class='row container-fluid row-button-margin-bottom'>
 
         <?php // If there are no save or close buttons, take up some more space (useful for 1366x768 screens) ?>
         <?php if (!isset($surveybar['savebutton']['form']) && (!isset($surveybar['saveandclosebutton'])) && (!isset($surveybar['closebutton']))): ?>

diff --git a/application/views/survey/questions/multiplenumeric/rows/input/answer_row.php b/application/views/survey/questions/multiplenumeric/rows/input/answer_row.php
@@ -23,14 +23,14 @@
 <tr  id='javatbd<?php echo $myfname; ?>' class="question-item answer-item numeric-item  text-item" <?php echo $sDisplayStyle;?>>
     <td class='text-right align-middle'>
         <?php if($alert):?>
-            <div class="label label-danger errormandatory"  role="alert">
+            <label class="control-label numeric-label label label-danger errormandatory"  role="alert">
                 <?php echo $labelText;?>
-            </div> <!-- alert -->
+            </label> <!-- alert -->
+        <?php else:?>
+            <label class='control-label numeric-label' for="answer<?php echo $myfname; ?>">
+                <?php echo $labelText;?>
+            </label>
         <?php endif;?>
-
-        <label class='control-label numeric-label' for="answer<?php echo $myfname; ?>">
-            <?php echo $labelText;?>
-        </label>
     </td>
 
     <?php if (!empty($prefix)): ?>

diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2016-08-05 08:07:22+00:00\n"
+"POT-Creation-Date: 2016-08-05 08:52:07+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -467,9 +467,8 @@ msgid "ID"
 msgstr ""
 
 #: application/controllers/RegisterController.php:147
-#: application/controllers/survey/index.php:344
-#: application/libraries/Save.php:130
-msgid "The answer to the security question is incorrect."
+#: application/helpers/frontend_helper.php:989
+msgid "Your answer to the security question was not correct - please try again."
 msgstr ""
 
 #: application/controllers/RegisterController.php:156
@@ -4893,6 +4892,11 @@ msgstr ""
 msgid "You did not answer to the security question."
 msgstr ""
 
+#: application/controllers/survey/index.php:344
+#: application/libraries/Save.php:130
+msgid "The answer to the security question is incorrect."
+msgstr ""
+
 #: application/controllers/survey/index.php:355
 msgid "There is no matching saved survey"
 msgstr ""
@@ -7339,10 +7343,6 @@ msgstr ""
 msgid "Try to submit again"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:989
-msgid "The content of the captcha is incorrect."
-msgstr ""
-
 #: application/helpers/frontend_helper.php:1018
 msgid "The token you have provided is either not valid, or has already been used."
 msgstr ""
@@ -9664,7 +9664,7 @@ msgid "Database update"
 msgstr ""
 
 #: application/helpers/update/updatedb_helper.php:1440
-msgid "The database has been updated to version 259. New version includes notification system."
+msgid "The database has been updated from version %s to version %s."
 msgstr ""
 
 #: application/helpers/update/updatedb_helper.php:2781
@@ -18278,7 +18278,7 @@ msgid "Before you start, please prove you are human."
 msgstr ""
 
 #: application/views/survey/frontpage/enterToken.php:8
-msgid "This is a controlled survey, you need a valid token to participate."
+msgid "To participate in this restricted survey, you need a valid token."
 msgstr ""
 
 #: application/views/survey/frontpage/enterToken.php:10

diff --git a/locale/de/de.mo b/locale/de/de.mo
diff --git a/locale/it-informal/it-informal.mo b/locale/it-informal/it-informal.mo
diff --git a/locale/it/it.mo b/locale/it/it.mo
diff --git a/styles/Apple_Blossom/css/lime-admin-common-rtl.css b/styles/Apple_Blossom/css/lime-admin-common-rtl.css
diff --git a/styles/Apple_Blossom/css/lime-admin-common.css b/styles/Apple_Blossom/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Bay_of_Many/css/lime-admin-common-rtl.css b/styles/Bay_of_Many/css/lime-admin-common-rtl.css
diff --git a/styles/Bay_of_Many/css/lime-admin-common.css b/styles/Bay_of_Many/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Black_Pearl/css/lime-admin-common-rtl.css b/styles/Black_Pearl/css/lime-admin-common-rtl.css
diff --git a/styles/Black_Pearl/css/lime-admin-common.css b/styles/Black_Pearl/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Dark_Sky/css/lime-admin-common-rtl.css b/styles/Dark_Sky/css/lime-admin-common-rtl.css
diff --git a/styles/Dark_Sky/css/lime-admin-common.css b/styles/Dark_Sky/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Free_Magenta/css/lime-admin-common-rtl.css b/styles/Free_Magenta/css/lime-admin-common-rtl.css
diff --git a/styles/Free_Magenta/css/lime-admin-common.css b/styles/Free_Magenta/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Noto_All_Languages/css/lime-admin-common-rtl.css b/styles/Noto_All_Languages/css/lime-admin-common-rtl.css
diff --git a/styles/Noto_All_Languages/css/lime-admin-common.css b/styles/Noto_All_Languages/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Purple_Tentacle/css/lime-admin-common-rtl.css b/styles/Purple_Tentacle/css/lime-admin-common-rtl.css
diff --git a/styles/Purple_Tentacle/css/lime-admin-common.css b/styles/Purple_Tentacle/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Sea_Green/css/lime-admin-common-rtl.css b/styles/Sea_Green/css/lime-admin-common-rtl.css
diff --git a/styles/Sea_Green/css/lime-admin-common.css b/styles/Sea_Green/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;

diff --git a/styles/Sunset_Orange/css/lime-admin-common-rtl.css b/styles/Sunset_Orange/css/lime-admin-common-rtl.css
diff --git a/styles/Sunset_Orange/css/lime-admin-common.css b/styles/Sunset_Orange/css/lime-admin-common.css
@@ -4,7 +4,12 @@
  * This file contain all the common css definitions for the different admin theme.
  * It should not contain color definition (grey, blacks, and white are acceptable)
  */
-
+.row-button-margin-bottom {
+  margin-bottom: -5px;
+}
+.row-button-margin-bottom .btn{
+  margin-bottom: 5px;
+}
 
 .ui-datepicker {
   width: 17em;