From 8ceb0824027750b720f7788e44ed0deb87be6f08 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 07 Jan 2015 07:52:03 -0500
Subject: [PATCH] - Layout fixes - Included new icons and buttons - Layout scaling improved (up to 1260px width)
---
interface/web/js/scrigo.js.php | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 18c0885..1445353 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -93,7 +93,20 @@
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
- $('#pageContent').find("select").combobox();
+
+
+ $('#pageContent').find("select:not(.chosen-select)").select2({
+ placeholder: '',
+ width: 'element',
+ selectOnBlur: true,
+ allowClear: true,
+ }).on('change', function(e) {
+ if (jQuery("#pageForm .table #Filter").length > 0) {
+ jQuery("#pageForm .table #Filter").trigger('click');
+ }
+ });
+ /* TODO: find a better way! */
+ //$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
?>
@@ -409,7 +422,7 @@
},
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
- jQuery('#sideNav').html(jqXHR.responseText);
+ jQuery('#sidebar').html(jqXHR.responseText);
},
error: function() {
hideLoadIndicator();
@@ -426,7 +439,7 @@
},
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
- jQuery('#topNav').html(jqXHR.responseText);
+ jQuery('#topnav-container').html(jqXHR.responseText);
},
error: function(o) {
hideLoadIndicator();
@@ -845,13 +858,13 @@
return Math.floor(Math.random() * (max - min + 1)) + min;
}
-jQuery('.addPlaceholder').live("click", function(){
+jQuery(document).on("click", ".addPlaceholder", function(){
var placeholderText = jQuery(this).text();
var template = jQuery(this).siblings(':input');
template.insertAtCaret(placeholderText);
});
-jQuery('.addPlaceholderContent').live("click", function(){
+jQuery(document).on("click", ".addPlaceholderContent", function(){
var placeholderContentText = jQuery(this).find('.addPlaceholderContent').text();
var template2 = jQuery(this).siblings(':input');
template2.insertAtCaret(placeholderContentText);
--
Gitblit v1.9.1