- First part of layout change for 3.1

Author: Marius Cramer

interface/web/index.php

@@ -77,6 +77,8 @@
 if (!empty($js_d_files)) $app->tpl->setLoop('js_d_includes', $js_d_files);
 unset($js_d_files);
 
+$app->tpl->setVar('current_theme', isset($_SESSION['s']['theme']) ? $_SESSION['s']['theme'] : 'default');
+
 $app->tpl_defaults();
 $app->tpl->pparse();
 ?>

interface/web/js/scrigo.js.php

@@ -102,7 +102,8 @@ function onAfterContentLoad(url, data) {
             }
 	    }
     });
-    $('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
+    /* TODO: find a better way! */
+    //$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
 <?php
 }
 ?>
@@ -418,7 +419,7 @@ function loadMenus() {
 											},
 											success: function(data, textStatus, jqXHR) {
                                                 hideLoadIndicator();
-												jQuery('#sideNav').html(jqXHR.responseText);
+												jQuery('#sidebar').html(jqXHR.responseText);
 											},
 											error: function() {
                                                 hideLoadIndicator();
@@ -435,7 +436,7 @@ function loadMenus() {
 											},
 											success: function(data, textStatus, jqXHR) {
                                                 hideLoadIndicator();
-												jQuery('#topNav').html(jqXHR.responseText);
+												jQuery('#topnav-container').html(jqXHR.responseText);
 											},
 											error: function(o) {
                                                 hideLoadIndicator();