From 6547f463a75278cfb83d5ee860e8f53b931ee84d Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 08 Jan 2015 14:50:58 -0500
Subject: [PATCH] remove db-name from inc-sql

---
 interface/web/js/scrigo.js.php |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 1445353..f85f825 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -87,6 +87,22 @@
     }
 }
 
+function onAfterSideNavLoaded() {
+	<?php
+if($server_config_array['misc']['use_combobox'] == 'y'){
+?>
+    $('#sidebar').find("select:not(.chosen-select)").select2({
+		placeholder: '',
+		width: 'element',
+		selectOnBlur: true,
+		allowClear: true,
+	});
+<?php
+}
+?>
+
+}
+
 function onAfterContentLoad(url, data) {
     if(!data) data = '';
     else data = '&' + data;
@@ -100,6 +116,14 @@
 		width: 'element',
 		selectOnBlur: true,
 		allowClear: true,
+		formatResult: function(o) {
+			if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
+			else return o.text;
+		},
+		formatSelection: function(o) {
+			if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
+			else return o.text;
+		}
 	}).on('change', function(e) {
             if (jQuery("#pageForm .table #Filter").length > 0) {
                 jQuery("#pageForm .table #Filter").trigger('click');
@@ -423,6 +447,8 @@
 											success: function(data, textStatus, jqXHR) {
                                                 hideLoadIndicator();
 												jQuery('#sidebar').html(jqXHR.responseText);
+												onAfterSideNavLoaded();
+												loadPushyMenu();
 											},
 											error: function() {
                                                 hideLoadIndicator();
@@ -440,6 +466,7 @@
 											success: function(data, textStatus, jqXHR) {
                                                 hideLoadIndicator();
 												jQuery('#topnav-container').html(jqXHR.responseText);
+												loadPushyMenu();
 											},
 											error: function(o) {
                                                 hideLoadIndicator();

--
Gitblit v1.9.1