From 983de87dfb973257ec0eb312168b0ffe3d276e55 Mon Sep 17 00:00:00 2001 From: SJ Date: Wed, 28 Aug 2013 09:56:37 +0200 Subject: [PATCH] gui fixes --- webui/language/de/messages.php | 1 + webui/language/en/messages.php | 1 + webui/language/hu/messages.iso-8859-2.php | 1 + webui/language/hu/messages.php | 1 + webui/language/pt/messages.php | 1 + webui/model/health/health.php | 2 +- webui/view/javascript/fileupload.js | 169 +++ webui/view/javascript/jscolor.js | 1000 +++++++++++++++++ .../default/assets/css/metro-bootstrap.css | 40 +- .../theme/default/templates/common/layout.tpl | 2 + .../theme/default/templates/customer/list.tpl | 22 +- .../theme/default/templates/health/worker.tpl | 2 +- .../theme/default/templates/search/helper.tpl | 14 +- .../theme/default/templates/search/popup.tpl | 4 +- .../theme/mobile/stylesheet/style-mobile.css | 25 + .../theme/mobile/templates/common/layout.tpl | 4 +- .../theme/mobile/templates/customer/list.tpl | 62 +- .../theme/mobile/templates/health/worker.tpl | 2 +- .../theme/mobile/templates/search/popup.tpl | 4 +- 19 files changed, 1304 insertions(+), 53 deletions(-) create mode 100644 webui/view/javascript/fileupload.js create mode 100644 webui/view/javascript/jscolor.js diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php index 11aca9c3..74f066b1 100644 --- a/webui/language/de/messages.php +++ b/webui/language/de/messages.php @@ -298,6 +298,7 @@ $_['text_search_group_to_add'] = "Hinzuzufügende Gruppe suchen"; $_['text_search_terms'] = "Suchkriterien"; $_['text_select_action'] = "Aktion wählen"; $_['text_select_all'] = "Alles auswählen"; +$_['text_select_image'] = "Select image"; $_['text_select_recipients'] = "Empfänger auswählen"; $_['text_sender'] = "Absender"; $_['text_sending_domains'] = "Absenderdomäne"; diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php index 07830b0e..a81022ad 100644 --- a/webui/language/en/messages.php +++ b/webui/language/en/messages.php @@ -298,6 +298,7 @@ $_['text_search_group_to_add'] = "Search group to add"; $_['text_search_terms'] = "Search terms"; $_['text_select_action'] = "Select action"; $_['text_select_all'] = "Select all"; +$_['text_select_image'] = "Select image"; $_['text_select_recipients'] = "Select recipients"; $_['text_sender'] = "Sender"; $_['text_sending_domains'] = "sending domains"; diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php index 10075c7f..1abdd30e 100644 --- a/webui/language/hu/messages.iso-8859-2.php +++ b/webui/language/hu/messages.iso-8859-2.php @@ -298,6 +298,7 @@ $_['text_search_group_to_add'] = " $_['text_search_terms'] = "Keresési feltételek"; $_['text_select_action'] = "Mûvelet választás"; $_['text_select_all'] = "Mindegyik kijelölése"; +$_['text_select_image'] = "Válasszon képet"; $_['text_select_recipients'] = "Címzettek kijelölése"; $_['text_sender'] = "Feladó"; $_['text_sending_domains'] = "küldõ domain"; diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php index 9e7341a1..e0f76559 100644 --- a/webui/language/hu/messages.php +++ b/webui/language/hu/messages.php @@ -298,6 +298,7 @@ $_['text_search_group_to_add'] = "írja be a csoport nevének elejét"; $_['text_search_terms'] = "Keresési feltételek"; $_['text_select_action'] = "Művelet választás"; $_['text_select_all'] = "Mindegyik kijelölése"; +$_['text_select_image'] = "Válasszon képet"; $_['text_select_recipients'] = "Címzettek kijelölése"; $_['text_sender'] = "Feladó"; $_['text_sending_domains'] = "küldÅ‘ domain"; diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php index f8265ae6..e7e9067d 100644 --- a/webui/language/pt/messages.php +++ b/webui/language/pt/messages.php @@ -292,6 +292,7 @@ $_['text_search_group_to_add'] = "Pesquisar grupos para adicionar"; $_['text_search_terms'] = "Pesquisar strings"; $_['text_select_action'] = "Selecionar ação"; $_['text_select_all'] = "Selcionar todos"; +$_['text_select_image'] = "Select image"; $_['text_select_recipients'] = "Selcionar recipiente"; $_['text_sender'] = "Remetente"; $_['text_sending_domains'] = "envio de domínios"; diff --git a/webui/model/health/health.php b/webui/model/health/health.php index 08635aa7..21f94f87 100644 --- a/webui/model/health/health.php +++ b/webui/model/health/health.php @@ -169,7 +169,7 @@ class ModelHealthHealth extends Model { public function get_oldest_record_ts() { $data = array(); - $query = $this->db->query("SELECT MIN(`arrived`) AS `oldest_record_ts` FROM " . TABLE_META); + $query = $this->db->query("SELECT `sent` AS `oldest_record_ts` FROM " . TABLE_META . " WHERE deleted=0 ORDER BY `arrived` ASC LIMIT 1"); if(isset($query->rows)) { $data = array_pop($query->rows); diff --git a/webui/view/javascript/fileupload.js b/webui/view/javascript/fileupload.js new file mode 100644 index 00000000..97a6da5b --- /dev/null +++ b/webui/view/javascript/fileupload.js @@ -0,0 +1,169 @@ +/* =========================================================== + * bootstrap-fileupload.js j2 + * http://jasny.github.com/bootstrap/javascript.html#fileupload + * =========================================================== + * Copyright 2012 Jasny BV, Netherlands. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +!function ($) { + + "use strict"; // jshint ;_ + + /* FILEUPLOAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Fileupload = function (element, options) { + this.$element = $(element) + this.type = this.$element.data('uploadtype') || (this.$element.find('.thumbnail').length > 0 ? "image" : "file") + + this.$input = this.$element.find(':file') + if (this.$input.length === 0) return + + this.name = this.$input.attr('name') || options.name + + this.$hidden = this.$element.find('input[type=hidden][name="'+this.name+'"]') + if (this.$hidden.length === 0) { + this.$hidden = $('') + this.$element.prepend(this.$hidden) + } + + this.$preview = this.$element.find('.fileupload-preview') + var height = this.$preview.css('height') + if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height) + + this.original = { + 'exists': this.$element.hasClass('fileupload-exists'), + 'preview': this.$preview.html(), + 'hiddenVal': this.$hidden.val() + } + + this.$remove = this.$element.find('[data-dismiss="fileupload"]') + + this.$element.find('[data-trigger="fileupload"]').on('click.fileupload', $.proxy(this.trigger, this)) + + this.listen() + } + + Fileupload.prototype = { + + listen: function() { + this.$input.on('change.fileupload', $.proxy(this.change, this)) + $(this.$input[0].form).on('reset.fileupload', $.proxy(this.reset, this)) + if (this.$remove) this.$remove.on('click.fileupload', $.proxy(this.clear, this)) + }, + + change: function(e, invoked) { + if (invoked === 'clear') return + + var file = e.target.files !== undefined ? e.target.files[0] : (e.target.value ? { name: e.target.value.replace(/^.+\\/, '') } : null) + + if (!file) { + this.clear() + return + } + + this.$hidden.val('') + this.$hidden.attr('name', '') + this.$input.attr('name', this.name) + + if (this.type === "image" && this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") { + var reader = new FileReader() + var preview = this.$preview + var element = this.$element + + reader.onload = function(e) { + preview.html('') + element.addClass('fileupload-exists').removeClass('fileupload-new') + } + + reader.readAsDataURL(file) + } else { + this.$preview.text(file.name) + this.$element.addClass('fileupload-exists').removeClass('fileupload-new') + } + }, + + clear: function(e) { + this.$hidden.val('') + this.$hidden.attr('name', this.name) + this.$input.attr('name', '') + + //ie8+ doesn't support changing the value of input with type=file so clone instead + if (navigator.userAgent.match(/msie/i)){ + var inputClone = this.$input.clone(true); + this.$input.after(inputClone); + this.$input.remove(); + this.$input = inputClone; + }else{ + this.$input.val('') + } + + this.$preview.html('') + this.$element.addClass('fileupload-new').removeClass('fileupload-exists') + + if (e) { + this.$input.trigger('change', [ 'clear' ]) + e.preventDefault() + } + }, + + reset: function(e) { + this.clear() + + this.$hidden.val(this.original.hiddenVal) + this.$preview.html(this.original.preview) + + if (this.original.exists) this.$element.addClass('fileupload-exists').removeClass('fileupload-new') + else this.$element.addClass('fileupload-new').removeClass('fileupload-exists') + }, + + trigger: function(e) { + this.$input.trigger('click') + e.preventDefault() + } + } + + + /* FILEUPLOAD PLUGIN DEFINITION + * =========================== */ + + $.fn.fileupload = function (options) { + return this.each(function () { + var $this = $(this) + , data = $this.data('fileupload') + if (!data) $this.data('fileupload', (data = new Fileupload(this, options))) + if (typeof options == 'string') data[options]() + }) + } + + $.fn.fileupload.Constructor = Fileupload + + + /* FILEUPLOAD DATA-API + * ================== */ + + $(document).on('click.fileupload.data-api', '[data-provides="fileupload"]', function (e) { + var $this = $(this) + if ($this.data('fileupload')) return + $this.fileupload($this.data()) + + var $target = $(e.target).closest('[data-dismiss="fileupload"],[data-trigger="fileupload"]'); + if ($target.length > 0) { + $target.trigger('click.fileupload') + e.preventDefault() + } + }) + +}(window.jQuery); diff --git a/webui/view/javascript/jscolor.js b/webui/view/javascript/jscolor.js new file mode 100644 index 00000000..96918e4b --- /dev/null +++ b/webui/view/javascript/jscolor.js @@ -0,0 +1,1000 @@ +/** + * jscolor, JavaScript Color Picker + * + * @version 1.4.1 + * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html + * @author Jan Odvarko, http://odvarko.cz + * @created 2008-06-15 + * @updated 2013-04-08 + * @link http://jscolor.com + */ + + +var jscolor = { + + + dir : '', // location of jscolor directory (leave empty to autodetect) + bindClass : 'color', // class name + binding : true, // automatic binding via + preloading : true, // use image preloading? + + + install : function() { + jscolor.addEvent(window, 'load', jscolor.init); + }, + + + init : function() { + if(jscolor.binding) { + jscolor.bind(); + } + if(jscolor.preloading) { + jscolor.preload(); + } + }, + + + getDir : function() { + if(!jscolor.dir) { + var detected = jscolor.detectDir(); + jscolor.dir = detected!==false ? detected : 'jscolor/'; + } + return jscolor.dir; + }, + + getImageDir : function() { + var path = jscolor.getDir(); + var split = path.split("/"); + return split.slice(0, split.length - 2).join("/") + "/images/"; + }, + + detectDir : function() { + var base = location.href; + + var e = document.getElementsByTagName('base'); + for(var i=0; i vs[a] ? + (-vp[a]+tp[a]+ts[a]/2 > vs[a]/2 && tp[a]+ts[a]-ps[a] >= 0 ? tp[a]+ts[a]-ps[a] : tp[a]) : + tp[a], + -vp[b]+tp[b]+ts[b]+ps[b]-l+l*c > vs[b] ? + (-vp[b]+tp[b]+ts[b]/2 > vs[b]/2 && tp[b]+ts[b]-l-l*c >= 0 ? tp[b]+ts[b]-l-l*c : tp[b]+ts[b]-l+l*c) : + (tp[b]+ts[b]-l+l*c >= 0 ? tp[b]+ts[b]-l+l*c : tp[b]+ts[b]-l-l*c) + ]; + } + drawPicker(pp[a], pp[b]); + } + }; + + + this.importColor = function() { + if(!valueElement) { + this.exportColor(); + } else { + if(!this.adjust) { + if(!this.fromString(valueElement.value, leaveValue)) { + styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage; + styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor; + styleElement.style.color = styleElement.jscStyle.color; + this.exportColor(leaveValue | leaveStyle); + } + } else if(!this.required && /^\s*$/.test(valueElement.value)) { + valueElement.value = ''; + styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage; + styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor; + styleElement.style.color = styleElement.jscStyle.color; + this.exportColor(leaveValue | leaveStyle); + + } else if(this.fromString(valueElement.value)) { + // OK + } else { + this.exportColor(); + } + } + }; + + + this.exportColor = function(flags) { + if(!(flags & leaveValue) && valueElement) { + var value = this.toString(); + if(this.caps) { value = value.toUpperCase(); } + if(this.hash) { value = '#'+value; } + valueElement.value = value; + } + if(!(flags & leaveStyle) && styleElement) { + styleElement.style.backgroundImage = "none"; + styleElement.style.backgroundColor = + '#'+this.toString(); + styleElement.style.color = + 0.213 * this.rgb[0] + + 0.715 * this.rgb[1] + + 0.072 * this.rgb[2] + < 0.5 ? '#FFF' : '#000'; + } + if(!(flags & leavePad) && isPickerOwner()) { + redrawPad(); + } + if(!(flags & leaveSld) && isPickerOwner()) { + redrawSld(); + } + }; + + + this.fromHSV = function(h, s, v, flags) { // null = don't change + if(h !== null) { h = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, h)); } + if(s !== null) { s = Math.max(0.0, this.minS, Math.min(1.0, this.maxS, s)); } + if(v !== null) { v = Math.max(0.0, this.minV, Math.min(1.0, this.maxV, v)); } + + this.rgb = HSV_RGB( + h===null ? this.hsv[0] : (this.hsv[0]=h), + s===null ? this.hsv[1] : (this.hsv[1]=s), + v===null ? this.hsv[2] : (this.hsv[2]=v) + ); + + this.exportColor(flags); + }; + + + this.fromRGB = function(r, g, b, flags) { // null = don't change + if(r !== null) { r = Math.max(0.0, Math.min(1.0, r)); } + if(g !== null) { g = Math.max(0.0, Math.min(1.0, g)); } + if(b !== null) { b = Math.max(0.0, Math.min(1.0, b)); } + + var hsv = RGB_HSV( + r===null ? this.rgb[0] : r, + g===null ? this.rgb[1] : g, + b===null ? this.rgb[2] : b + ); + if(hsv[0] !== null) { + this.hsv[0] = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, hsv[0])); + } + if(hsv[2] !== 0) { + this.hsv[1] = hsv[1]===null ? null : Math.max(0.0, this.minS, Math.min(1.0, this.maxS, hsv[1])); + } + this.hsv[2] = hsv[2]===null ? null : Math.max(0.0, this.minV, Math.min(1.0, this.maxV, hsv[2])); + + // update RGB according to final HSV, as some values might be trimmed + var rgb = HSV_RGB(this.hsv[0], this.hsv[1], this.hsv[2]); + this.rgb[0] = rgb[0]; + this.rgb[1] = rgb[1]; + this.rgb[2] = rgb[2]; + + this.exportColor(flags); + }; + + + this.fromString = function(hex, flags) { + var m = hex.match(/^\W*([0-9A-F]{3}([0-9A-F]{3})?)\W*$/i); + if(!m) { + return false; + } else { + if(m[1].length === 6) { // 6-char notation + this.fromRGB( + parseInt(m[1].substr(0,2),16) / 255, + parseInt(m[1].substr(2,2),16) / 255, + parseInt(m[1].substr(4,2),16) / 255, + flags + ); + } else { // 3-char notation + this.fromRGB( + parseInt(m[1].charAt(0)+m[1].charAt(0),16) / 255, + parseInt(m[1].charAt(1)+m[1].charAt(1),16) / 255, + parseInt(m[1].charAt(2)+m[1].charAt(2),16) / 255, + flags + ); + } + return true; + } + }; + + + this.toString = function() { + return ( + (0x100 | Math.round(255*this.rgb[0])).toString(16).substr(1) + + (0x100 | Math.round(255*this.rgb[1])).toString(16).substr(1) + + (0x100 | Math.round(255*this.rgb[2])).toString(16).substr(1) + ); + }; + + + function RGB_HSV(r, g, b) { + var n = Math.min(Math.min(r,g),b); + var v = Math.max(Math.max(r,g),b); + var m = v - n; + if(m === 0) { return [ null, 0, v ]; } + var h = r===n ? 3+(b-g)/m : (g===n ? 5+(r-b)/m : 1+(g-r)/m); + return [ h===6?0:h, m/v, v ]; + } + + + function HSV_RGB(h, s, v) { + if(h === null) { return [ v, v, v ]; } + var i = Math.floor(h); + var f = i%2 ? h-i : 1-(h-i); + var m = v * (1 - s); + var n = v * (1 - s*f); + switch(i) { + case 6: + case 0: return [v,n,m]; + case 1: return [n,v,m]; + case 2: return [m,v,n]; + case 3: return [m,n,v]; + case 4: return [n,m,v]; + case 5: return [v,m,n]; + } + } + + + function removePicker() { + delete jscolor.picker.owner; + document.getElementsByTagName('body')[0].removeChild(jscolor.picker.boxB); + } + + + function drawPicker(x, y) { + if(!jscolor.picker) { + jscolor.picker = { + box : document.createElement('div'), + boxB : document.createElement('div'), + pad : document.createElement('div'), + padB : document.createElement('div'), + padM : document.createElement('div'), + sld : document.createElement('div'), + sldB : document.createElement('div'), + sldM : document.createElement('div'), + btn : document.createElement('div'), + btnS : document.createElement('span'), + btnT : document.createTextNode(THIS.pickerCloseText) + }; + for(var i=0,segSize=4; ili>a,.nav-collapse .dropdown-menu a{font-weight:normal;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .nav-collapse .nav>li>a:hover,.nav-collapse ul.nav li.dropdown ul.dropdown-menu li a:hover{color:#fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#555555;} .navbar .nav li.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;} .dropdown-menu li>a:hover{background-color:#00f;}}@media (max-width:767px){#mainscreen{top:162px;} #pagingrow{border-right:none;border-bottom:1px solid #ccc;} #functionrow{border-left:none;} .boxfooter{height:67px;}} -.message_highlight { background: lightblue; } +.btn-file{position:relative;overflow:hidden;vertical-align:middle;} +.btn-file>input{position:absolute;top:0;right:0;margin:0;font-size:23px;cursor:pointer;opacity:0;filter:alpha(opacity=0);transform:translate(-300px, 0) scale(4);direction:ltr;} +.fileupload{margin-bottom:9px;} +.fileupload .uneditable-input{display:inline-block;margin-bottom:0;vertical-align:middle;cursor:text;} +.fileupload .thumbnail{display:inline-block;margin-bottom:5px;overflow:hidden;text-align:center;vertical-align:middle;} +.fileupload .thumbnail>img{display:inline-block;max-height:100%;vertical-align:middle;} +.fileupload .btn{vertical-align:middle;} +.fileupload-exists .fileupload-new,.fileupload-new .fileupload-exists{display:none;} +.fileupload-inline .fileupload-controls{display:inline;} +.fileupload-new .input-append .btn-file{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.thumbnail-borderless .thumbnail{padding:0;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.fileupload-new.thumbnail-borderless .thumbnail{border:1px solid #ddd;} +.control-group.warning .fileupload .uneditable-input{color:#a47e3c;border-color:#a47e3c;} +.control-group.warning .fileupload .fileupload-preview{color:#a47e3c;} +.control-group.warning .fileupload .thumbnail{border-color:#a47e3c;} +.control-group.error .fileupload .uneditable-input{color:#b94a48;border-color:#b94a48;} +.control-group.error .fileupload .fileupload-preview{color:#b94a48;} +.control-group.error .fileupload .thumbnail{border-color:#b94a48;} +.control-group.success .fileupload .uneditable-input{color:#468847;border-color:#468847;} +.control-group.success .fileupload .fileupload-preview{color:#468847;} +.control-group.success .fileupload .thumbnail{border-color:#468847;} +@media (min-width:980px){body{padding-top:65px;}}@media (max-width:980px){.navbar-fixed-top{margin-bottom:10px;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{font-weight:normal;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .nav-collapse .nav>li>a:hover,.nav-collapse ul.nav li.dropdown ul.dropdown-menu li a:hover{color:#fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#555555;} .navbar .nav li.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;} .dropdown-menu li>a:hover{background-color:#00f;}}@media (max-width:767px){#mainscreen{top:162px;} #pagingrow{border-bottom:1px solid #ccc;} #pagingbox{border-right:none;} #functionbox{border-left:none;} .boxlistcontent{bottom:68px;overflow:scroll;} .boxfooter{height:67px;}} diff --git a/webui/view/theme/default/templates/common/layout.tpl b/webui/view/theme/default/templates/common/layout.tpl index 61457be9..1b620810 100644 --- a/webui/view/theme/default/templates/common/layout.tpl +++ b/webui/view/theme/default/templates/common/layout.tpl @@ -21,6 +21,8 @@ + + diff --git a/webui/view/theme/default/templates/customer/list.tpl b/webui/view/theme/default/templates/customer/list.tpl index ef3fe37f..403457f9 100644 --- a/webui/view/theme/default/templates/customer/list.tpl +++ b/webui/view/theme/default/templates/customer/list.tpl @@ -59,7 +59,14 @@
">
- +
+
+ +
+
+ + +
@@ -70,21 +77,24 @@ +
"> - +
-   +
+
"> - +
-   +
+
0)) { ?> @@ -121,7 +131,7 @@ - +   diff --git a/webui/view/theme/default/templates/health/worker.tpl b/webui/view/theme/default/templates/health/worker.tpl index 9e085257..32db619e 100644 --- a/webui/view/theme/default/templates/health/worker.tpl +++ b/webui/view/theme/default/templates/health/worker.tpl @@ -91,7 +91,7 @@ - + diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl index 968c2e89..092fa117 100644 --- a/webui/view/theme/default/templates/search/helper.tpl +++ b/webui/view/theme/default/templates/search/helper.tpl @@ -49,7 +49,11 @@   - [+] + + title="" onclick="Piler.view_message_by_pos();"> [+] + + [+] +   0) { ?>  @@ -114,7 +118,8 @@
-
+
+
0){ ?>   0) { ?> @@ -128,11 +133,12 @@   +
-
+
-
+
:  diff --git a/webui/view/theme/default/templates/search/popup.tpl b/webui/view/theme/default/templates/search/popup.tpl index 26f5fc5a..cf1e826f 100644 --- a/webui/view/theme/default/templates/search/popup.tpl +++ b/webui/view/theme/default/templates/search/popup.tpl @@ -65,14 +65,14 @@
- +
- +
diff --git a/webui/view/theme/mobile/stylesheet/style-mobile.css b/webui/view/theme/mobile/stylesheet/style-mobile.css index 118835b9..539bfd2d 100644 --- a/webui/view/theme/mobile/stylesheet/style-mobile.css +++ b/webui/view/theme/mobile/stylesheet/style-mobile.css @@ -174,6 +174,31 @@ table.rc-table-resizing { cursor: ew-resize; } table.rc-table-resizing thead, table.rc-table-resizing thead > th, table.rc-table-resizing thead > th > a { cursor: ew-resize; } + + + + .btn-file{position:relative;overflow:hidden;vertical-align:middle;} + .btn-file>input{position:absolute;top:0;right:0;margin:0;font-size:23px;cursor:pointer;opacity:0;filter:alpha(opacity=0);transform:translate(-300px, 0) scale(4);direction:ltr;} + .fileupload{margin-bottom:9px;} + .fileupload .uneditable-input{display:inline-block;margin-bottom:0;vertical-align:middle;cursor:text;} + .fileupload .thumbnail{display:inline-block;margin-bottom:5px;overflow:hidden;text-align:center;vertical-align:middle;} + .fileupload .thumbnail>img{display:inline-block;max-height:100%;vertical-align:middle;} + .fileupload .btn{vertical-align:middle;} + .fileupload-exists .fileupload-new,.fileupload-new .fileupload-exists{display:none;} + .fileupload-inline .fileupload-controls{display:inline;} + .fileupload-new .input-append .btn-file{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} + .thumbnail-borderless .thumbnail{padding:0;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} + .fileupload-new.thumbnail-borderless .thumbnail{border:1px solid #ddd;} + .control-group.warning .fileupload .uneditable-input{color:#a47e3c;border-color:#a47e3c;} + .control-group.warning .fileupload .fileupload-preview{color:#a47e3c;} + .control-group.warning .fileupload .thumbnail{border-color:#a47e3c;} + .control-group.error .fileupload .uneditable-input{color:#b94a48;border-color:#b94a48;} + .control-group.error .fileupload .fileupload-preview{color:#b94a48;} + .control-group.error .fileupload .thumbnail{border-color:#b94a48;} + .control-group.success .fileupload .uneditable-input{color:#468847;border-color:#468847;} + .control-group.success .fileupload .fileupload-preview{color:#468847;} + .control-group.success .fileupload .thumbnail{border-color:#468847;} + } diff --git a/webui/view/theme/mobile/templates/common/layout.tpl b/webui/view/theme/mobile/templates/common/layout.tpl index 4f798839..834bb3dc 100644 --- a/webui/view/theme/mobile/templates/common/layout.tpl +++ b/webui/view/theme/mobile/templates/common/layout.tpl @@ -22,6 +22,8 @@ + + @@ -45,7 +47,7 @@ if(isset($this->request->get['route'])) {
-
+

diff --git a/webui/view/theme/mobile/templates/customer/list.tpl b/webui/view/theme/mobile/templates/customer/list.tpl index 6d4dd44b..36132e7f 100644 --- a/webui/view/theme/mobile/templates/customer/list.tpl +++ b/webui/view/theme/mobile/templates/customer/list.tpl @@ -53,12 +53,22 @@
-
+ +
">
- +
+
+ +
+
+ + +
+
+
@@ -68,13 +78,13 @@
-     +
-     +
@@ -93,32 +103,32 @@ - -
-
-
-
-
-
-
-
 
-
 
-
+ + + + + + + + + + + -
-
-
-
-
-
-
-
-
 
-
+ + + + + + + + + + - +
  
 
diff --git a/webui/view/theme/mobile/templates/health/worker.tpl b/webui/view/theme/mobile/templates/health/worker.tpl index fd3e29d5..d1c6778f 100644 --- a/webui/view/theme/mobile/templates/health/worker.tpl +++ b/webui/view/theme/mobile/templates/health/worker.tpl @@ -88,7 +88,7 @@
- +
diff --git a/webui/view/theme/mobile/templates/search/popup.tpl b/webui/view/theme/mobile/templates/search/popup.tpl index 064811ad..7a273ced 100644 --- a/webui/view/theme/mobile/templates/search/popup.tpl +++ b/webui/view/theme/mobile/templates/search/popup.tpl @@ -57,12 +57,12 @@
-
:
+
:
-
 
+
: