Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into menu-jui

Conflicts:
	lib/Form/Field.php
	lib/Menu/Basic.php
	lib/View/Button.php
  • Loading branch information...
commit 803f1804e5cfbb72973cb71ff0524d8c9d0294f7 2 parents e53e1f0 + 2e41d81
@romaninsh romaninsh authored
View
2  lib/DB/dsql.php
@@ -576,7 +576,7 @@ function render_group(){
if(!$this->args['group'])return'';
$x=array();
foreach($this->args['group'] as $arg){
- $x[]=$this->bt($arg);
+ $x[]=$this->consume($arg);
}
return 'group by '.implode(', ',$x);
}
View
2  lib/Field.php
@@ -130,7 +130,7 @@ function getBooleanValue($value){
reset($this->listData);
list($junk,$yes_value)=each($this->listData);
@list($junk,$no_value)=each($this->listData);
- if($no_value==null)$no_value='';
+ if($no_value===null)$no_value='';
/* not to convert N to Y */
if ($yes_value == $value){
return $yes_value;
View
16 lib/Form/Field.php
@@ -57,9 +57,9 @@ function _cutField(){
if($this->api->jquery)$this->api->jquery->getJS($this);
throw new Exception_StopRender(
$this->template->renderRegion($this->template->tags['before_field']).
- $this->getInput().
- $this->template->renderRegion($this->template->tags['after_field'])
- );
+ $this->getInput().
+ $this->template->renderRegion($this->template->tags['after_field'])
+ );
}
function setMandatory($mandatory=true){
$this->mandatory=$mandatory;
@@ -80,7 +80,7 @@ function displayFieldError($msg=null){
if(!isset($msg))$msg='Error in field "'.$this->caption.'"';
$this->form->js(true)
- ->atk4_form('fieldError',$this->name,$msg)
+ ->atk4_form('fieldError',$this->short_name,$msg)
->execute();
$this->form->errors[$this->short_name]=$msg;
@@ -254,6 +254,7 @@ function getInput($attr=array()){
return $this->getTag('input',
array_merge(array(
'name'=>$this->name,
+ 'data-shortname'=>$this->short_name,
'id'=>$this->name,
'value'=>$this->value,
),$attr,$this->attr)
@@ -291,7 +292,6 @@ function render(){
}
$this->output($this->template->render());
}
-
function getTag($tag, $attr=null, $value=null){
/**
* Draw HTML attribute with supplied attributes.
@@ -471,11 +471,7 @@ function init(){
}
function getInput($attr=array()){
- if (isset($this->value_list)){
- return $this->value_list[$this->value];
- } else {
- return $this->value;
- }
+ return nl2br(isset($this->value_list) ? $this->value_list[$this->value] : $this->value);
}
function setValueList($list){
$this->value_list = $list;
View
1  lib/Form/Field/DropDown.php
@@ -18,6 +18,7 @@ function validate(){
function getInput($attr=array()){
$output=$this->getTag('select',array_merge(array(
'name'=>$this->name,
+ 'data-shortname'=>$this->short_name,
'id'=>$this->name,
),
$attr,
View
10 lib/Grid/Advanced.php
@@ -19,9 +19,7 @@ class Grid_Advanced extends Grid_Basic {
public $last_column;
public $sortby='0';
public $sortby_db=null;
- public $not_found=false;
-
- public $displayed_rows=0;
+ public $buttonset=null;
private $totals_title_field=null;
private $totals_title="";
@@ -105,8 +103,10 @@ function removeColumn($name){
return $this;
}
function addButton($label){
- return $this
- ->add('Button','gbtn'.count($this->elements),'grid_buttons')
+ if(!$this->buttonset)
+ $this->buttonset=$this->add('ButtonSet',null,'grid_buttons');
+ return $this->buttonset
+ ->add('Button','gbtn'.count($this->elements))
->setLabel($label);
}
function addQuickSearch($fields,$class='QuickSearch'){
View
42 lib/Menu/Basic.php
@@ -47,34 +47,34 @@ function init(){
parent::init();
}
function defaultTemplate(){
- return array('menu','Menu');
- }
- function addMenuItem($page,$label=null){
- if(!$label){
- $label=ucwords(str_replace('_',' ',$page));
- }
+ return array('menu','Menu');
+ }
+ function addMenuItem($page,$label=null){
+ if(!$label){
+ $label=ucwords(str_replace('_',' ',$page));
+ }
$id=$this->name.'_i'.count($this->items);
- $label=$this->api->_($label);
+ $label=$this->api->_($label);
$js_page=null;
if($page instanceof jQuery_Chain){
$js_page="#";
$this->js('click',$page)->_selector('#'.$id);
$page=$id;
}
- $this->items[]=array(
- 'id'=>$id,
- 'page'=>$page,
- 'href'=>$js_page?:$this->api->url($page),
- 'label'=>$label,
- $this->class_tag=>$this->isCurrent($page)?$this->current_menu_class:$this->inactive_menu_class,
- );
- return $this;
- }
- protected function getDefaultHref($label){
- $href=preg_replace('/[^a-zA-Z0-9]/','',$label);
- if($label[0]==';'){
- $label=substr($label,1);
- $href=';'.$href;
+ $this->items[]=array(
+ 'id'=>$id,
+ 'page'=>$page,
+ 'href'=>$js_page?:$this->api->url($page),
+ 'label'=>$label,
+ $this->class_tag=>$this->isCurrent($page)?$this->current_menu_class:$this->inactive_menu_class,
+ );
+ return $this;
+ }
+ protected function getDefaultHref($label){
+ $href=preg_replace('/[^a-zA-Z0-9]/','',$label);
+ if($label[0]==';'){
+ $label=substr($label,1);
+ $href=';'.$href;
}
return $href;
}
View
4 lib/Page/Tester.php
@@ -46,10 +46,6 @@ function init(){
function ticker(){
$this->cnt++;
}
- public $cnt;
- function ticker(){
- $this->cnt++;
- }
function silentTest($test_obj=null){
if(!$test_obj)$test_obj=$this;
View
11 lib/PathFinder.php
@@ -286,11 +286,12 @@ function getURL($file_path=null){
}else
throw new BaseException('Unable to determine URL');
- if($file_path){
- if(substr($url,-1)!='/')$url.='/';
- $url.=$file_path;
- }
- return $url;
+ if($file_path){
+ if(substr($url,-1)!='/')$url.='/';
+ $url.=$file_path;
+ }
+ $url=str_replace('/./','/',$url);
+ return $url;
}
function getPath($file_path=null){
View
14 lib/QuickSearch.php
@@ -26,27 +26,19 @@ class QuickSearch extends Filter {
/*
* Quicksearch represents one-field filter which goes perfectly with a grid
*/
-
- public $js_widget='ui.atk4_form';
- public $icon;// to configure icon
- var $region=null;
- var $region_url=null;
- public $search_cross=null;
- public $grid;
+ public $icon='search'; // to configure icon
function init(){
parent::init();
- //$this->addClass('span3');
- $this->addClass('float-right stacked span4');
+ $this->addClass('float-right span4 atk-quicksearch');
$this->template->trySet('fieldset','atk-row');
$this->template->tryDel('button_row');
$this->search_field=$this->addField('line','q','')->setNoSave();
$this->search_field->addButton('')
->setHtml(' ')
- ->setIcon('search')
+ ->setIcon($this->icon)
->js('click',$this->js()->submit());
- ;
}
function useFields($fields){
$this->fields=$fields;
View
2  lib/View/Button.php
@@ -53,7 +53,7 @@ function setClass($class){
/** redefine this method with empty one if you DONT want buttons to use jQuery UI */
function jsButton(){
$opt=$this->options;
- if($this->icon)$opt['icons']['primary']='ui-icon-'.$this->icon;
+ if($this->icon)$opt['icons']['primary']=$this->icon;
if(!($this->owner instanceof ButtonSet))$this->js(true)->button($opt);
}
function render(){
View
6 templates/js/atk4_univ.js
@@ -16,6 +16,12 @@ $.each({
setTimeout: function(code,delay){
setTimeout(code,delay);
},
+ setInterval: function(code,delay){
+ return setInterval(code,delay);
+ },
+ clearInterval: function(a){
+ clearInterval(a);
+ },
displayAlert: function(a){
alert(a);
},
View
18 templates/js/start-atk4.js
@@ -336,13 +336,17 @@ $.extend($.atk4,{
Also relative URLs like url(../images) will not break.
*/
includeCSS: function(url){
- if(this._isIncluded(url))return;
-
- $("<link>", {
- rel: "stylesheet",
- type: "text/css",
- href: url
- }).appendTo("head");
+ if(this._isIncluded(url))return;
+
+ /*
+ Dynamically loads CSS. Now works for IE too as noted in:
+ http://stackoverflow.com/questions/1184950/dynamically-loading-css-stylesheet-doesnt-work-on-ie
+ see comment by ekerner on Apr 4 11 at 16:44
+ */
+ $("<link>")
+ .appendTo($('head'))
+ .attr({type : 'text/css', rel : 'stylesheet'})
+ .attr('href', url);
},
_isIncluded: function(url){
if(this._includes[url])return true;
View
8 templates/js/ui.atk4_form.js
@@ -210,10 +210,10 @@ jQuery.widget("ui.atk4_form", {
return this.options.error_handler(field_name,error);
}
- var field=
- typeof(field_name)=='string'?
- $('#'+this.id+'_'+field_name):
- field_name;
+ var field=
+ typeof(field_name)=='string'?
+ $('[data-shortname="'+field_name+'"]','#'+this.id):
+ field_name;
if(!field.length){
field=this.form.find('[name="'+field_name+'"]');
View
21 templates/js/ui.atk4_loader.js
@@ -35,10 +35,10 @@
$.widget('ui.atk4_loader', {
- /*
- base_url will contain URL which will be used to refresh contents.
- */
options: {
+ /*
+ base_url will contain URL which will be used to refresh contents.
+ */
base_url: undefined,
/*
@@ -46,19 +46,19 @@ $.widget('ui.atk4_loader', {
loaded.
*/
loading: false,
-
cogs: '<div class="loading"><i></i><i></i></div>',
+
/*
when we are loading URLs, we will automaticaly pass arguments to cut stuff out
*/
cut_mode: 'page',
cut: '1',
- history: false,
-
- /*
- Helper contains some extra thingies
- */
+ history: false
},
+
+ /*
+ Helper contains some extra thingies
+ */
helper: undefined,
loader: undefined,
@@ -250,8 +250,9 @@ $.widget('ui.atk4_loader', {
if(!f.hasClass('nofocus'))f.focus();
});
},function(){ // second callback, which is always called, when loading is completed
- self.loader.hide();
+ self.loader.hide();
self.loading=false;
+ el.trigger('after_html_loaded');
});
},
/*
View
283 templates/shared/css/atk-main.css
@@ -9,29 +9,13 @@
background-color: #c8d3de;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#ecf3f9), to(#c8d3de));
- /* Konqueror */
-
background-image: -moz-linear-gradient(top, #ecf3f9, #c8d3de);
- /* FF 3.6+ */
-
background-image: -ms-linear-gradient(top, #ecf3f9, #c8d3de);
- /* IE10 */
-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ecf3f9), color-stop(100%, #c8d3de));
- /* Safari 4+, Chrome 2+ */
-
background-image: -webkit-linear-gradient(top, #ecf3f9, #c8d3de);
- /* Safari 5.1+, Chrome 10+ */
-
background-image: -o-linear-gradient(top, #ecf3f9, #c8d3de);
- /* Opera 11.10 */
-
background-image: linear-gradient(top, #ecf3f9, #c8d3de);
- /* The standard */
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ecf3f9', endColorstr='#c8d3de', GradientType=0);
- /* IE9 and down */
-
}
.ui-state-hover,
.ui-widget-content .ui-state-hover,
@@ -40,29 +24,13 @@
background-color: #d5e1ed;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f9fc), to(#d5e1ed));
- /* Konqueror */
-
background-image: -moz-linear-gradient(top, #f5f9fc, #d5e1ed);
- /* FF 3.6+ */
-
background-image: -ms-linear-gradient(top, #f5f9fc, #d5e1ed);
- /* IE10 */
-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f9fc), color-stop(100%, #d5e1ed));
- /* Safari 4+, Chrome 2+ */
-
background-image: -webkit-linear-gradient(top, #f5f9fc, #d5e1ed);
- /* Safari 5.1+, Chrome 10+ */
-
background-image: -o-linear-gradient(top, #f5f9fc, #d5e1ed);
- /* Opera 11.10 */
-
background-image: linear-gradient(top, #f5f9fc, #d5e1ed);
- /* The standard */
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f9fc', endColorstr='#d5e1ed', GradientType=0);
- /* IE9 and down */
-
}
.ui-state-active,
.ui-widget-content .ui-state-active,
@@ -70,57 +38,25 @@
background-color: #ffffff;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#ecf3f9), to(#ffffff));
- /* Konqueror */
-
background-image: -moz-linear-gradient(top, #ecf3f9, #ffffff);
- /* FF 3.6+ */
-
background-image: -ms-linear-gradient(top, #ecf3f9, #ffffff);
- /* IE10 */
-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ecf3f9), color-stop(100%, #ffffff));
- /* Safari 4+, Chrome 2+ */
-
background-image: -webkit-linear-gradient(top, #ecf3f9, #ffffff);
- /* Safari 5.1+, Chrome 10+ */
-
background-image: -o-linear-gradient(top, #ecf3f9, #ffffff);
- /* Opera 11.10 */
-
background-image: linear-gradient(top, #ecf3f9, #ffffff);
- /* The standard */
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ecf3f9', endColorstr='#ffffff', GradientType=0);
- /* IE9 and down */
-
}
.ui-widget-header {
background-color: #002d5e;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#00070f), to(#002d5e));
- /* Konqueror */
-
background-image: -moz-linear-gradient(top, #00070f, #002d5e);
- /* FF 3.6+ */
-
background-image: -ms-linear-gradient(top, #00070f, #002d5e);
- /* IE10 */
-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #00070f), color-stop(100%, #002d5e));
- /* Safari 4+, Chrome 2+ */
-
background-image: -webkit-linear-gradient(top, #00070f, #002d5e);
- /* Safari 5.1+, Chrome 10+ */
-
background-image: -o-linear-gradient(top, #00070f, #002d5e);
- /* Opera 11.10 */
-
background-image: linear-gradient(top, #00070f, #002d5e);
- /* The standard */
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00070f', endColorstr='#002d5e', GradientType=0);
- /* IE9 and down */
-
}
/* Additional Effects */
.ui-dialog {
@@ -282,16 +218,6 @@ table {
border-spacing: 0;
}
/* ==============================================
- Mixins
- ============================================== */
-/* Input placeholder text */
-/* Border Radius */
-/* Drop shadows */
-/* Transitions */
-/* Add an alphatransparency value to any background or border color (via Elyse Holladay) */
-/* Reset filters for IE */
-/* Opacity */
-/* ==============================================
Grid System
http://agiletoolkit.org/doc/css/layout
============================================== */
@@ -439,9 +365,10 @@ table {
Features
============================================== */
.atk-wrapper {
- -moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
-ms-box-sizing: border-box;
+ -o-box-sizing: border-box;
box-sizing: border-box;
min-width: 980px;
padding-left: 2.5%;
@@ -496,54 +423,201 @@ body #atk-layout #atk-footer-guard {
overflow: hidden;
}
/* ==============================================
- Loader
+ Loader
============================================== */
@-webkit-keyframes rotate-i1 {
from {
-webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ -moz-transform: rotate(360deg);
+ -ms-transform: rotate(360deg);
+ -o-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+@-moz-keyframes rotate-i1 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ -moz-transform: rotate(360deg);
+ -ms-transform: rotate(360deg);
+ -o-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+@-ms-keyframes rotate-i1 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ -moz-transform: rotate(360deg);
+ -ms-transform: rotate(360deg);
+ -o-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+@-o-keyframes rotate-i1 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(360deg);
+ -moz-transform: rotate(360deg);
+ -ms-transform: rotate(360deg);
+ -o-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+@keyframes rotate-i1 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
+ -moz-transform: rotate(360deg);
+ -ms-transform: rotate(360deg);
+ -o-transform: rotate(360deg);
+ transform: rotate(360deg);
}
}
@-webkit-keyframes rotate-i2 {
from {
-webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(-360deg);
+ -moz-transform: rotate(-360deg);
+ -ms-transform: rotate(-360deg);
+ -o-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+@-moz-keyframes rotate-i2 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(-360deg);
+ -moz-transform: rotate(-360deg);
+ -ms-transform: rotate(-360deg);
+ -o-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+@-ms-keyframes rotate-i2 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(-360deg);
+ -moz-transform: rotate(-360deg);
+ -ms-transform: rotate(-360deg);
+ -o-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+@-o-keyframes rotate-i2 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ to {
+ -webkit-transform: rotate(-360deg);
+ -moz-transform: rotate(-360deg);
+ -ms-transform: rotate(-360deg);
+ -o-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+@keyframes rotate-i2 {
+ from {
+ -webkit-transform: rotate(0deg);
+ -moz-transform: rotate(0deg);
+ -ms-transform: rotate(0deg);
+ -o-transform: rotate(0deg);
+ transform: rotate(0deg);
}
to {
-webkit-transform: rotate(-360deg);
+ -moz-transform: rotate(-360deg);
+ -ms-transform: rotate(-360deg);
+ -o-transform: rotate(-360deg);
+ transform: rotate(-360deg);
}
}
.loading {
position: absolute;
margin: auto;
- background: gray;
+ z-index: 9999;
+ filter: alpha(opacity=70);
+ -khtml-opacity: 0.7;
+ -moz-opacity: 0.7;
opacity: 0.7;
}
-.loading.centred {
- background: white;
-}
-.loading i:first-child {
- -webkit-animation-name: rotate-i1;
- -webkit-animation-duration: 5s;
- -webkit-animation-iteration-count: infinite;
- -webkit-transition-timing-function: linear;
- margin: 10px 10px;
+.loading i {
position: absolute;
background: url(../images/gear-32x32.png);
width: 32px;
height: 32px;
-}
-.loading i:last-child {
- -webkit-animation-name: rotate-i2;
- -webkit-animation-duration: 5s;
- -webkit-animation-iteration-count: infinite;
- -webkit-transition-timing-function: linear;
+ -webkit-transition: linear;
+ -moz-transition: linear;
+ -ms-transition: linear;
+ -o-transition: linear;
+ transition: linear;
margin: 35px 27px;
- position: absolute;
- background: url(../images/gear-32x32.png);
- width: 32px;
- height: 32px;
+ -webkit-animation: rotate-i2 5s infinite;
+ -moz-animation: rotate-i2 5s infinite;
+ -ms-animation: rotate-i2 5s infinite;
+ -o-animation: rotate-i2 5s infinite;
+ animation: rotate-i2 5s infinite;
+}
+.loading i:first-child {
+ margin: 10px 10px;
+ -webkit-animation: rotate-i1 5s infinite;
+ -moz-animation: rotate-i1 5s infinite;
+ -ms-animation: rotate-i1 5s infinite;
+ -o-animation: rotate-i1 5s infinite;
+ animation: rotate-i1 5s infinite;
}
/* ==============================================
Typography
@@ -713,10 +787,6 @@ h6:first-child {
margin-bottom: 0;
}
/* ==============================================
- Backgrounds
- ============================================== */
-/* Custom jQueryUI States */
-/* ==============================================
Forms
============================================== */
button::-moz-focus-inner,
@@ -741,9 +811,10 @@ textarea {
-moz-border-radius: 5px;
border-radius: 5px;
padding: 0.4em;
- -moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
-ms-box-sizing: border-box;
+ -o-box-sizing: border-box;
box-sizing: border-box;
resize: none;
-webkit-transition: border linear 0.15s, box-shadow linear 0.15s;
@@ -994,7 +1065,11 @@ textarea:focus {
clear: both;
}
.atk-grid > .atk-grid-panel {
- margin: 0 0 0.6666666666666666em 0;
+ clear: both;
+}
+.atk-grid > .atk-grid-panel > .ui-buttonset,
+.atk-grid > .atk-grid-panel > .atk-quicksearch {
+ margin: 0.16666666666666666em 0 0.5em 0;
}
.atk-grid > table {
border-collapse: separate;
@@ -1108,9 +1183,10 @@ textarea:focus {
.atk-flexy > div {
display: table-cell;
vertical-align: top;
- -moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
-ms-box-sizing: border-box;
+ -o-box-sizing: border-box;
box-sizing: border-box;
}
.atk-box {
@@ -1282,7 +1358,6 @@ textarea:focus {
.ui-dialog {
padding: 0;
}
-/* .ui-selected {background:#2e8ae5;color:@white;} */
/* Relative Paddings */
.ui-accordion .ui-accordion-header a {
padding: 0.5em 0.5em 0.5em 0.3076923076923077em;
View
162 templates/shared/css/atk-main.less
@@ -74,9 +74,9 @@ q:before, q:after {content:'';content:none;}
table {border-collapse:collapse;border-spacing:0;}
-/* ==============================================
- Mixins
- ============================================== */
+// ==============================================
+// Mixins
+// ==============================================
.clearfix() {
zoom: 1;
&:before,
@@ -90,7 +90,7 @@ table {border-collapse:collapse;border-spacing:0;}
}
}
-/* Input placeholder text */
+// Input placeholder text
.placeholder(@color: @lightGray) {
:-moz-placeholder {
color: @color;
@@ -100,14 +100,14 @@ table {border-collapse:collapse;border-spacing:0;}
}
}
-/* Border Radius */
+// Border Radius
.border-radius(@radius: 5px) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius;
}
-/* Drop shadows */
+// Drop shadows
.box-shadow(@shadow: 0 1px 3px fadeout(@shadowColor,25%)) {
-webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow;
@@ -115,23 +115,41 @@ table {border-collapse:collapse;border-spacing:0;}
}
.box-sizing (@boxtype: border-box) {
- box-sizing: @boxtype;
- -moz-box-sizing: @boxtype;
- -webkit-box-sizing: @boxtype;
- -ms-box-sizing: @boxtype;
- box-sizing: @boxtype;
+ -webkit-box-sizing: @boxtype;
+ -moz-box-sizing: @boxtype;
+ -ms-box-sizing: @boxtype;
+ -o-box-sizing: @boxtype;
+ box-sizing: @boxtype;
+}
+
+// Transitions
+.transition(@arguments) {
+ -webkit-transition: @arguments;
+ -moz-transition: @arguments;
+ -ms-transition: @arguments;
+ -o-transition: @arguments;
+ transition: @arguments;
}
-/* Transitions */
-.transition(@transition) {
- -webkit-transition: @transition;
- -moz-transition: @transition;
- -ms-transition: @transition;
- -o-transition: @transition;
- transition: @transition;
+// Animations
+.animation(@arguments) {
+ -webkit-animation: @arguments;
+ -moz-animation: @arguments;
+ -ms-animation: @arguments;
+ -o-animation: @arguments;
+ animation: @arguments;
}
-/* Add an alphatransparency value to any background or border color (via Elyse Holladay) */
+// 2D Transformations
+.transform(@arguments) {
+ -webkit-transform: @arguments;
+ -moz-transform: @arguments;
+ -ms-transform: @arguments;
+ -o-transform: @arguments;
+ transform: @arguments;
+}
+
+// Add an alphatransparency value to any background or border color (via Elyse Holladay)
#translucent {
.background(@color: @white, @alpha: 1) {
background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
@@ -142,12 +160,12 @@ table {border-collapse:collapse;border-spacing:0;}
}
}
-/* Reset filters for IE */
+// Reset filters for IE
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}
-/* Opacity */
+// Opacity
.opacity(@opacity: 100) {
filter: e(%("alpha(opacity=%d)", @opacity));
-khtml-opacity: @opacity / 100;
@@ -277,47 +295,48 @@ table {border-collapse:collapse;border-spacing:0;}
.clearwrap {overflow:hidden;}
/* ==============================================
- Loader
+ Loader
============================================== */
-
-@-webkit-keyframes rotate-i1 {
- from { -webkit-transform: rotate(0deg); }
- to { -webkit-transform: rotate(360deg); }
+// http://radiatingstar.com/css-keyframes-animations-with-less
+.clockwise () {
+ from {.transform(rotate(0deg));}
+ to {.transform(rotate(360deg));}
}
-@-webkit-keyframes rotate-i2 {
- from { -webkit-transform: rotate(0deg); }
- to { -webkit-transform: rotate(-360deg); }
+.anti-clockwise () {
+ from {.transform(rotate(0deg));}
+ to {.transform(rotate(-360deg));}
}
+
+@-webkit-keyframes rotate-i1 {.clockwise;}
+ @-moz-keyframes rotate-i1 {.clockwise;}
+ @-ms-keyframes rotate-i1 {.clockwise;}
+ @-o-keyframes rotate-i1 {.clockwise;}
+ @keyframes rotate-i1 {.clockwise;}
+
+@-webkit-keyframes rotate-i2 {.anti-clockwise;}
+ @-moz-keyframes rotate-i2 {.anti-clockwise;}
+ @-ms-keyframes rotate-i2 {.anti-clockwise;}
+ @-o-keyframes rotate-i2 {.anti-clockwise;}
+ @keyframes rotate-i2 {.anti-clockwise;}
+
.loading {
position: absolute;
margin: auto;
- background: gray;
- opacity: 0.7;
-}
-.loading.centred {
- background: white;
-}
-.loading i:first-child {
- -webkit-animation-name: rotate-i1;
- -webkit-animation-duration: 5s;
- -webkit-animation-iteration-count: infinite;
- -webkit-transition-timing-function: linear;
- margin: 10px 10px;
- position: absolute;
- background: url(../images/gear-32x32.png);
- width: 32px;
- height: 32px;
-}
-.loading i:last-child {
- -webkit-animation-name: rotate-i2;
- -webkit-animation-duration: 5s;
- -webkit-animation-iteration-count: infinite;
- -webkit-transition-timing-function: linear;
- margin: 35px 27px;
- position: absolute;
- background: url(../images/gear-32x32.png);
- width: 32px;
- height: 32px;
+ z-index: 9999;
+ .opacity(70);
+ i {
+ position: absolute;
+ background: url(../images/gear-32x32.png);
+ width: 32px;
+ height: 32px;
+ .transition(linear);
+ margin: 35px 27px;
+ .animation(rotate-i2 5s infinite);
+ &:first-child {
+ margin: 10px 10px;
+ .animation(rotate-i1 5s infinite);
+ }
+ }
}
/* ==============================================
Typography
@@ -372,21 +391,21 @@ h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child,
.atk-box p:last-child {margin-bottom:0;}
-/* ==============================================
- Backgrounds
- ============================================== */
+// ==============================================
+// Backgrounds
+// ==============================================
#gradient {
.vertical (@startColor: #555, @endColor: #333) {
background-color: @endColor;
background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); /* Konqueror */
- background-image: -moz-linear-gradient(top, @startColor, @endColor); /* FF 3.6+ */
- background-image: -ms-linear-gradient(top, @startColor, @endColor); /* IE10 */
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); /* Safari 4+, Chrome 2+ */
- background-image: -webkit-linear-gradient(top, @startColor, @endColor); /* Safari 5.1+, Chrome 10+ */
- background-image: -o-linear-gradient(top, @startColor, @endColor); /* Opera 11.10 */
- background-image: linear-gradient(top, @startColor, @endColor); /* The standard */
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); /* IE9 and down */
+ background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
+ background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+ background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+ background-image: linear-gradient(top, @startColor, @endColor); // The standard
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
}
.horizontal(@startColor: #555, @endColor: #333) {
background-color: @endColor;
@@ -401,7 +420,7 @@ h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child,
}
}
-/* Custom jQueryUI States */
+// Custom jQueryUI States
.defaultBg(@colorStop1,@colorStop2) {
.ui-state-default,
.ui-widget-content .ui-state-default,
@@ -609,7 +628,10 @@ textarea:focus {
.atk-wrapper {.fixed-container();}
.atk-grid {
- >.atk-grid-panel { margin:0 0 @margin/3 0; }
+ >.atk-grid-panel {
+ clear:both;
+ >.ui-buttonset,>.atk-quicksearch {margin:@margin/12 0 @margin/4 0;}
+ }
>table {
border-collapse:separate;
width:100%;
@@ -757,7 +779,7 @@ textarea:focus {
.ui-widget-overlay {position:fixed !important;top:0;left:0;}
.ui-dialog {padding:0;}
-/* .ui-selected {background:#2e8ae5;color:@white;} */
+// .ui-selected {background:#2e8ae5;color:@white;}
/* Relative Paddings */
View
3  templates/shared/css/ie8.css
@@ -0,0 +1,3 @@
+/* Fix for loading indicator for IE8 */
+.loading {z-index: auto;}
+.loading i {z-index:9999;}
View
7 templates/shared/grid.html
@@ -1,9 +1,6 @@
<?$Misc?>
<div id="<?$_name?>" class="atk-grid <?$class?>">
- <div class="atk-grid-panel">
- <?quick_search?><?/?>
- <div class="atk-buttons"><?grid_buttons?>&nbsp;<?/?></div>
- </div>
+ <div class="atk-grid-panel"><?$quick_search?><?$grid_buttons?></div>
<table width="<?table_width?>100%<?/?>">
<?header?>
<thead class="ui-widget-header"><tr>
@@ -37,8 +34,6 @@
</tr>
<?/totals?>
<?/rows?>
-
-
</tbody>
<?$full_table?>
</table>
View
2  templates/shared/shared.html
@@ -10,7 +10,7 @@
<?$js_include?>
<!--[if IE 8]>
<link rel="stylesheet" type="text/css" href="<?template?>css/ie8.css<?/?>"/>
- <script type="text/javascript" src="<?template?>css/ie8.js<?/?>"/>
+ <script type="text/javascript" src="<?template?>css/ie8.js<?/?>"></script>
<![endif]-->
<script type="text/javascript">
$(function(){
Please sign in to comment.
Something went wrong with that request. Please try again.