diff --git a/src/Umi/PageBuilder/umiNestableBuilder_LTE.php b/src/Umi/PageBuilder/umiNestableBuilder_LTE.php index c141559..82a2294 100644 --- a/src/Umi/PageBuilder/umiNestableBuilder_LTE.php +++ b/src/Umi/PageBuilder/umiNestableBuilder_LTE.php @@ -144,9 +144,9 @@ private function breadButton($itemId, $menuId, $parameterField, $buttonException '; } else { - $html .= ''; + $html .= ''; $html .= ' '; - $html .= ''; + $html .= ' '; } #browser @@ -155,9 +155,9 @@ private function breadButton($itemId, $menuId, $parameterField, $buttonException '; } else { - $html .= ' + $html .= ' - '; +  '; } #edit @@ -166,9 +166,9 @@ private function breadButton($itemId, $menuId, $parameterField, $buttonException '; } else { - $html .= ' + $html .= ' - '; +  '; } #delete @@ -177,27 +177,12 @@ private function breadButton($itemId, $menuId, $parameterField, $buttonException '; } else { - $html .= ''; + $html .= ''; $html .= ' '; $html .= ''; } $html .= ''; - /*$html =<< - - - - - - - - - - - - - -UMI;*/ + return $html; } } \ No newline at end of file diff --git a/src/resources/assets/lte/lte/dist/css/AdminLTE.css b/src/resources/assets/lte/lte/dist/css/AdminLTE.css index 6298996..f58b000 100644 --- a/src/resources/assets/lte/lte/dist/css/AdminLTE.css +++ b/src/resources/assets/lte/lte/dist/css/AdminLTE.css @@ -4975,6 +4975,10 @@ table.text-center th { white-space: normal !important; } } +.popover-notitle+.popover .popover-title,.popover.popover-notitle .popover-title,.widget-toolbar.no-border:before{display:none} +.popover,.popover-title,.tooltip-inner{border-radius:0} +.popover{padding:0;border-color:#ccc;border-width:1px;-webkit-box-shadow:0 0 4px 2px rgba(0,0,0,.2);box-shadow:0 0 4px 2px rgba(0,0,0,.2);color:#4D5C73}.popover-title{background-color:#EFF3F8;color:#555;border-bottom:1px solid #dde6f0;text-shadow:1px 1px 1px rgba(220,220,220,.2)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;border-bottom-color:#EFF3F8;border-top-width:0}.popover-error+.popover,.popover.popover-error{border-color:#F7F0EF}.popover-error+.popover .popover-title,.popover.popover-error .popover-title{background-color:#F7F0EF;border-bottom-color:#efe0de;color:#B75445;text-shadow:none}.popover-error+.popover.top .arrow:after,.popover.popover-error.top .arrow:after{border-top-color:#F7F0EF}.popover-error+.popover.bottom .arrow:after,.popover.popover-error.bottom .arrow:after{border-bottom-color:#F7F0EF}.popover-error+.popover.right .arrow:after,.popover.popover-error.right .arrow:after{border-right-color:#F7F0EF}.popover-error+.popover.left .arrow:after,.popover.popover-error.left .arrow:after{border-left-color:#F7F0EF}.popover-warning+.popover,.popover.popover-warning{border-color:#F4EEE3}.popover-warning+.popover .popover-title,.popover.popover-warning .popover-title{background-color:#F4EEE3;border-bottom-color:#ede3d1;color:#D67E31;text-shadow:none}.popover-warning+.popover.top .arrow:after,.popover.popover-warning.top .arrow:after{border-top-color:#F4EEE3}.popover-warning+.popover.bottom .arrow:after,.popover.popover-warning.bottom .arrow:after{border-bottom-color:#F4EEE3}.popover-warning+.popover.right .arrow:after,.popover.popover-warning.right .arrow:after{border-right-color:#F4EEE3}.popover-warning+.popover.left .arrow:after,.popover.popover-warning.left .arrow:after{border-left-color:#F4EEE3}.popover-success+.popover,.popover.popover-success{border-color:#E8F2E3}.popover-success+.popover .popover-title,.popover.popover-success .popover-title{background-color:#E8F2E3;border-bottom-color:#daead2;color:#629B58;text-shadow:none}.popover-success+.popover.top .arrow:after,.popover.popover-success.top .arrow:after{border-top-color:#E8F2E3}.popover-success+.popover.bottom .arrow:after,.popover.popover-success.bottom .arrow:after{border-bottom-color:#E8F2E3}.popover-success+.popover.right .arrow:after,.popover.popover-success.right .arrow:after{border-right-color:#E8F2E3}.popover-success+.popover.left .arrow:after,.popover.popover-success.left .arrow:after{border-left-color:#E8F2E3}.popover-info+.popover,.popover.popover-info{border-color:#E5EDF8}.popover-info+.popover .popover-title,.popover.popover-info .popover-title{background-color:#E5EDF8;border-bottom-color:#d1dff3;color:#3F79B6;text-shadow:none}.popover-info+.popover.top .arrow:after,.popover.popover-info.top .arrow:after{border-top-color:#E5EDF8}.popover-info+.popover.bottom .arrow:after,.popover.popover-info.bottom .arrow:after{border-bottom-color:#E5EDF8}.popover-info+.popover.right .arrow:after,.popover.popover-info.right .arrow:after{border-right-color:#E5EDF8}.popover-info+.popover.left .arrow:after,.popover.popover-info.left .arrow:after{border-left-color:#E5EDF8}.popover-notitle+.popover.top .arrow:after,.popover.popover-notitle.top .arrow:after{border-top-color:#FFF}.popover-notitle+.popover.bottom .arrow:after,.popover.popover-notitle.bottom .arrow:after{border-bottom-color:#FFF}.popover-notitle+.popover.left .arrow:after,.popover.popover-notitle.left .arrow:after{border-left-color:#FFF}.popover-notitle+.popover.right .arrow:after,.popover.popover-notitle.right .arrow:after{border-right-color:#FFF}.popover{visibility:hidden;min-width:0;max-height:0;max-width:0;margin-left:0;margin-right:0;top:-5%;left:auto;right:auto;opacity:0;display:none;position:absolute;-webkit-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;-o-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s}.popover.right{left:100%;right:auto;display:block}.popover.left{left:auto;right:100%;display:block}.popover{visibility:visible;opacity:1;z-index:1060;max-height:250px;max-width:250px;min-width:150px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s} + .fa-primary {color: #3c8dbc !important;}.fa-info {color: #00c0ef !important;}.fa-success,.fa-green {color: #00a65a !important;}.fa-warning,.fa-orange {color: #f39c12 !important;}.fa-danger,.fa-red {color: #f56954 !important;}.fa-gray {color: #d2d6de !important;}.fa-navy {color: #001F3F !important;}.fa-teal {color: #39CCCC !important;}.fa-purple {color: #605ca8 !important;}.fa-orange {color: #ff851b !important;}.fa-pink,.fa-maroon {color: #D81B60 !important;}.fa-black {color: #3c8dbc !important;}.fa-white {color: #fff !important;}.alert-danger-light, .alert-error-light { background-color: #f2dede; @@ -4984,4 +4988,4 @@ table.text-center th { .gritter-item-wrapper.dt-button-info{padding:12px 11px 8px;z-index:1999}.gritter-item-wrapper.dt-button-info>h2{margin-top:0} .gritter-light .gritter-title,.gritter-title{text-shadow:none} .gritter-item-wrapper{background-image:none!important;box-shadow:0 2px 10px rgba(50,50,50,.5);background:rgba(50,50,50,.92)}.gritter-item-wrapper.gritter-info{background:rgba(49,81,133,.92)}.gritter-item-wrapper.gritter-error{background:rgba(153,40,18,.92)}.gritter-item-wrapper.gritter-success{background:rgba(89,131,75,.92)}.gritter-item-wrapper.gritter-warning{background:rgba(190,112,31,.92)}.gritter-item-wrapper.gritter-light{background:rgba(245,245,245,.95);border:1px solid #BBB}.gritter-item-wrapper.gritter-light.gritter-info{background:rgba(232,242,255,.95)}.gritter-item-wrapper.gritter-light.gritter-info .gritter-item{color:#4A577D}.gritter-item-wrapper.gritter-light.gritter-error{background:rgba(255,235,235,.95)}.gritter-item-wrapper.gritter-light.gritter-error .gritter-item{color:#894A38}.gritter-item-wrapper.gritter-light.gritter-success{background:rgba(239,250,227,.95)}.gritter-item-wrapper.gritter-light.gritter-success .gritter-item{color:#416131}.gritter-item-wrapper.gritter-light.gritter-warning{background:rgba(252,248,227,.95)}.gritter-bottom,.gritter-close,.gritter-item,.gritter-top{background-image:none}.gritter-item-wrapper.gritter-light.gritter-warning .gritter-item{color:#946446}.gritter-item p{line-height:1.8}.gritter-close{left:auto;right:4px;width:18px;height:18px;line-height:17px;text-align:center;border:2px solid transparent;border-radius:16px;color:#E17B67;font-size:0;text-indent:0}.gritter-close:before{font-family:FontAwesome;font-size:16px;content:"\f00d"}.gritter-info .gritter-close{color:orange}.gritter-error .gritter-close,.gritter-success .gritter-close,.gritter-warning .gritter-close{color:#FFEA07}.gritter-close:hover{color:#FFF!important;text-decoration:none}.gritter-light .gritter-bottom,.gritter-light .gritter-close,.gritter-light .gritter-item,.gritter-light .gritter-top{background-image:none;color:#444}.gritter-light .gritter-close:hover{color:#8A3104!important}.gritter-center{position:fixed;left:33%;right:33%;top:33%}.wysiwyg-style1 .btn-group,.wysiwyg-style2 .btn-group,.wysiwyg-toolbar{position:relative}@media only screen and (max-width:767px){.gritter-center{left:16%;right:16%;top:30%}}@media only screen and (max-width:480px){.gritter-center{left:30px;right:30px}}@media only screen and (max-width:320px){.gritter-center{left:10px;right:10px}} -.dd-empty,.dd-handle,.dd-placeholder,.dd2-content{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.dd2-content[class*=btn-],.dd2-handle.btn-yellow{text-shadow:none!important}.dd,.dd-list{display:block;padding:0;list-style:none}.dd,.dd-item>button,.dd-list{position:relative}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{margin:0;max-width:600px;line-height:20px}.dd-list{margin:0}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-empty,.dd-item,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-empty,.dd-placeholder{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd-dragel>li>.dd2-handle,.dd2-handle{left:0;top:0;width:36px;margin:0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd-dragel>li>.dd2-handle,.dd2-handle:hover{background:#E3E8ED}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent #EEE transparent transparent}.dd2-handle.btn-yellow{background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent #FFF transparent transparent}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none} \ No newline at end of file +.dd-empty,.dd-handle,.dd-placeholder,.dd2-content{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.dd2-content[class*=btn-],.dd2-handle.btn-yellow{text-shadow:none!important}.dd,.dd-list{display:block;padding:0;list-style:none}.dd,.dd-item>button,.dd-list{position:relative}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{margin:0;max-width:600px;line-height:20px}.dd-list{margin:0}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-empty,.dd-item,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-empty,.dd-placeholder{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd-dragel>li>.dd2-handle,.dd2-handle{left:0;top:0;width:36px;margin:0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd-dragel>li>.dd2-handle,.dd2-handle:hover{background:#E3E8ED}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent #EEE transparent transparent}.dd2-handle.btn-yellow{background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent #FFF transparent transparent}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none} diff --git a/src/resources/assets/lte/lte/dist/css/AdminLTE.min.css b/src/resources/assets/lte/lte/dist/css/AdminLTE.min.css index 267a692..c4db935 100644 --- a/src/resources/assets/lte/lte/dist/css/AdminLTE.min.css +++ b/src/resources/assets/lte/lte/dist/css/AdminLTE.min.css @@ -13,4 +13,6 @@ .gritter-item-wrapper.dt-button-info{padding:12px 11px 8px;z-index:1999}.gritter-item-wrapper.dt-button-info>h2{margin-top:0} .gritter-light .gritter-title,.gritter-title{text-shadow:none} .gritter-item-wrapper{background-image:none!important;box-shadow:0 2px 10px rgba(50,50,50,.5);background:rgba(50,50,50,.92)}.gritter-item-wrapper.gritter-info{background:rgba(49,81,133,.92)}.gritter-item-wrapper.gritter-error{background:rgba(153,40,18,.92)}.gritter-item-wrapper.gritter-success{background:rgba(89,131,75,.92)}.gritter-item-wrapper.gritter-warning{background:rgba(190,112,31,.92)}.gritter-item-wrapper.gritter-light{background:rgba(245,245,245,.95);border:1px solid #BBB}.gritter-item-wrapper.gritter-light.gritter-info{background:rgba(232,242,255,.95)}.gritter-item-wrapper.gritter-light.gritter-info .gritter-item{color:#4A577D}.gritter-item-wrapper.gritter-light.gritter-error{background:rgba(255,235,235,.95)}.gritter-item-wrapper.gritter-light.gritter-error .gritter-item{color:#894A38}.gritter-item-wrapper.gritter-light.gritter-success{background:rgba(239,250,227,.95)}.gritter-item-wrapper.gritter-light.gritter-success .gritter-item{color:#416131}.gritter-item-wrapper.gritter-light.gritter-warning{background:rgba(252,248,227,.95)}.gritter-bottom,.gritter-close,.gritter-item,.gritter-top{background-image:none}.gritter-item-wrapper.gritter-light.gritter-warning .gritter-item{color:#946446}.gritter-item p{line-height:1.8}.gritter-close{left:auto;right:4px;width:18px;height:18px;line-height:17px;text-align:center;border:2px solid transparent;border-radius:16px;color:#E17B67;font-size:0;text-indent:0}.gritter-close:before{font-family:FontAwesome;font-size:16px;content:"\f00d"}.gritter-info .gritter-close{color:orange}.gritter-error .gritter-close,.gritter-success .gritter-close,.gritter-warning .gritter-close{color:#FFEA07}.gritter-close:hover{color:#FFF!important;text-decoration:none}.gritter-light .gritter-bottom,.gritter-light .gritter-close,.gritter-light .gritter-item,.gritter-light .gritter-top{background-image:none;color:#444}.gritter-light .gritter-close:hover{color:#8A3104!important}.gritter-center{position:fixed;left:33%;right:33%;top:33%}.wysiwyg-style1 .btn-group,.wysiwyg-style2 .btn-group,.wysiwyg-toolbar{position:relative}@media only screen and (max-width:767px){.gritter-center{left:16%;right:16%;top:30%}}@media only screen and (max-width:480px){.gritter-center{left:30px;right:30px}}@media only screen and (max-width:320px){.gritter-center{left:10px;right:10px}} -.dd-empty,.dd-handle,.dd-placeholder,.dd2-content{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.dd2-content[class*=btn-],.dd2-handle.btn-yellow{text-shadow:none!important}.dd,.dd-list{display:block;padding:0;list-style:none}.dd,.dd-item>button,.dd-list{position:relative}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{margin:0;max-width:600px;line-height:20px}.dd-list{margin:0}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-empty,.dd-item,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-empty,.dd-placeholder{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd-dragel>li>.dd2-handle,.dd2-handle{left:0;top:0;width:36px;margin:0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd-dragel>li>.dd2-handle,.dd2-handle:hover{background:#E3E8ED}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent #EEE transparent transparent}.dd2-handle.btn-yellow{background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent #FFF transparent transparent}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none} \ No newline at end of file +.dd-empty,.dd-handle,.dd-placeholder,.dd2-content{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.dd2-content[class*=btn-],.dd2-handle.btn-yellow{text-shadow:none!important}.dd,.dd-list{display:block;padding:0;list-style:none}.dd,.dd-item>button,.dd-list{position:relative}@media only screen and (max-width:767px) and (-webkit-min-device-pixel-ratio:0){.ui-jqgrid .ui-jqgrid-pager>.ui-pager-control>.ui-pg-table>tbody>tr>td#grid-pager_center>.ui-pg-table{width:300px}}.dd{margin:0;max-width:600px;line-height:20px}.dd-list{margin:0}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-empty,.dd-item,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#F8FAFF;border:1px solid #DAE2EA;color:#7C9EB2;text-decoration:none;font-weight:700;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-handle[class*=btn-],.dd2-content[class*=btn-]{color:#FFF;border:none;padding:9px 12px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*=btn-]{padding-left:44px}.dd-handle[class*=btn-]:hover,.dd2-content[class*=btn-] .dd2-handle[class*=btn-]:hover+.dd2-content[class*=btn-]{color:#FFF}.dd-item>button:hover~.dd-handle,.dd-item>button:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd-item>button:hover~.dd-handle[class*=btn-],.dd-item>button:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-handle:hover~.dd2-content{color:#438EB9;background:#F4F6F7;border-color:#DCE2E8}.dd2-handle:hover~.dd2-content[class*=btn-]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:0 0;font-size:12px;line-height:1;text-align:center;font-weight:700;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:400;font-size:14px}.dd-item>button[data-action=collapse]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-empty,.dd-placeholder{margin:5px 0;padding:0;min-height:30px;background:#F0F9FF;border:2px dashed #BED2DB;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4B92BE;background:#F1F5FA;border-color:#D6E1EA;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*=btn-]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*=item-]{border-width:0;padding:0}.dd-list>li[class*=item-]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd-dragel>li>.dd2-handle,.dd2-handle{left:0;top:0;width:36px;margin:0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#EBEDF2;border:1px solid #DEE4EA;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd-dragel>li>.dd2-handle,.dd2-handle:hover{background:#E3E8ED}.dd2-handle[class*=btn-]{text-shadow:none!important;background:rgba(0,0,0,.1)!important;border-right:1px solid #EEE}.dd2-handle[class*=btn-]:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle[class*=btn-]{border-color:transparent #EEE transparent transparent}.dd2-handle.btn-yellow{background:rgba(0,0,0,.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent #FFF transparent transparent}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none}.popover-notitle+.popover .popover-title,.popover.popover-notitle .popover-title,.widget-toolbar.no-border:before{display:none} +.popover,.popover-title,.tooltip-inner{border-radius:0} +.popover{padding:0;border-color:#ccc;border-width:1px;-webkit-box-shadow:0 0 4px 2px rgba(0,0,0,.2);box-shadow:0 0 4px 2px rgba(0,0,0,.2);color:#4D5C73}.popover-title{background-color:#EFF3F8;color:#555;border-bottom:1px solid #dde6f0;text-shadow:1px 1px 1px rgba(220,220,220,.2)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;border-bottom-color:#EFF3F8;border-top-width:0}.popover-error+.popover,.popover.popover-error{border-color:#F7F0EF}.popover-error+.popover .popover-title,.popover.popover-error .popover-title{background-color:#F7F0EF;border-bottom-color:#efe0de;color:#B75445;text-shadow:none}.popover-error+.popover.top .arrow:after,.popover.popover-error.top .arrow:after{border-top-color:#F7F0EF}.popover-error+.popover.bottom .arrow:after,.popover.popover-error.bottom .arrow:after{border-bottom-color:#F7F0EF}.popover-error+.popover.right .arrow:after,.popover.popover-error.right .arrow:after{border-right-color:#F7F0EF}.popover-error+.popover.left .arrow:after,.popover.popover-error.left .arrow:after{border-left-color:#F7F0EF}.popover-warning+.popover,.popover.popover-warning{border-color:#F4EEE3}.popover-warning+.popover .popover-title,.popover.popover-warning .popover-title{background-color:#F4EEE3;border-bottom-color:#ede3d1;color:#D67E31;text-shadow:none}.popover-warning+.popover.top .arrow:after,.popover.popover-warning.top .arrow:after{border-top-color:#F4EEE3}.popover-warning+.popover.bottom .arrow:after,.popover.popover-warning.bottom .arrow:after{border-bottom-color:#F4EEE3}.popover-warning+.popover.right .arrow:after,.popover.popover-warning.right .arrow:after{border-right-color:#F4EEE3}.popover-warning+.popover.left .arrow:after,.popover.popover-warning.left .arrow:after{border-left-color:#F4EEE3}.popover-success+.popover,.popover.popover-success{border-color:#E8F2E3}.popover-success+.popover .popover-title,.popover.popover-success .popover-title{background-color:#E8F2E3;border-bottom-color:#daead2;color:#629B58;text-shadow:none}.popover-success+.popover.top .arrow:after,.popover.popover-success.top .arrow:after{border-top-color:#E8F2E3}.popover-success+.popover.bottom .arrow:after,.popover.popover-success.bottom .arrow:after{border-bottom-color:#E8F2E3}.popover-success+.popover.right .arrow:after,.popover.popover-success.right .arrow:after{border-right-color:#E8F2E3}.popover-success+.popover.left .arrow:after,.popover.popover-success.left .arrow:after{border-left-color:#E8F2E3}.popover-info+.popover,.popover.popover-info{border-color:#E5EDF8}.popover-info+.popover .popover-title,.popover.popover-info .popover-title{background-color:#E5EDF8;border-bottom-color:#d1dff3;color:#3F79B6;text-shadow:none}.popover-info+.popover.top .arrow:after,.popover.popover-info.top .arrow:after{border-top-color:#E5EDF8}.popover-info+.popover.bottom .arrow:after,.popover.popover-info.bottom .arrow:after{border-bottom-color:#E5EDF8}.popover-info+.popover.right .arrow:after,.popover.popover-info.right .arrow:after{border-right-color:#E5EDF8}.popover-info+.popover.left .arrow:after,.popover.popover-info.left .arrow:after{border-left-color:#E5EDF8}.popover-notitle+.popover.top .arrow:after,.popover.popover-notitle.top .arrow:after{border-top-color:#FFF}.popover-notitle+.popover.bottom .arrow:after,.popover.popover-notitle.bottom .arrow:after{border-bottom-color:#FFF}.popover-notitle+.popover.left .arrow:after,.popover.popover-notitle.left .arrow:after{border-left-color:#FFF}.popover-notitle+.popover.right .arrow:after,.popover.popover-notitle.right .arrow:after{border-right-color:#FFF}.popover{visibility:hidden;min-width:0;max-height:0;max-width:0;margin-left:0;margin-right:0;top:-5%;left:auto;right:auto;opacity:0;display:none;position:absolute;-webkit-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;-o-transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s;transition:opacity .2s linear 0s,visibility 0s linear .2s,max-height 0s linear .2s,max-width 0s linear .2s,min-width 0s linear .2s}.popover.right{left:100%;right:auto;display:block}.popover.left{left:auto;right:100%;display:block}.popover{visibility:visible;opacity:1;z-index:1060;max-height:250px;max-width:250px;min-width:150px;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s} \ No newline at end of file diff --git a/src/resources/lang/en/menu.php b/src/resources/lang/en/menu.php index 0525c7c..7cb0f09 100644 --- a/src/resources/lang/en/menu.php +++ b/src/resources/lang/en/menu.php @@ -15,7 +15,7 @@ 'handsUp' => 'Hands Up!', 'tip2' => 'This list is the entire menus, If you want manage different user\'s menu, you can use another function called Distribution', 'reload' => 'Reload', - 'save' => 'Save', + 'save' => 'Update', 'warning' => 'Warning:', 'superAdminWarning' => 'is Super Admin which will load all menus regardless this setting, but still can set user menus and it will work when remove that super admin identity.' ]; \ No newline at end of file diff --git a/src/resources/lang/en/relation.php b/src/resources/lang/en/relation.php index a68ecf6..c841048 100644 --- a/src/resources/lang/en/relation.php +++ b/src/resources/lang/en/relation.php @@ -9,11 +9,11 @@ 'functionDescription' => 'Function Description: When the rule is matched, the extra action will be completed', 'tooltip' => 'Tooltips', 'exampleCustom' => 'Example of Custom operation', - 'customExplain' => ' + 'customExplain' => ' Warning: The custom rule name will be the function name which you will manually program with
You can customize any rule, set the correct table and field that can receive the right data for special operation
- + Advantage: delete action will follow the rule you make (no long active field match response field). The rule such as when delete record from active table then all the records will be deleted base on response field match custom rule ', @@ -48,7 +48,7 @@ 'back' => 'Back', 'functionDescription2' => 'Function Description: When the rule is matched, the action will be held', 'exitOperation' => 'Example of Exist Operation', - 'existExplain' => ' + 'existExplain' => ' Warning: This function is not operating other tables only current active table will be operated come with the customized rule
Warning: The rule is only: active field compare with response field or response field compare with custom value
@@ -56,7 +56,7 @@ Before do a action (delete, edit a record) the rule will be applied.
For example: there are user table and user\'s article table. If you want to delete a user then check article table to make sure no article belongs user. you can set the rule, active table - user, active field - id, response table - article, response field - user_id.
- + Advantage: delete action will follow the rule you make (no long active field match response field). The rule such as when delete record from active table then all the records will be deleted base on response field match custom rule ', @@ -85,12 +85,12 @@ active field: id, response table: article, response filed: user_id (normally is foreign key)
- + Advantage: delete action will follow the rule you make (no long active field match response field). The rule such as when delete record from active table then all the records will be deleted base on response field match custom rule ', 'selfCheckOperation' => 'Example of SelfCheck Operation', - 'selfCheckExplain' => ' + 'selfCheckExplain' => ' Warning: This function is not operating other tables only current active table will be operated come with the customized rule
Warning: The rule is only: active field compare with custom value
diff --git a/src/resources/lang/zh_cn/relation.php b/src/resources/lang/zh_cn/relation.php index 29de3f6..e9b8cc6 100644 --- a/src/resources/lang/zh_cn/relation.php +++ b/src/resources/lang/zh_cn/relation.php @@ -9,10 +9,10 @@ 'functionDescription' => '功能描述: 当规则匹对成功, 删除操作会被执行', 'tooltip' => '帮助', 'exampleCustom' => '自定义关系使用说明', - 'customExplain' => ' + 'customExplain' => ' 警告: 完全自定义规则, 根据需要进行配置, 但是要给规则命名
- + 高级操作(advantage): 额外的删除操作将根据你设定的条件执行(默认是active field = response field). 规则: response filed 匹配自定义的值 ', 'ruleName' => 'Rule Name', @@ -45,13 +45,13 @@ 'back' => '返回', 'functionDescription2' => '功能描述: 当规则匹对成功, 主操作将被禁止', 'exitOperation' => '使用说明 举例说明存在操作用法', - 'existExplain' => ' + 'existExplain' => ' 警告: 这个功能不会操作其他数据表, 仅仅和其他数据表进行查询匹配来限制主操作的进行
警告: 规则为 active field 和 response field对比, 或者 response field 和 custom value 对比
例如: 有一个user表 和 user\'s article表. 在你执行删除user表记录之前, 检查是否此用户存在任何文章, 如果存在则不能执行删除操作 你可以设置如下: active table - user, active field - id, response table - article, response field - user_id.
- + 高级操作(advantage): 额外的匹配操作将根据你设定的条件执行(默认是active field = response field). 规则: response filed 匹配自定义的值 ', 'deleteInterlock' => '关联删除', @@ -75,11 +75,11 @@ 'interlockExplain' => 'user 表有id, user_name 字段
article 表有id,user_id, article_title, content 字段
现在当你想删除user表中的记录, 所有词用户的文章也一并删除, 你可以设置如下 active table: user, active field: id, response table: article, response filed: user_id (normally is foreign key)
- + 高级操作(advantage): 额外的删除操作将根据你设定的条件执行(默认是active field = response field). 规则: response filed 匹配自定义的值 ', 'selfCheckOperation' => '使用说明 举例说明自检操作用法', - 'selfCheckExplain' => ' + 'selfCheckExplain' => ' 警告: 这个功能不会操作其他数据表,也不会和其他数据表进行查询匹配, 仅仅和自身进行规则匹配
警告: 规则仅仅为 active field 和 custom value 进行对比
diff --git a/src/resources/views/lte/field/fieldEditAdd.blade.php b/src/resources/views/lte/field/fieldEditAdd.blade.php index b3d99b9..4412902 100644 --- a/src/resources/views/lte/field/fieldEditAdd.blade.php +++ b/src/resources/views/lte/field/fieldEditAdd.blade.php @@ -52,7 +52,7 @@
-- + {{-- drop down box for selecting field --}} @include('umi::common.fieldDisplay.fieldsDropDownBox') diff --git a/src/resources/views/lte/menu/sideMenu.blade.php b/src/resources/views/lte/menu/sideMenu.blade.php index 33d8d1d..fa18fda 100644 --- a/src/resources/views/lte/menu/sideMenu.blade.php +++ b/src/resources/views/lte/menu/sideMenu.blade.php @@ -3,87 +3,76 @@ @section('content') - + -
-

