Dev: basic use lumen

Dev: starting js fix on panel-warning remove is questions is OK (lot of condition for mandatory)
LimeSurvey · Oct 31, 2016 · 9ba38cd · 9ba38cd
1 parent a3b7fcf
commit 9ba38cd
Show file tree

Hide file tree

Showing 15 changed files with 14,187 additions and 47 deletions.
diff --git a/application/views/survey/question_help/asterisk.php b/application/views/survey/question_help/asterisk.php
@@ -4,5 +4,7 @@
  */
 ?>
 <!-- Add a visual information + just Mandatory string for aria : can be improved -->
-<small class="text-danger asterisk fa fa-asterisk pull-left small" aria-hidden='true'></small>
-<span class="sr-only text-danger asterisk"> <?php echo gT("(This question is mandatory)"); ?> </span>
+<div class="asterisk pull-left">
+  <small class="text-danger fa fa-asterisk small" aria-hidden='true'></small>
+  <span class="sr-only text-danger"> <?php echo gT("(This question is mandatory)"); ?> </span>
+</div>
diff --git a/application/views/survey/system/actionButton/clearAll.php b/application/views/survey/system/actionButton/clearAll.php
@@ -14,7 +14,7 @@
         'id'=>false,
         'value'=>$value,
         'name'=>$name,
-        'class'=>"$class btn btn-default",
+        'class'=>"$class btn btn-link",
         'data-confirmedby'=>$confirmedby,
         'title'=>gT("This action need confirmation."),
         'aria-label'=>gT("This action need confirmation with the next checkbox."), /* ? must be reviewed */

diff --git a/application/views/survey/system/questionhelp/mandatory_tip.php b/application/views/survey/system/questionhelp/mandatory_tip.php
@@ -4,7 +4,7 @@
  * called from em_manager_helper
  */
 ?>
-<p class='ls-question-mandatory text-danger' role='alert'>
+<div class='ls-question-mandatory text-danger' role='alert'>
     <span class='fa fa-exclamation-circle' aria-hidden="true"></span>
     <?php echo $sMandatoryText; ?>
-</p>
+</div>
diff --git a/templates/basic/config.xml b/templates/basic/config.xml
@@ -23,9 +23,8 @@
         -->
         <css>
             <filename>css/jquery-ui.css</filename>
-            <filename>css/bootstrap.min.css</filename>
-            <filename>css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css</filename>
-            <!--<filename>assets/css/bootstrap-theme.css</filename>-->
+            <filename>css/bootswatch-lumen.css</filename>
+            <filename>css/awesome-bootstrap-checkbox.css</filename>
             <filename>css/template-core.css</filename>
             <filename>css/template.css</filename>
         </css>
@@ -40,9 +39,10 @@
             <css>
                 <!-- must fix some part -->
                 <filename>css/jquery-ui.css</filename>
-                <filename>css/bootstrap.min.css</filename>
-                <filename>css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css</filename>
-                <!--<filename>assets/css/bootstrap-theme.css</filename>-->
+                <filename>css/cosmo.css</filename>
+                <filename>css/bootstrap-rtl.css</filename>
+                <filename>css/awesome-bootstrap-checkbox.css</filename>
+                <!-- <filename>css/awesome-bootstrap-checkbox-rtl.css</filename> -->
                 <filename>css/template-core.css</filename>
                 <filename>css/template.css</filename>
             </css>

diff --git a/...p-checkbox/awesome-bootstrap-checkbox.css → .../basic/css/awesome-bootstrap-checkbox.css b/...p-checkbox/awesome-bootstrap-checkbox.css → .../basic/css/awesome-bootstrap-checkbox.css
diff --git a/templates/basic/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css b/templates/basic/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css