From f5bc5dfa296a1517ebdb29b2dd0f81b09f136b6a Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 31 Aug 2016 01:59:46 +1000 Subject: [PATCH] Some theme and field updates --- media/theme/baseadmin/css/custom.css | 1 + media/theme/focusbusiness/css/custom.css | 147 +++++++++++++++++++++++ messages/register/account.php | 18 +++ views/field/date.php | 11 +- 4 files changed, 172 insertions(+), 5 deletions(-) create mode 100644 messages/register/account.php diff --git a/media/theme/baseadmin/css/custom.css b/media/theme/baseadmin/css/custom.css index 35b45e6..3e3014b 100644 --- a/media/theme/baseadmin/css/custom.css +++ b/media/theme/baseadmin/css/custom.css @@ -81,6 +81,7 @@ table .text-right { padding-right: 30px; font-weight: normal; color: #000; + border-radius: 8px; } .navbar .navbar-form .navbar-search-addon [class*=" fa-spin"] { diff --git a/media/theme/focusbusiness/css/custom.css b/media/theme/focusbusiness/css/custom.css index 61e4d28..313302e 100644 --- a/media/theme/focusbusiness/css/custom.css +++ b/media/theme/focusbusiness/css/custom.css @@ -10,6 +10,7 @@ padding-left: 8px; font-size: 12px; + background-size: auto 50px; } #header h1 a { @@ -42,3 +43,149 @@ padding-left: 0px; padding-right: 0px; } + +h3 { +margin-top: 0px; +} + +/*------------------------------------------------------------------ +[ Widget / .widget ] +*/ +.widget { + position: relative; + clear: both; + width: auto; + margin-bottom: 2em; + /* Clearfix Hack */ + + /* Widget Table */ + + /* Widget Plain */ + + /* Widget Box */ + +} +.widget .widget-header { + position: relative; + height: 40px; + line-height: 40px; + background: #E9E9E9; + background: -moz-linear-gradient(top, #fafafa 0%, #e9e9e9 100%); + /* FF3.6+ */ + + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fafafa), color-stop(100%, #e9e9e9)); + /* Chrome,Safari4+ */ + + background: -webkit-linear-gradient(top, #fafafa 0%, #e9e9e9 100%); + /* Chrome10+,Safari5.1+ */ + + background: -o-linear-gradient(top, #fafafa 0%, #e9e9e9 100%); + /* Opera11.10+ */ + + background: -ms-linear-gradient(top, #fafafa 0%, #e9e9e9 100%); + /* IE10+ */ + + background: linear-gradient(top, #fafafa 0%, #e9e9e9 100%); + /* W3C */ + + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9'); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')"; + border: 1px solid #D5D5D5; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + -webkit-background-clip: padding-box; +} +.widget .widget-header h3 { + top: 0; + position: relative; + left: 10px; + display: inline-block; + margin-right: 3em; + font-size: 15px; + font-weight: 400; + color: #555; + line-height: 18px; + text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.5); +} +.widget .widget-header [class^="fa-"], +.widget .widget-header [class*=" fa-"] { + display: inline-block; + margin-top: -3px; + margin-left: 13px; + margin-right: -2px; + font-size: 16px; + color: #555; + vertical-align: middle; +} +.widget .widget-content { + padding: 25px 15px 15px; + background: #FFF; + border: 1px solid #D5D5D5; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +.widget .widget-header + .widget-content { + border-top: none; + -webkit-border-top-left-radius: 0; + -webkit-border-top-right-radius: 0; + -moz-border-radius-topleft: 0; + -moz-border-radius-topright: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; +} +.widget.widget-nopad .widget-content { + padding: 0; +} +.widget .widget-content:before, +.widget .widget-content:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.widget .widget-content:after { + clear: both; +} +.widget .widget-content:before, +.widget .widget-content:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.widget .widget-content:after { + clear: both; +} +.widget.widget-table .widget-content { + padding: 0; +} +.widget.widget-table .table { + margin-bottom: 0; + border: none; +} +.widget.widget-table .table tr td:first-child, +.widget.widget-table .table tr th:first-child { + border-left: none; +} +.widget.widget-plain { + background: transparent; + border: none; +} +.widget.widget-plain .widget-content { + padding: 0; + background: transparent; + border: none; +} +.widget.widget-box .widget-content { + background: #E3E3E3; + background: #FFF; +} diff --git a/messages/register/account.php b/messages/register/account.php new file mode 100644 index 0000000..a17bd54 --- /dev/null +++ b/messages/register/account.php @@ -0,0 +1,18 @@ +array( + 'unique'=>'That email address is either already registered or is reserved. Please login and try this registration again. If you dont know your password, please reset it.', + ), +); +?> diff --git a/views/field/date.php b/views/field/date.php index 2aff48d..26b117f 100644 --- a/views/field/date.php +++ b/views/field/date.php @@ -2,10 +2,11 @@ +
- +
- > + >
@@ -25,14 +26,14 @@ Script::factory() ->type('stdin') ->data(' $(document).ready(function() { - $("#'.$data['field'].'_label").datepicker({ + $("#'.$field.'_label").datepicker({ autoclose : true, - '.($data['enddate'] ? 'endDate : '.$data['enddate'].',' : '').' + '.(Arr::get($data,'enddate') ? 'endDate : '.$data['enddate'].',' : '').' todayHighlight: true, format : "dd-M-yyyy", todayBtn : true, }).on("hide",function(ev) { - $("input[name='.$data['field'].']").val(ev.date.valueOf()/1000); + $("input[name=\"'.$data['field'].'\"]").val(ev.date.valueOf()/1000); }); });'); ?>