Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

LimeSurvey · Dec 16, 2015 · 664dd0a · 664dd0a
2 parents d1769fa + 007ada7
commit 664dd0a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1710,12 +1710,12 @@ function exportdialog($iSurveyId)
                 'filteremail'=>array(
                     'type'=>'string',
                     'label'=>gT('Filter by email address'),
-                    'help'=>gT('Email address contains the input.'),
+                    'help'=>gT('Only export entries which contain this string in the email address.'),
                 ),
                 'tokendeleteexported'=>array(
                     'type'=>'checkbox',
                     'label'=>gT('Delete exported tokens'),
-                    'help'=>'Attention : the tokens are deleted from token table, you can not find it again.',
+                    'help'=>gT('Warning: Deleted token entries cannot be recovered.'),
                 ),
             );
             $this->_renderWrappedTemplate('token', array( 'exportdialog'), $aData);

diff --git a/application/extensions/SettingsWidget/SettingsWidget.php b/application/extensions/SettingsWidget/SettingsWidget.php
@@ -416,7 +416,11 @@ public function renderSelect($name, array $metaData, $form = null)
             $properties['events']['change']='js: function(e) { this.form.submit();}';
         }
 
-        return App()->getController()->widget('yiiwheels.widgets.select2.WhSelect2', $properties, true);
+        // Remove class 'form-control' because of double styling
+        // TODO: Where is this class added in the first place??
+        $html = App()->getController()->widget('yiiwheels.widgets.select2.WhSelect2', $properties, true);
+        $html = str_replace('form-control', '', $html);
+        return $html;
 
     }
 

diff --git a/application/views/admin/pluginmanager/index.php b/application/views/admin/pluginmanager/index.php
@@ -42,13 +42,13 @@
             'value' => function($data) {
                 if ($data['active'] == 0)
                 {
-                    $output = "<a href='" . $this->createUrl('/admin/pluginmanager/sa/activate') . "?id=" . $data["id"] . "' class='btn btn-default btn-xs btntooltip'><span class='fa fa-power-off'>&nbsp;</span>".gT('Activate')."</a>";
+                    $output = "<a href='" . $this->createUrl('/admin/pluginmanager/sa/activate', array('id' => $data['id'])) . "' class='btn btn-default btn-xs btntooltip'><span class='fa fa-power-off'>&nbsp;</span>".gT('Activate')."</a>";
                 } else {
-                    $output = "<a href='" . $this->createUrl('/admin/pluginmanager/sa/deactivate') . "?id=" . $data["id"] . "'class='btn btn-warning btn-xs'><span class='fa fa-power-off'>&nbsp;</span>".gT('Deactivate')."</a>";
+                    $output = "<a href='" . $this->createUrl('/admin/pluginmanager/sa/deactivate', array('id' => $data['id'])) . "'class='btn btn-warning btn-xs'><span class='fa fa-power-off'>&nbsp;</span>".gT('Deactivate')."</a>";
                 }
                 if(count($data['settings'])>0)
                 {
-                    $output .= "&nbsp;<a href='" . $this->createUrl('/admin/pluginmanager/sa/configure') . "?id=" . $data["id"] . "' class='btn btn-default btn-xs'><span class='icon-edit'>&nbsp;</span>" . gT('Configure') . "</a>";
+                    $output .= "&nbsp;<a href='" . $this->createUrl('/admin/pluginmanager/sa/configure', array('id' => $data['id'])) . "' class='btn btn-default btn-xs'><span class='icon-edit'>&nbsp;</span>" . gT('Configure') . "</a>";
                 }
                 return $output;
             }

diff --git a/application/views/admin/token/exportdialog.php b/application/views/admin/token/exportdialog.php
@@ -73,7 +73,7 @@
                             <input size="50" type="text" value="" name="filteremail" id="filteremail" />
                         </div>
                         <div class="alert alert-info col-lg-3 col-sm-2 col-md-12 controls" role="alert">
-                            <?php eT('Email address contains the input.'); ?>
+                            <?php eT('Only export entries which contain this string in email address.'); ?>
                         </div>
 
                     </div>
@@ -87,7 +87,7 @@
                             <input type="checkbox" value="1" name="tokendeleteexported" id="tokendeleteexported" />
                         </div>
                         <div class="alert alert-warning col-lg-3 col-sm-2 col-md-12 controls" role="alert">
-                            <?php eT('Attention : the tokens are deleted from token table, you can not find it again.'); ?>
+                            <?php eT('Warning: Deleted token entries cannot be recovered.'); ?>
                         </div>
                     </div>
                 </div>