gui fixes

This commit is contained in:
SJ 2013-08-28 09:56:37 +02:00
parent 7b8932176c
commit 983de87dfb
19 changed files with 1304 additions and 53 deletions

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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);

View File

@ -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 = $('<input type="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('<img src="' + e.target.result + '" ' + (preview.css('max-height') != 'none' ? 'style="max-height: ' + preview.css('max-height') + ';"' : '') + ' />')
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);

File diff suppressed because it is too large Load Diff

View File

@ -1638,14 +1638,15 @@ html,body{background-color:#ffffff;}
.ui-state-error{border-color:#c31d1d;color:#ffffff;background:#c31d1d;}
.ui-state-error .ui-icon{background-image:url(../images/ui-icons_ffffff_0.png);}
.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:middle;}
#piler1.container-fluid{padding-top:0;}
#piler1.container-fluid{padding-top:0;max-height:46px;}
html,body{height:auto !important;height:100%;min-height:100%;}
.navbar .brand{padding:9.5px 20px;}
.navbar-inner{padding-bottom:0;}
#pagingrow{background-color:#eeeeee;border-right:1px solid #ccc;padding:4px;height:33px;overflow:hidden;}
#tagbox{border-left:1px solid #ccc;height:33px;overflow:hidden;}
#tagbox a.btn-custom{padding:8px;}
#tagbox input#tag_value{height:33px;padding:1px;min-width:40px;max-width:140px;width:auto;}
#pagingrow,#functionrow{height:33px;overflow:hidden;}
#pagingbox{background-color:#eeeeee;border-right:1px solid #ccc;padding:4px;height:25px;overflow:hidden;min-width:180px;}
#functionbox{border-left:1px solid #ccc;height:33px;overflow:hidden;}
#functionbox a.btn-custom{padding:8px;}
#functionbox input#tag_value{height:33px;padding:1px;min-width:40px;max-width:140px;width:auto;}
.boxfooter .input-prepend .add-on,.boxfooter input{border-top:none;border-bottom:none;}
#messagebox1{position:absolute;top:150px;z-index:2;width:300px;margin-left:-150px;left:50%;display:none;text-align:center;}
#searchpopup1{position:relative;top:-10px;right:0px;border:1px solid #999999;display:none;background:#f8f8f8;color:#000;font-weight:bold;padding:0;z-index:1;width:500px;}
@ -1656,6 +1657,7 @@ html,body{height:auto !important;height:100%;min-height:100%;}
#restorebox{position:absolute;top:40px;left:15%;display:none;font-weight:bold;padding:15px;z-index:1;}
#notesbox{position:absolute;top:8px;right:8px;}
#sspinner{display:none;}
.message_highlight{background:lightblue;}
#searchcontainer{text-align:center;min-width:320px;}
#searchcontainer label{display:none;height:0;}
#searchcontainer input{height:26px;width:100%;}
@ -1663,7 +1665,7 @@ html,body{height:auto !important;height:100%;min-height:100%;}
#searchcontainer #button_expert{width:40%;}
#searchcontainer #button_audit{width:100%;}
#searchcontainer #button_search,#searchcontainer #button_options{width:30%;}
#mainscreen{position:absolute;top:120px;right:20px;bottom:20px;left:20px;min-width:320px;}
#mainscreen{position:absolute;top:120px;right:20px;bottom:20px;left:20px;min-width:320px;z-index:-1;}
#mailleftcontainer{position:absolute;top:0;left:0;bottom:0;width:195px;}
#mailboxlist-container{position:absolute;top:0;left:0;width:100%;bottom:0;border:1px solid #999999;border-top:none;background-color:#f9f9f9;overflow:hidden;}
.boxlistcontent{position:absolute;top:0px;bottom:34px;left:0;right:0;width:100%;overflow-y:auto;overflow-x:hidden;height:auto;}
@ -1671,7 +1673,7 @@ html,body{height:auto !important;height:100%;min-height:100%;}
#mailboxlist{position:relative;height:auto;margin:0px;padding:0px;list-style-image:none;list-style-type:none;overflow:hidden;white-space:nowrap;background-color:#FFF;}
#mailrightcontainer{position:absolute;top:0;left:170px;bottom:0;right:0;min-width:400px;}
#mailrightcontent{position:absolute;top:0px;left:0;right:0;bottom:0;}
#mailcontframe{position:absolute;width:100%;top:0;bottom:0;border:1px solid #999999;background-color:#F9F9F9;overflow:hidden;}
#mailcontframe{position:absolute;width:100%;top:1px;bottom:0;border:1px solid #999999;background-color:#F9F9F9;overflow:hidden;}
#mailpreviewframe{position:absolute;width:100%;top:205px;bottom:0px;border:1px solid #999999;background-color:#F9F9F9;text-align:left;overflow:auto;}
#messagecontframe{position:relative;top:0px;left:0px;right:0px;bottom:0px;width:100%;height:100%;border:1px solid #00f;}
.messageheader{background-color:#f6f6f6;padding:8px;border-bottom:1px solid #666;}
@ -1703,5 +1705,25 @@ body#loginpage{background-color:#fcfcfc;padding-top:40px;padding-bottom:40px;}
.form-signin input[type="text"],.form-signin input[type="password"]{font-size:16px;height:auto;margin-bottom:15px;padding:7px 9px;}
.alert-general{background-color:#eeeeee;border-color:#555555;color:#555555;}
.alert-general h4{color:#333333;}
@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-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;}}

View File

@ -21,6 +21,8 @@
<script type="text/javascript" src="/view/javascript/jquery.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery-ui-custom.min.js"></script>
<script type="text/javascript" src="/view/javascript/jscolor.js"></script>
<script type="text/javascript" src="/view/javascript/fileupload.js"></script>
<script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
<script type="text/javascript" src="/view/theme/default/assets/js/bootstrap.js"></script>
<script type="text/javascript" src="/view/javascript/piler.js"></script>

View File

@ -59,7 +59,14 @@
<div class="control-group<?php if(isset($errors['branding_logo'])){ print " error"; } ?>">
<label class="control-label" for="branding_logo"><?php print $text_branding_logo; ?>:</label>
<div class="controls">
<input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" value="<?php if(isset($a['branding_logo'])) { print $a['branding_logo']; } ?>"/> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
<div class="fileupload fileupload-new" data-provides="fileupload">
<div class="fileupload-new thumbnail" style="width: 50px; height: 50px;">
<?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" style="max-height: 50px;" /><?php } else { ?><img src="http://www.placehold.it/50x50/EFEFEF/AAAAAA" /><?php } ?>
</div>
<div class="fileupload-preview fileupload-exists thumbnail" style="width: 50px; height: 50px;"></div>
<span class="btn btn-file"><span class="fileupload-new"><?php print $text_select_image; ?></span><span class="fileupload-exists"><?php print $text_modify; ?></span><input type="file" name="branding_logo" id="branding_logo" /></span>
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><?php print $text_remove; ?></a>
</div>
<?php if ( isset($errors['branding_logo']) ) { ?><span class="help-inline"><?php print $errors['branding_logo']; ?></span><?php } ?>
</div>
</div>
@ -70,21 +77,24 @@
<?php if ( isset($errors['support_link']) ) { ?><span class="help-inline"><?php print $errors['support_link']; ?></span><?php } ?>
</div>
</div>
<div class="control-group<?php if(isset($errors['background_colour'])){ print " error"; } ?>">
<label class="control-label" for="colour"><?php print $text_background_colour; ?>:</label>
<label class="control-label" for="background_colour"><?php print $text_background_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="background_colour" id="background_colour" placeholder="" value="<?php if(isset($a['background_colour'])) { print $a['background_colour']; } ?>" oninput="Piler.change_box_colour('background_colour', 'cp');" /> <span id="cp" class="label" style="<?php if(isset($a['background_colour'])) { ?>background: <?php print $a['background_colour']; ?>;<?php } ?>">&nbsp;</span>
<input type="text" class="text color {hash:true}" name="background_colour" id="background_colour" placeholder="" value="<?php if(isset($a['background_colour'])) { print $a['background_colour']; } ?>" />
<?php if ( isset($errors['background_colour']) ) { ?><span class="help-inline"><?php print $errors['background_colour']; ?></span><?php } ?>
</div>
</div>
<div class="control-group<?php if(isset($errors['text_colour'])){ print " error"; } ?>">
<label class="control-label" for="colour"><?php print $text_text_colour; ?>:</label>
<label class="control-label" for="text_colour"><?php print $text_text_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="text_colour" id="text_colour" placeholder="" value="<?php if(isset($a['text_colour'])) { print $a['text_colour']; } ?>" oninput="Piler.change_box_colour('text_colour', 'cp2');" /> <span id="cp2" class="label" style="<?php if(isset($a['text_colour'])) { ?>background: <?php print $a['text_colour']; ?>;<?php } ?>">&nbsp;</span>
<input type="text" class="text color {hash:true}" name="text_colour" id="text_colour" placeholder="" value="<?php if(isset($a['text_colour'])) { print $a['text_colour']; } ?>" />
<?php if ( isset($errors['text_colour']) ) { ?><span class="help-inline"><?php print $errors['text_colour']; ?></span><?php } ?>
</div>
</div>
<div class="form-actions">
<input type="submit" value="<?php if(isset($id) && ($id > 0)) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
<?php if(isset($id) && ($id > 0)) { ?>
@ -121,7 +131,7 @@
<td><?php print $e['domain']; ?></td>
<td><?php print $e['branding_text']; ?></td>
<td><?php print $e['branding_url']; ?></td>
<td><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></td>
<td><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" style="height: 50px;" /><?php } ?></td>
<td><span class="label" style="background-color:<?php print $e['background_colour']; ?>"><?php print $e['background_colour']; ?></span></td>
<td><span class="label" style="background-color:<?php print $e['text_colour']; ?>"><?php print $e['text_colour']; ?></span></td>
<td><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit; ?></a></td>

View File

@ -91,7 +91,7 @@
</tr>
<tr>
<td><?php print $text_oldest_record; ?></td>
<td><?php print date("d M Y", $oldestmessagets); ?></td>
<td><?php print date(DATE_TEMPLATE, $oldestmessagets); ?></td>
</tr>
<tr>
<td><?php print $text_processed_emails; ?></td>

View File

@ -49,7 +49,11 @@
<td id="c3_r<?php print $i; ?>" class="resultcell date"><?php print $message['date']; ?></td>
<td id="c4_r<?php print $i; ?>" class="resultcell from"><?php if($message['from'] != $message['shortfrom']) { ?><span title="<?php print $message['from']; ?>"><?php print $message['shortfrom']; ?></span><?php } else { print $message['from']; } ?></td>
<td id="c5_r<?php print $i; ?>" class="resultcell to"><?php if($message['to'] != $message['shortto']) { ?><span title="<?php print $message['to']; ?>"><?php print $message['shortto']; ?>&nbsp;<i class=" muted icon-group"></i></span><?php } else { print $message['to']; } ?></td>
<td id="c6_r<?php print $i; ?>" class="resultcell subject"><?php if($message['subject'] != $message['shortsubject']) { print $message['subject']; } else { print $message['subject']; } ?> <?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
<td id="c6_r<?php print $i; ?>" class="resultcell subject"><a href="#" <?php if($message['subject'] != $message['shortsubject']) { ?>title="<?php $message['subject']; ?>"<?php } ?> onclick="Piler.view_message_by_pos(<?php print $i; ?>);"><?php if($message['subject'] != $message['shortsubject']) { print $message['subject']; } else { print $message['subject']; } ?></a><?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
<td id="c6_r<?php print $i; ?>" class="resultcell subject"><a href="#" onclick="Piler.view_message_by_pos(<?php print $i; ?>);"><?php print $message['subject']; ?></a><?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
<td id="c7_r<?php print $i; ?>" class="resultcell size"><?php print $message['size']; ?></td>
<td id="c8_r<?php print $i; ?>" class="resultcell end"><?php if($message['spam'] == 1) { ?><i class="spam icon-warning-sign icon-large" title="<?php print $text_spam_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
<td id="c9_r<?php print $i; ?>" class="resultcell end"><?php if($message['attachments'] > 0) { ?><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
@ -114,7 +118,8 @@
<div id="messagelistfooter" class="boxfooter">
<div class="row-fluid">
<div id="pagingrow" class="span3">
<div id="pagingrow" class="span4">
<div id="pagingbox">
<?php if($n > 0){ ?>
&nbsp;
<?php if($page > 0) { ?><a href="#" class="navlink" onclick="Piler.navigation(0);"><i class="icon-double-angle-left icon-large"></i></a><?php } else { ?><span class="navlink"><i class="icon-double-angle-left icon-large muted"></i></span><?php } ?>
@ -128,11 +133,12 @@
<?php if($page < $total_pages) { ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $total_pages; ?>);"><i class="icon-double-angle-right icon-large"></i></a><?php } else { ?> <span class="navlink"><i class="icon-double-angle-right icon-large muted"></i></span><?php } ?>
&nbsp;
<?php } else { print $text_none_found; } ?>
</div>
</div>
<div id="functionrow" class="span9">
<div id="functionrow" class="span8">
<input type="hidden" id="tag_keys" name="tag_keys" value="<?php print $all_ids; ?>" />
<input type="hidden" id="_ref" name="_ref" value="<?php if(isset($_ref)) { print $_ref; } ?>" />
<div id="tagbox" class="input-prepend input-append pull-right">
<div id="functionbox" class="input-prepend input-append pull-right">
<span class="add-on"><?php print $text_with_selected; ?>:&nbsp;</span>
<a href="#" class="btn btn-custom btn-inverse" onclick="Piler.bulk_restore_messages('<?php print $text_restored; ?>'); " title="<?php print $text_bulk_restore_selected_emails; ?>"><i class="icon-share-alt"></i></a>
<a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_messages();" title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>

View File

@ -65,14 +65,14 @@
<div class="control-group">
<label class="control-label" for="date1"><?php print $text_from; ?> <?php print $text_date; ?>:</label>
<label class="control-label" for="date1"><?php print $text_date_from; ?>:</label>
<div class="controls">
<input type="text" name="date1" id="date1" size="11" value="<?php if(isset($date1)) { print $date1; } ?>" placeholder="<?php print DATE_FORMAT; ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="date2"><?php print $text_to; ?> <?php print $text_date; ?>:</label>
<label class="control-label" for="date2"><?php print $text_date_to; ?>:</label>
<div class="controls">
<input type="text" name="date2" id="date2" size="11" value="<?php if(isset($date2)) { print $date2; } ?>" placeholder="<?php print DATE_FORMAT; ?>" />
</div>

View File

@ -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;}
}

View File

@ -22,6 +22,8 @@
<script type="text/javascript" src="/view/javascript/jquery.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery-ui-custom.min.js"></script>
<script type="text/javascript" src="/view/javascript/bootstrap.min.js"></script>
<script type="text/javascript" src="/view/javascript/jscolor.js"></script>
<script type="text/javascript" src="/view/javascript/fileupload.js"></script>
<script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
<script type="text/javascript" src="/view/javascript/piler.js"></script>
@ -45,7 +47,7 @@ if(isset($this->request->get['route'])) {
<?php print $menu; ?>
</div>
<div id="mainscreen" class="with20margin">
<div id="mainscreen">
<?php if($title) { ?><h3 class="title"><?php print $title; ?></h3><?php } ?>

View File

@ -53,12 +53,22 @@
<input type="text" class="text" name="branding_url" id="branding_url" placeholder="" value="<?php if(isset($a['branding_url'])) { print $a['branding_url']; } ?>" />
</div>
</div>
<div class="control-group">
<div class="control-group<?php if(isset($errors['branding_logo'])){ print " error"; } ?>">
<label class="control-label" for="branding_logo"><?php print $text_branding_logo; ?>:</label>
<div class="controls">
<input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" /> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
<div class="fileupload fileupload-new" data-provides="fileupload">
<div class="fileupload-new thumbnail" style="width: 50px; height: 50px;">
<?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" style="max-height: 50px;" /><?php } else { ?><img src="http://www.placehold.it/50x50/EFEFEF/AAAAAA" /><?php } ?>
</div>
<div class="fileupload-preview fileupload-exists thumbnail" style="width: 50px; height: 50px;"></div>
<span class="btn btn-file"><span class="fileupload-new"><?php print $text_select_image; ?></span><span class="fileupload-exists"><?php print $text_modify; ?></span><input type="file" name="branding_logo" id="branding_logo" /></span>
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><?php print $text_remove; ?></a>
</div>
<?php if ( isset($errors['branding_logo']) ) { ?><span class="help-inline"><?php print $errors['branding_logo']; ?></span><?php } ?>
</div>
</div>
<div class="control-group">
<label class="control-label" for="support_link"><?php print $text_support_link; ?>:</label>
<div class="controls">
@ -68,13 +78,13 @@
<div class="control-group">
<label class="control-label" for="colour"><?php print $text_background_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="background_colour" id="background_colour" placeholder="" value="<?php if(isset($a['background_colour'])) { print $a['background_colour']; } ?>" oninput="Piler.change_box_colour('background_colour', 'cp');" /> <span id="cp" style="<?php if(isset($a['background_colour'])) { ?>background: <?php print $a['background_colour']; ?>;<?php } ?>">&nbsp;&nbsp;&nbsp;</span>
<input type="text" class="text color {hash:true}" name="background_colour" id="background_colour" placeholder="" value="<?php if(isset($a['background_colour'])) { print $a['background_colour']; } ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="colour"><?php print $text_text_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="text_colour" id="text_colour" placeholder="" value="<?php if(isset($a['text_colour'])) { print $a['text_colour']; } ?>" oninput="Piler.change_box_colour('text_colour', 'cp2');" /> <span id="cp2" style="<?php if(isset($a['text_colour'])) { ?>background: <?php print $a['text_colour']; ?>;<?php } ?>">&nbsp;&nbsp;&nbsp;</span>
<input type="text" class="text color {hash:true}" name="text_colour" id="text_colour" placeholder="" value="<?php if(isset($a['text_colour'])) { print $a['text_colour']; } ?>" />
</div>
</div>
@ -93,32 +103,32 @@
<?php if(isset($entries)){ ?>
<id="ss1">
<div class="domainrow">
<div class="domaincell"><?php print $text_domain; ?></div>
<div class="domaincell"><?php print $text_branding_text; ?></div>
<div class="domaincell"><?php print $text_branding_url; ?></div>
<div class="domaincell"><?php print $text_branding_logo; ?></div>
<div class="domaincell"><?php print $text_background_colour; ?></div>
<div class="domaincell"><?php print $text_text_colour; ?></div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
</div>
<table id="ss1" class="table table-striped table-condensed">
<tr>
<th><?php print $text_domain; ?></th>
<th><?php print $text_branding_text; ?></th>
<th><?php print $text_branding_url; ?></th>
<th><?php print $text_branding_logo; ?></th>
<th><?php print $text_background_colour; ?></th>
<th><?php print $text_text_colour; ?></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
<?php foreach($entries as $e) { ?>
<div class="domainrow">
<div class="domaincell"><?php print $e['domain']; ?></div>
<div class="domaincell"><?php print $e['branding_text']; ?></div>
<div class="domaincell"><?php print $e['branding_url']; ?></div>
<div class="domaincell"><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></div>
<div class="domaincell"><?php print $e['background_colour']; ?></div>
<div class="domaincell"><?php print $e['text_colour']; ?></div>
<div class="domaincell"><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><?php print $text_edit; ?></a></div>
<div class="domaincell"><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;name=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" class="confirm-delete" data-id="<?php print $e['id']; ?>" data-name="<?php print $e['domain']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></div>
</div>
<tr>
<td><?php print $e['domain']; ?></td>
<td><?php print $e['branding_text']; ?></td>
<td><?php print $e['branding_url']; ?></td>
<td><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" style="height: 50px;" /><?php } ?></td>
<td><?php print $e['background_colour']; ?></td>
<td><?php print $e['text_colour']; ?></td>
<td><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><?php print $text_edit; ?></a></td>
<td><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;name=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" class="confirm-delete" data-id="<?php print $e['id']; ?>" data-name="<?php print $e['domain']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
</tr>
<?php } ?>
</div>
</table>
<?php } else { ?>
<div class="alert alert-error lead">

View File

@ -88,7 +88,7 @@
<div class="row">
<div class="cellhealthleft"><?php print $text_oldest_record; ?></div>
<div class="cellhealthright">
<?php print date("d M Y", $oldestmessagets); ?>
<?php print date(DATE_TEMPLATE, $oldestmessagets); ?>
</div>
</div>

View File

@ -57,12 +57,12 @@
</div>
<div class="row">
<div class="cell1"><?php print $text_date; ?>: </div>
<div class="cell1"><?php print $text_date_from; ?>:</div>
<div class="cell2"><input type="text" name="date1" id="date1" size="11" value="<?php if(isset($date1)) { print $date1; } ?>" placeholder="<?php print DATE_FORMAT; ?>" /></div>
</div>
<div class="row">
<div class="cell1">&nbsp;</div>
<div class="cell1"><?php print $text_date_to; ?>:</div>
<div class="cell2"><input type="text" name="date2" id="date2" size="11" value="<?php if(isset($date2)) { print $date2; } ?>" placeholder="<?php print DATE_FORMAT; ?>" /></div>
</div>