- {{trans('umiTrans::menu.sideMenu')}} - - - {{trans('umiTrans::menu.menuManagement')}} - -

-
- -
+
-

- + {{trans('umiTrans::menu.handsUp')}} {!! trans('umiTrans::menu.tip2') !!}

-
+
+
- - - -
- {{--neastable js tree--}} -
- {{--
--}} - {!! $menuTree !!} - {{--
--}} + {{--neastable js tree--}} +
+ {!! $menuTree !!}
-
+
- - - -
-
+ {!! csrf_field() !!}
+
- + diff --git a/src/resources/views/lte/relation/custom.blade.php b/src/resources/views/lte/relation/custom.blade.php index 77917fc..adddbf4 100644 --- a/src/resources/views/lte/relation/custom.blade.php +++ b/src/resources/views/lte/relation/custom.blade.php @@ -3,66 +3,43 @@ @section('content') - + -
-

- {{trans('umiTrans::relation.relationOperation')}} - - - {{trans('umiTrans::relation.selectAdd')}} - - {{trans('umiTrans::relation.custom')}} - -

-
- -
+
-

- + {{trans('umiTrans::relation.handsUp')}} {{trans('umiTrans::relation.turnOff')}}
- {{trans('umiTrans::relation.functionDescription')}} + {{trans('umiTrans::relation.functionDescription')}}

-
-
-
-

- {{trans('umiTrans::relation.tooltip')}} - {{trans('umiTrans::relation.exampleCustom')}} -

-
- - - - - - - -
+
+
+
{{trans('umiTrans::relation.tooltip')}}: + {{trans('umiTrans::relation.exampleCustom')}}
- -
-
-

- {!! trans('umiTrans::relation.customExplain') !!} -

-
+
+ +
-
  -
+
+ {!! trans('umiTrans::relation.customExplain') !!} +
+ +
-
+
+ {!! csrf_field() !!} {{----}} @@ -70,41 +47,37 @@ {{--custom rule name--}}
- -
-
- -
+ +
+
-
- -
-
- -
+ +
+
-
-
+
{{--active table--}}
- -
+ +
-
-
-
- -
-
- -
+ +
+
-
-
-
+
{{--response table--}}
- -
+ +
-
-
-
- -
-
- -
+ +
+
-
-
-
+
{{--advantage--}}
- -
+ +
- @@ -192,52 +156,45 @@