More hacks for morpheus.

3 files changed, 21 insertions, 6 deletions

diff --git a/plugins/CoreAdminHome/templates/pluginSettings.twig b/plugins/CoreAdminHome/templates/pluginSettings.twig
index 8d47453bde..393c6e1981 100644
--- a/plugins/CoreAdminHome/templates/pluginSettings.twig
+++ b/plugins/CoreAdminHome/templates/pluginSettings.twig
@@ -94,6 +94,7 @@
                                 {% for key, value in setting.availableValues %}
 
                                     <input
+                                        id="name-value-{{ loop.index }}"
                                         {% for attr, val in setting.uiControlAttributes %}
                                             {{ attr|e('html_attr') }}="{{ val|e('html_attr') }}"
                                         {% endfor %}
@@ -104,9 +105,10 @@
                                         value="{{ key|e('html_attr') }}"
                                         name="{{ setting.getKey|e('html_attr') }}" />
 
-                                    {{ value }}
+                                    <label for="name-value-{{ loop.index }}">{{ value }}</label>
 
                                     <br />
+
                                 {% endfor %}
 
                             {% else %}
diff --git a/plugins/Morpheus/javascripts/morpheus.js b/plugins/Morpheus/javascripts/morpheus.js
index daefbc3a34..9395a13a83 100644
--- a/plugins/Morpheus/javascripts/morpheus.js
+++ b/plugins/Morpheus/javascripts/morpheus.js
@@ -7,8 +7,8 @@ $(document).ready(function () {
     });
 
     $('body').on('ifClicked', 'input', function () {
-        $(this).triggerHandler('click');
+        $(this).trigger('click');
     }).on('ifChanged', 'input', function () {
-        $(this).triggerHandler('change');
+        $(this).trigger('change');
     });
 });
\ No newline at end of file
diff --git a/plugins/Morpheus/stylesheets/forms.less b/plugins/Morpheus/stylesheets/forms.less
index 4d90a14233..eb6ed995c8 100644
--- a/plugins/Morpheus/stylesheets/forms.less
+++ b/plugins/Morpheus/stylesheets/forms.less
@@ -162,7 +162,11 @@ button[type="button"],
     float:left;
     display:inline-block;
 
-    + br {
+    + .form-description {
+        margin-left:1em;
+    }
+
+    + br, + .form-description + br {
         clear:both;
     }
 
@@ -213,7 +217,6 @@ label {
     }
 }
 
-
 .prettycheckbox a:focus, .prettyradio a:focus {
     outline: 0 none;
 }
@@ -263,7 +266,17 @@ label {
     background-position: -205px 0;
 }
 
-// specific form control overrides
+// specific form control overrides (for iCheck)
 #useCustomLogo-0 {
   margin:0;
+}
+
+.listReports > li:after {
+  content:"";
+  display:table;
+  clear:both;
+}
+
+.small-form-description { // for tracking code generator
+  clear:both;
 }
\ No newline at end of file