diff --git a/modules/admin/assets/css/main.css b/modules/admin/assets/css/main.css index 51899c957..761c247a5 100644 --- a/modules/admin/assets/css/main.css +++ b/modules/admin/assets/css/main.css @@ -1 +1 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */@import"http://fonts.googleapis.com/css?family=Lato:300,400,700";html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}html,body{font-size:14px;font-family:Lato;font-weight:400}h1,h2,h3,h4,h5,h6,p,span,li{font-family:Lato;font-weight:400}*,*:after,*:before{box-sizing:border-box}.crud__header:after,.toolbar:after{content:"";display:table;clear:both}.button{background-color:transparent;border:none;border-radius:5px;margin:0 5px;outline:0;padding:8px;transition:.3s ease background-color,.2s ease color}.button:hover{background-color:rgba(0,0,0,.8);color:#fff}.button:first-of-type{margin-left:0}.button:last-of-type{margin-right:0}.button--green:hover{background-color:#08a55c;color:#fff}.button--green:active{background-color:#067441}.button--yellow:hover{background-color:#f6bb42;color:#fff}.button--yellow:active{background-color:#f4a911}.button--red:hover{background-color:rgba(255,60,51,.8);color:#fff}.button--red:active{background-color:rgba(255,11,0,.8)}.crud{border:1px solid #cfdadd;margin:10px}.crud__header,.crud__secondtoolbar,.crud__table .table{padding-left:5px;padding-right:5px}.crud__header{background-color:#edf1f2;padding-bottom:10px;padding-top:10px}.crud__title{display:inline-block;margin:7px 0 0}.crud__toolbar{display:inline-block}.crud__toolbar--pullright{float:right}.crud__secondtoolbar{margin:10px 0}.crud__count{margin:6px 0}.crud__search{display:block;float:none;text-align:right}.logo{text-align:center}.logo img{width:70px}.modulenav__list{list-style:none;margin:0;padding:0}.modulenav__item{display:inline-block}.modulenav__link{border-bottom:1px solid #edf1f2;border-left:1px solid #edf1f2;color:rgba(0,0,0,.8);display:block;font-size:2.8rem;padding:16px 15px;position:relative;text-align:center}.modulenav__link:after{background-color:transparent;content:"";display:inline-block;height:3px;left:0;position:absolute;right:0;top:0;transition:.25s ease background-color}.modulenav__link:hover:after,.is-active .modulenav__link:after{background-color:#ff3c33}.is-active .modulenav__link{border-bottom-color:#fff}.overlay{display:table;height:100%;left:0;opacity:0;position:absolute;text-align:center;top:0;transition:.5s ease opacity;width:100%;z-index:-1}.overlay.is-active{background-color:rgba(0,0,0,.6);opacity:1;z-index:100}.overlay__wrapper{display:table-cell;vertical-align:middle}.overlay__content{background-color:rgba(255,109,102,.8);border-radius:10px;color:#fff;display:inline-block;padding:10px 20px}.search__input{border:1px solid #cfdadd;padding:5px;width:250px;outline:none}.subnav{background-color:#edf1f2;border-right:2px solid #edf1f2;height:100%}.subnav__grouptitle{color:#ff3c33;font-size:.8em;font-weight:700;margin:0;padding:20px 40px 10px;text-transform:uppercase}.subnav__list{list-style:none;margin:0;padding:0}.subnav__link{border-radius:5px;color:rgba(0,0,0,.8);display:block;margin:3px 30px;padding:10px;text-decoration:none;transition:.3s ease background-color,.2s ease color}.is-active .subnav__link,.subnav__link:hover{background-color:rgba(255,60,51,.8);color:#fff}.subnav__text:before{margin:0 10px 0 5px}.treeview{background-color:#edf1f2;border-right:2px solid #edf1f2;height:100%}.treeview__list{list-style:none;margin:0;padding:10px 0}.treeview__item .treeview__list{padding-top:0;padding-left:20px}.treeview__link{border-radius:5px;color:rgba(0,0,0,.8);display:block;margin:2px 20px;padding:10px;text-decoration:none;transition:.3s ease background-color,.2s ease color}.is-active .treeview__link,.treeview__link:hover{background-color:rgba(255,60,51,.8);color:#fff}.treeview__link--green:hover{background-color:#08a55c}.table{border-collapse:collapse;border-radius:5px;border-spacing:0;max-width:100%;width:100%}.table__row:nth-child(odd){background-color:#edf1f2}.table__row:hover{background-color:#cfdadd}.table__column{border-top:1px solid #ddd;line-height:1.4;padding:8px;text-align:left;vertical-align:middle}.table__column--head{border-bottom:2px solid #ddd;color:#ff3c33;font-size:.9em;font-weight:700;line-height:1.8em;text-transform:uppercase;vertical-align:bottom}.user{height:80px;padding:10px 0;position:relative;width:100%}.user__front,.user__back{position:absolute;transition:.5s ease opacity}.user__front{right:20px}.user__back{background-color:rgba(255,60,51,.8);bottom:0;left:0;opacity:0;right:0;top:0}.user:hover .user__front{opacity:0}.user:hover .user__back{opacity:1}.user__image{border:1px solid #ff3c33;border-radius:50%;vertical-align:middle;width:60px}.user__text{position:relative;vertical-align:middle}.user__logout{color:#fff;display:block;font-size:2rem;height:100%;padding-right:20px;padding-top:22px;text-align:right;text-decoration:none}.toolbar{display:block}.toolbar__item{display:inline-block;margin-right:5px}.toolbar__item:last-of-type{margin-right:0}.toolbar__item--pullright{float:right}body{min-width:900px}a{cursor:pointer}.angular-replace{height:100%}.header{border-bottom:1px solid #edf1f2;display:block;width:100%;max-height:80px}.header__item{display:inline-block;margin-bottom:-1px;vertical-align:middle}.header__item--left{width:22%}.main-left-small .header__item--left{width:300px}.header__item--center{width:58%}.main-left-small .header__item--center{width:calc(100% - 20% - 300px)}.header__item--right{width:20%;text-align:right}.main{display:block;height:calc(100vh - 80px);position:relative;width:100%}.main__item{display:inline-block;height:100%;overflow:auto;position:relative;vertical-align:top}.main__item--left{width:calc(22% + 1px)}.main-left-small .main__item--left{width:300px}.main__item--right{width:calc(70% - 1px)}.main-left-small .main__item--right{width:calc(100% - 300px)}.login__wrapper{display:table;height:100%;left:0;position:absolute;text-align:center;top:0;width:100%}.login__innerwrapper{background-color:rgba(255,255,255,.1);display:table-cell;font-size:20px;text-align:center;vertical-align:middle}.login__form{display:inline-block;text-align:left;width:100%;min-width:320px;max-width:500px;padding:0 10px}.login__form.has-error{-webkit-animation:shake 1s 1;animation:shake 1s 1}.login__group{margin-bottom:10px}.login__label,.login__input{background-color:#fff;display:inline-block;outline:none;padding:10px}.login__label{background-color:#fff;border-right:1px solid #edf1f2;text-align:center;width:15%}.login__label.error{background-color:rgba(255,60,51,.8);border-right-color:rgba(255,60,51,.8);color:#fff}.login__input{background-color:#fff;border:none;width:85%}.login__input:-webkit-autofill{box-shadow:0 0 0 1000px #fff inset}.login__submit{background-color:rgba(0,0,0,.8);border:none;color:#fff;padding:10px;text-transform:uppercase;width:100%}.login_error{background-color:rgba(255,60,51,.8);color:#fff;display:none;font-size:16px;margin-bottom:10px;padding:10px;width:100%}.has-error .login_error{display:block}.login_error p{margin:0}@-webkit-keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}@keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}} \ No newline at end of file +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */@import"http://fonts.googleapis.com/css?family=Lato:300,400,700";html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}html,body{font-size:14px;font-family:Lato;font-weight:400}h1,h2,h3,h4,h5,h6,p,span,li{font-family:Lato;font-weight:400}*,*:after,*:before{box-sizing:border-box}.overlay__header:after,.toolbar:after{content:"";display:table;clear:both}.button{background-color:#bdbdbd;border:none;border-radius:6px;color:#fff;margin:0;outline:0;padding:9px;text-decoration:none;text-shadow:2px 2px .1px rgba(0,0,0,.2);transition:.3s background-color ease,.2s color ease,.1s box-shadow ease}.button:hover{box-shadow:inset 1px 1px 5px 1px rgba(0,0,0,.1);background-color:#000}.button:first-of-type{margin-left:0}.button:last-of-type{margin-right:0}.button__icon,.button__text{display:inline-block;transition:.1s -webkit-transform ease;transition:.1s transform ease}.button:hover .button__icon,.button:hover .button__text{-webkit-transform:translateX(1px) translateY(1px);-ms-transform:translateX(1px) translateY(1px);transform:translateX(1px) translateY(1px)}.button--green:hover{background-color:#009688}.button--yellow:hover{background-color:#ffc107}.button--red:hover{background-color:#f44336}.crud{border:1px solid #bdbdbd;margin:20px}.crud__table .table{padding-left:5px;padding-right:5px}.crud .crud__toolbar{border-bottom:none;padding-left:8px;padding-right:8px}.crud__toolbar{display:inline-block}.crud__secondtoolbar{margin:10px 0}.crud__count{margin:6px 0}.crud__search{display:block;float:none;text-align:right}.logo{text-align:center}.logo img{width:70px}.modulenav__list{list-style:none;margin:0;padding:0}.modulenav__item{display:inline-block}.modulenav__link{color:#fff;display:block;font-size:2.8rem;padding:16px 15px;position:relative;text-align:center}.modulenav__link:after{background-color:#f44336;content:"";display:inline-block;height:0;left:0;position:absolute;right:0;top:0;transition:.25s ease height;z-index:5}.modulenav__link:hover:after,.is-active .modulenav__link:after{height:100%}.modulenav__icon{position:relative;z-index:10}.overlay{display:table;height:100%;left:0;opacity:0;position:absolute;text-align:center;top:0;transition:.5s ease opacity;width:100%;z-index:-1}.overlay.is-active{opacity:1;z-index:100}.overlay--green .overlay__content{border-color:#009688;max-width:1200px}.overlay--green .overlay__header{background-color:#009688;border-color:#009688;color:#fff}.overlay--red .overlay__content{border-color:#ef5350;max-width:500px}.overlay--red .overlay__header{background-color:#ef5350;border-color:#ef5350;color:#fff}.overlay__wrapper{display:table-cell;vertical-align:middle}.main__item--right>*:not(.overlay){transition:.25s all ease}.main-blurred .main__item--right>*:not(.overlay){-webkit-filter:blur(3px) grayscale(50%);filter:blur(3px) grayscale(50%)}.overlay__content{background-color:#fff;border:1px solid #bdbdbd;border-radius:5px;color:#000;display:inline-block;max-width:800px;position:relative;text-align:left;width:75%;margin:20px 0;transition:.25s opacity ease}.overlay--transparent .overlay__content{opacity:.3}.overlay__header{background-color:#e0e0e0;border-bottom:1px solid #bdbdbd;display:block;padding:10px 20px}.overlay__header p{float:left;margin:0}.overlay__hide{cursor:pointer;float:right}.overlay__body{padding:20px}.overlay__actions{text-align:right}.search__input{border:1px solid #bdbdbd;padding:5px;width:250px;outline:none}.subnav{background-color:#f5f5f5;border-right:1px solid #bdbdbd;height:100%}.subnav__grouptitle{color:#f44336;font-size:.8em;font-weight:700;margin:0;padding:20px 40px 10px;text-transform:uppercase}.subnav__list{list-style:none;margin:0;padding:0}.subnav__link{border-radius:5px;color:#000;display:block;margin:3px 30px;padding:10px;text-decoration:none;transition:.3s ease background-color,.2s ease color}.is-active .subnav__link,.subnav__link:hover{background-color:#f44336;color:#fff}.subnav__text:before{margin:0 10px 0 5px}.treeview{background-color:#e0e0e0;border-right:2px solid #e0e0e0;height:100%}.treeview__list{list-style:none;margin:0;padding:10px 0}.treeview__item .treeview__list{padding-top:0;padding-left:20px}.treeview__link{border-radius:5px;color:#000;display:block;margin:2px 20px;padding:10px;text-decoration:none;transition:.3s ease background-color,.2s ease color}.is-active .treeview__link,.treeview__link:hover{background-color:#ef5350;color:#fff}.treeview__link--green:hover{background-color:#009688}.table{border-collapse:collapse;border-radius:5px;border-spacing:0;max-width:100%;width:100%}.table__row:nth-child(odd){background-color:#f5f5f5}.table__row:hover{background-color:#ededed}.table__column{border-top:1px solid #e0e0e0;line-height:1.4;padding:8px;text-align:left;vertical-align:middle}.table__column--head{border-bottom:2px solid #bdbdbd;color:#f44336;font-size:.9em;font-weight:700;line-height:1.8em;text-transform:uppercase;vertical-align:bottom}.user{height:80px;padding:10px 20px;position:relative;width:100%}.user__front,.user__back{position:absolute;transition:.5s ease opacity}.user__front{right:20px}.user__back{background-color:#ef5350;bottom:0;left:0;opacity:0;right:0;top:0}.user:hover .user__front{opacity:0}.user:hover .user__back{opacity:1}.user__image{border:1px solid #f44336;border-radius:50%;vertical-align:middle;width:60px}.user__text{position:relative;vertical-align:middle}.user__name{color:#fff}.user__logout{color:#fff;display:block;font-size:2rem;height:100%;padding-right:20px;padding-top:22px;text-align:right;text-decoration:none}.toolbar{background-color:#f5f5f5;border-bottom:1px solid #bdbdbd;display:block;padding:8px 20px}.toolbar__title{display:inline-block;margin:7px 0 0}.toolbar__items{display:inline-block;float:right}.toolbar__item{display:inline-block;margin-right:5px}.toolbar__item:last-of-type{margin-right:0}.toolbar__item--pullright{float:right}.form{display:block;width:100%}.form__item{margin-top:15px}.form__item:first-of-type{margin-top:0}.form__inputgroup{padding-top:15px;position:relative;vertical-align:top}.form__group .form__inputgroup{display:inline-block;width:48%}.form__group .form__inputgroup:first-of-type{margin-right:2%}.form__group .form__inputgroup:last-of-type{margin-left:2%}.form__input{border:1px solid #e0e0e0;display:block;margin-top:5px;outline:none;padding:6px 15px;transition:1s border-bottom-color ease;width:100%}.form__input:-webkit-autofill{box-shadow:0 0 0 1000px #fff inset}.form__input--textarea{height:30px;overflow:hidden;resize:none}.form__label{color:#000;cursor:text;display:block;font-size:12px;font-weight:700;text-transform:uppercase;transition:.25s top ease,.25s font-size ease,.25s color ease}.form__actions{font-size:16px;margin-top:20px;text-align:right}body{min-width:900px}a{cursor:pointer}.angular-replace{height:100%}.fa-fw{width:1.4em}.header{background-color:#333;display:block;max-height:80px;width:100%}.header__item{display:inline-block;margin-bottom:-1px;vertical-align:middle}.header__item--left{width:22%}.main-left-small .header__item--left{width:300px}.header__item--center{width:58%}.main-left-small .header__item--center{width:calc(100% - 20% - 300px)}.header__item--right{text-align:right;width:20%}.main{display:block;height:calc(100vh - 80px);position:relative;width:100%}.main__item{display:inline-block;height:100%;overflow:auto;position:relative;vertical-align:top}.main__item--left{width:calc(22% + 1px)}.main-left-small .main__item--left{width:300px}.main__item--right{width:calc(70% - 1px)}.main-left-small .main__item--right{width:calc(100% - 300px)}.login__wrapper{display:table;height:100%;left:0;position:absolute;text-align:center;top:0;width:100%}.login__innerwrapper{background-color:rgba(255,255,255,.1);display:table-cell;font-size:20px;text-align:center;vertical-align:middle}.login__form{display:inline-block;text-align:left;width:100%;min-width:320px;max-width:500px;padding:0 10px}.login__form.has-error{-webkit-animation:shake 1s 1;animation:shake 1s 1}.login__group{margin-bottom:10px}.login__label,.login__input{background-color:#fff;display:inline-block;outline:none;padding:10px}.login__label{background-color:#fff;border-right:1px solid #e0e0e0;text-align:center;width:15%}.login__label.error{background-color:#ef5350;border-right-color:#ef5350;color:#fff}.login__input{background-color:#fff;border:none;width:85%}.login__input:-webkit-autofill{box-shadow:0 0 0 1000px #fff inset}.login__submit{background-color:#000;border:none;color:#fff;padding:10px;text-transform:uppercase;width:100%}.login_error{background-color:#ef5350;color:#fff;display:none;font-size:16px;margin-bottom:10px;padding:10px;width:100%}.has-error .login_error{display:block}.login_error p{margin:0}@-webkit-keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}@keyframes shake{0%,100%{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}} \ No newline at end of file diff --git a/modules/admin/assets/js/controllers/CrudController.js b/modules/admin/assets/js/controllers/CrudController.js index 94567d713..606eeda8d 100644 --- a/modules/admin/assets/js/controllers/CrudController.js +++ b/modules/admin/assets/js/controllers/CrudController.js @@ -122,6 +122,10 @@ zaa.controller("CrudController", function($scope, $http, $sce) { } } + $scope.closeUpdate = function () { + $scope.toggler.update = false; + } + $scope.submitUpdate = function () { $http.put($scope.config.apiEndpoint + '/' + $scope.data.updateId, $.param($scope.data.update), { headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'} diff --git a/modules/admin/composer.json b/modules/admin/composer.json index df1974b78..22b1dd948 100644 --- a/modules/admin/composer.json +++ b/modules/admin/composer.json @@ -3,15 +3,15 @@ "description" : "Zephir Luya Admin", "require" : { "zephir/luya" : "*", - "bower-asset/jquery" : "*", - "bower-asset/jquery-ui" : "*", + "bower-asset/jquery" : "2.*", + "bower-asset/jqueryui" : "*", "bower-asset/angular" : "1.3.10", - "bower-asset/angular-resource": "1.3.10", - "bower-asset/angular-ui-router" : "0.2.13", - "bower-asset/angular-loading-bar" : "dev-master", - "bower-asset/angular-ui-ace" : "*", - "bower-asset/angular-dragdrop" : "*", - "bower-asset/ace-builds" : "1.1.8" + "bower-asset/angular-resource": "1.3.10", + "bower-asset/angular-ui-router" : "0.2.13", + "bower-asset/angular-loading-bar" : "dev-master", + "bower-asset/angular-ui-ace" : "*", + "bower-asset/angular-dragdrop" : "*", + "bower-asset/ace-builds" : "1.1.8" }, "autoload" : { "psr-4" : { diff --git a/modules/admin/views/layouts/nosession.php b/modules/admin/views/layouts/nosession.php index 345272a07..00ae2124c 100644 --- a/modules/admin/views/layouts/nosession.php +++ b/modules/admin/views/layouts/nosession.php @@ -22,7 +22,7 @@ - + endBody() ?> -