diff --git a/dist/twist/Core/Controllers/Manager.controller.php b/dist/twist/Core/Controllers/Manager.controller.php index 05790e89..13fdff12 100755 --- a/dist/twist/Core/Controllers/Manager.controller.php +++ b/dist/twist/Core/Controllers/Manager.controller.php @@ -87,9 +87,9 @@ public function dashboard(){ $arrTags['version'] = \Twist::version(); if(count($arrLatestVersion) && array_key_exists('stable',$arrLatestVersion)){ - $arrTags['version_status'] = (\Twist::version() == $arrLatestVersion['stable']['version']) ? 'Twist is Up-to-date' : 'A new version of TwistPHP is available, download from twist.com!'; + $arrTags['version_status'] = (\Twist::version() == $arrLatestVersion['stable']['version']) ? 'Twist is Up-to-date' : 'A new version of TwistPHP is available [download it now]'; }else{ - $arrTags['version_status'] = 'Failed to retrieve version information, try again later!'; + $arrTags['version_status'] = 'Failed to retrieve version information, try again later!'; } $objCodeScanner = new \Twist\Core\Models\Security\CodeScanner(); @@ -105,7 +105,7 @@ public function dashboard(){ $strUsersTable = sprintf('%susers',TWIST_DATABASE_TABLE_PREFIX); - $arrTags['user-accounts'] = sprintf('%d Superadmin,
%d Admin,
%d Advanced,
%d Member', + $arrTags['user-accounts'] = sprintf('%d Superadmin
%d Admin
%d Advanced
%d Member', \Twist::Database()->records($strUsersTable)->count(\Twist::framework()->setting('USER_LEVEL_SUPERADMIN'),'level'), \Twist::Database()->records($strUsersTable)->count(\Twist::framework()->setting('USER_LEVEL_ADMIN'),'level'), \Twist::Database()->records($strUsersTable)->count(\Twist::framework()->setting('USER_LEVEL_ADVANCED'),'level'), diff --git a/dist/twist/Core/Resources/twist/manager/css/twist-manager.min.css b/dist/twist/Core/Resources/twist/manager/css/twist-manager.min.css deleted file mode 100755 index c53ea488..00000000 --- a/dist/twist/Core/Resources/twist/manager/css/twist-manager.min.css +++ /dev/null @@ -1,27 +0,0 @@ -/*! - * TwistPHP - An open source PHP MVC framework built from the ground up. - * Copyright (C) 2016 Shadow Technologies Ltd. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * @author Shadow Technologies Ltd. - * @license https://www.gnu.org/licenses/gpl.html GPL License - * @link https://twistphp.com - * - * -------------- - * TwistPHP Manager - * -------------- - */html::after{width:475px;height:500px;display:block;position:fixed;right:-50px;bottom:-50px;background:url("../images/background.png") left no-repeat;content:"";z-index:-1}body{margin:35px}.grid-container{padding:20px 0 50px;background:#FFF;border:1px #CCC solid;border-radius:3px}h1{margin:10px 20px;text-align:center}h1 img{height:43px;margin-right:0.5em;display:inline-block;vertical-align:bottom}ul.tabs{margin-bottom:30px;padding-right:10px;padding-left:10px;background-color:inherit}ul.tabs li a i{margin-left:0.5em;display:inline-block;vertical-align:middle}h2,h3{margin-top:0.5em}.button{margin-left:10px}table .button,table input,table select{margin-top:0 !important;float:none !important;font-size:1em !important}#twist-manager-repolist ul li{display:inline-block;width:44%;padding:2%;height:130px;margin-bottom:1%;margin-right:1%;border:1px solid #CCC;font-size:0.8em}#twist-manager-repolist ul li .package-logo{vertical-align:top;text-align:left;display:inline-block;width:30%}#twist-manager-repolist ul li .package-logo img{display:inline-block;width:90%}#twist-manager-repolist ul li .package-details{vertical-align:top;display:inline-block;width:60%}#progress-percentage-wrapper{margin:10px 10px 0}#progress-percentage{width:0;height:3px;background:#0E0;-webkit-transition:width 400ms ease, opacity 750ms ease;-moz-transition:width 400ms ease, opacity 750ms ease;-ms-transition:width 400ms ease, opacity 750ms ease;-o-transition:width 400ms ease, opacity 750ms ease;transition:width 400ms ease, opacity 750ms ease}#progress{height:450px;margin:0 10px;padding:20px 20px 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box;overflow:hidden;color:#FFF;font-size:1.3em;font-family:Monaco, "Courier New", Courier, monospace, mono;background:#000;border-bottom:20px #000 solid;border-radius:0 0 3px 3px}#complete-actions{display:none;text-align:right}#complete-actions .button{margin:10px 10px 0 0}#init-update{width:0;height:0;margin:0;padding:0;border:none} - -/*# sourceMappingURL=twist-manager.min.css.map */ diff --git a/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css b/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css index 02aaa7e2..739165da 100755 --- a/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css +++ b/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css @@ -22,6 +22,6 @@ * -------------- * TwistPHP Manager * -------------- - */html::after{width:475px;height:500px;display:block;position:fixed;right:-50px;bottom:-50px;background:url("../images/background.png") left no-repeat;content:"";z-index:-1}body{margin:35px}.grid-container{padding:20px 0 50px;background:#FFF;border:1px #CCC solid;border-radius:3px}h1{margin:10px 20px;text-align:center}h1 img{height:43px;margin-right:0.5em;display:inline-block;vertical-align:bottom}ul.tabs{margin-bottom:30px;padding-right:10px;padding-left:10px;background-color:inherit}ul.tabs li a i{margin-left:0.5em;display:inline-block;vertical-align:middle}h2,h3{margin-top:0.5em}.button{margin-left:10px}table .button,table input,table select{margin-top:0 !important;float:none !important;font-size:1em !important}#twist-manager-repolist ul li{display:inline-block;width:44%;padding:2%;height:130px;margin-bottom:1%;margin-right:1%;border:1px solid #CCC;font-size:0.8em}#twist-manager-repolist ul li .package-logo{vertical-align:top;text-align:left;display:inline-block;width:30%}#twist-manager-repolist ul li .package-logo img{display:inline-block;width:90%}#twist-manager-repolist ul li .package-details{vertical-align:top;display:inline-block;width:60%}#progress-percentage-wrapper{margin:10px 10px 0}#progress-percentage{width:0;height:3px;background:#0E0;-webkit-transition:width 400ms ease, opacity 750ms ease;-moz-transition:width 400ms ease, opacity 750ms ease;-ms-transition:width 400ms ease, opacity 750ms ease;-o-transition:width 400ms ease, opacity 750ms ease;transition:width 400ms ease, opacity 750ms ease}#progress{height:450px;margin:0 10px;padding:20px 20px 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box;overflow:hidden;color:#FFF;font-size:1.3em;font-family:Monaco, "Courier New", Courier, monospace, mono;background:#000;border-bottom:20px #000 solid;border-radius:0 0 3px 3px}#complete-actions{display:none;text-align:right}#complete-actions .button{margin:10px 10px 0 0}#init-update{width:0;height:0;margin:0;padding:0;border:none} + */html{min-width:320px}html::after{width:475px;height:500px;display:block;position:fixed;right:-50px;bottom:-50px;background:url("../images/background.png") left no-repeat;content:"";z-index:-1}body{margin:30px}.grid-container{padding:0 0 50px;background:rgba(255,255,255,0.85);box-shadow:0 0.5em 1.25em rgba(0,0,0,0.25)}h1{margin:10px 0;padding-right:30px !important;padding-left:30px !important;text-align:center}h1 img{height:43px;margin-right:0.5em;display:inline-block;vertical-align:bottom}#menu{margin:0;padding:0;overflow:visible;background-color:transparent;border-radius:0 3px 3px 0}#menu::before,#menu::after{display:none}#menu li{margin:0;display:block;overflow:hidden;border:none;border-radius:0}#menu li a{padding:15px 20px 15px 15px;display:block;line-height:1;text-decoration:none}#menu li a i{margin-left:1em;display:inline-block;float:right}#menu li::after{height:7px;position:absolute;top:-7px;right:10px;left:-10px;border-radius:100%;box-shadow:0 0 10px rgba(0,0,0,0.5);content:""}#menu li.current a{padding-left:20px;color:#0D47A1}#menu li.current a:hover{color:#1976D2}#menu li.current a:active{color:#E64A19}h2,h3{margin-top:0.5em}dl{margin-bottom:0}.button{margin-left:10px}table .button,table input,table select{margin-top:0 !important;float:none !important;font-size:1em !important}#twist-manager-repolist ul li{display:inline-block;width:44%;padding:2%;height:130px;margin-bottom:1%;margin-right:1%;border:1px solid #CCC;font-size:0.8em}#twist-manager-repolist ul li .package-logo{vertical-align:top;text-align:left;display:inline-block;width:30%}#twist-manager-repolist ul li .package-logo img{display:inline-block;width:90%}#twist-manager-repolist ul li .package-details{vertical-align:top;display:inline-block;width:60%}#progress-percentage-wrapper{margin:10px 10px 0}#progress-percentage{width:0;height:3px;background:#0E0;-webkit-transition:width 400ms ease, opacity 750ms ease;-moz-transition:width 400ms ease, opacity 750ms ease;-ms-transition:width 400ms ease, opacity 750ms ease;-o-transition:width 400ms ease, opacity 750ms ease;transition:width 400ms ease, opacity 750ms ease}#progress{height:450px;margin:0 10px;padding:20px 20px 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box;overflow:hidden;color:#FFF;font-size:1.3em;font-family:Monaco, "Courier New", Courier, monospace, mono;background:#000;border-bottom:20px #000 solid;border-radius:0 0 3px 3px}#complete-actions{display:none;text-align:right}#complete-actions .button{margin:10px 10px 0 0}#init-update{width:0;height:0;margin:0;padding:0;border:none} /*# sourceMappingURL=twistmanager.min.css.map */ diff --git a/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css.map b/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css.map index 266f1e9b..e997ae49 100644 --- a/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css.map +++ b/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css.map @@ -1 +1 @@ -{"version":3,"file":"twistmanager.min.css","sources":["twistmanager.scss"],"sourcesContent":["/*!\n * This file is part of TwistPHP.\n *\n * TwistPHP is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * TwistPHP is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with TwistPHP. If not, see .\n *\n * @author Shadow Technologies Ltd. \n * @license https://www.gnu.org/licenses/gpl.html LGPL License\n * @link https://twistphp.com\n *\n * --------------\n * TwistPHP Manager\n * --------------\n */\n\nhtml::after {\n\twidth: 475px;\n\theight: 500px;\n\n\tdisplay: block;\n\n\tposition: fixed;\n\tright: -50px;\n\tbottom: -50px;\n\n\tbackground: url(\"../images/background.png\") left no-repeat;\n\n\tcontent: \"\";\n\n\tz-index: -1;\n}\n\nbody {\n\tmargin: 35px;\n}\n\n.grid-container {\n\tpadding: 20px 0 50px;\n\n\t/*background: rgba(255, 255, 255, 0.85);*/\n\tbackground: #FFF;\n\n\tborder: 1px #CCC solid;\n\tborder-radius: 3px;\n}\n\nh1 {\n\tmargin: 10px 20px;\n\n\ttext-align: center;\n}\n\n\th1 img {\n\t\theight: 43px;\n\t\tmargin-right: 0.5em;\n\n\t\tdisplay: inline-block;\n\n\t\tvertical-align: bottom;\n\t}\n\nul.tabs {\n\tmargin-bottom: 30px;\n\tpadding-right: 10px;\n\tpadding-left: 10px;\n\n\tbackground-color: inherit;\n}\n\n\tul.tabs li a i {\n\t\tmargin-left: 0.5em;\n\n\t\tdisplay: inline-block;\n\n\t\tvertical-align: middle;\n\t}\n\nh2,\nh3 {\n\tmargin-top: 0.5em;\n}\n\n.button {\n\tmargin-left: 10px;\n}\n\ntable .button,\ntable input,\ntable select {\n\tmargin-top: 0 !important;\n\n\tfloat: none !important;\n\n\tfont-size: 1em !important;\n}\n\n#twist-manager-repolist ul li{\n\tdisplay: inline-block;\n\twidth:44%;\n\tpadding:2%;\n\theight:130px;\n\tmargin-bottom:1%;\n\tmargin-right:1%;\n\tborder:1px solid #CCC;\n\tfont-size: 0.8em;\n}\n\n#twist-manager-repolist ul li .package-logo{\n\tvertical-align: top;\n\ttext-align: left;\n\tdisplay: inline-block;\n\twidth:30%;\n}\n\n#twist-manager-repolist ul li .package-logo img{\n\tdisplay: inline-block;\n\twidth:90%;\n}\n\n#twist-manager-repolist ul li .package-details{\n\tvertical-align: top;\n\tdisplay: inline-block;\n\twidth:60%;\n}\n\n#progress-percentage-wrapper {\n\tmargin: 10px 10px 0;\n}\n\n\t#progress-percentage {\n\t\twidth: 0;\n\t\theight: 3px;\n\n\t\tbackground: #0E0;\n\n\t\t-webkit-transition: width 400ms ease, opacity 750ms ease;\n\t\t-moz-transition: width 400ms ease, opacity 750ms ease;\n\t\t-ms-transition: width 400ms ease, opacity 750ms ease;\n\t\t-o-transition: width 400ms ease, opacity 750ms ease;\n\t\ttransition: width 400ms ease, opacity 750ms ease;\n\t}\n\n#progress {\n\theight: 450px;\n\tmargin: 0 10px;\n\tpadding: 20px 20px 0;\n\n\t-webkit-box-sizing: border-box;\n\t-moz-box-sizing: border-box;\n\t-ms-box-sizing: border-box;\n\t-o-box-sizing: border-box;\n\tbox-sizing: border-box;\n\n\toverflow: hidden;\n\n\tcolor: #FFF;\n\tfont-size: 1.3em;\n\tfont-family: Monaco, \"Courier New\", Courier, monospace, mono;\n\n\tbackground: #000;\n\n\tborder-bottom: 20px #000 solid;\n\tborder-radius: 0 0 3px 3px;\n}\n\n#complete-actions {\n\tdisplay: none;\n\n\ttext-align: right;\n}\n\n\t#complete-actions .button {\n\t\tmargin: 10px 10px 0 0;\n\t}\n\n#init-update {\n\twidth: 0;\n\theight: 0;\n\tmargin: 0;\n\tpadding: 0;\n\n\tborder: none;\n}"],"mappings":"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","names":[],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"file":"twistmanager.min.css","sources":["twistmanager.scss"],"sourcesContent":["/*!\n * TwistPHP - An open source PHP MVC framework built from the ground up.\n * Copyright (C) 2016 Shadow Technologies Ltd.\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program. If not, see .\n *\n * @author Shadow Technologies Ltd. \n * @license https://www.gnu.org/licenses/gpl.html GPL License\n * @link https://twistphp.com\n *\n * --------------\n * TwistPHP Manager\n * --------------\n */\n\nhtml{\n\tmin-width: 320px;\n\n\t&::after {\n\t\twidth: 475px;\n\t\theight: 500px;\n\n\t\tdisplay: block;\n\n\t\tposition: fixed;\n\t\tright: -50px;\n\t\tbottom: -50px;\n\n\t\tbackground: url(\"../images/background.png\") left no-repeat;\n\n\t\tcontent: \"\";\n\n\t\tz-index: -1;\n\t}\n}\n\nbody {\n\tmargin: 30px;\n}\n\n.grid-container {\n\tpadding: 0 0 50px;\n\n\tbackground: rgba(255, 255, 255, 0.85);\n\t//background: #FFF;\n\n\t//border: 1px #CCC solid;\n\t//border-radius: 3px;\n\n\tbox-shadow: 0 0.5em 1.25em rgba(0, 0, 0, 0.25);\n}\n\nh1 {\n\tmargin: 10px 0;\n\tpadding-right: 30px !important;\n\tpadding-left: 30px !important;\n\n\ttext-align: center;\n}\n\n\th1 img {\n\t\theight: 43px;\n\t\tmargin-right: 0.5em;\n\n\t\tdisplay: inline-block;\n\n\t\tvertical-align: bottom;\n\t}\n\n#menu {\n\tmargin: 0;\n\tpadding: 0;\n\n\toverflow: visible;\n\n\tbackground-color: transparent;\n\n\t//border: 1px #CCC solid;\n\t//border-left-width: 0;\n\tborder-radius: 0 3px 3px 0;\n\n\t//box-shadow: 0 0.5em 1.25em rgba(0, 0, 0, 0.35);\n\n\t&::before,\n\t&::after {\n\t\tdisplay: none;\n\t}\n\n\tli {\n\t\tmargin: 0;\n\n\t\tdisplay: block;\n\n\t\toverflow: hidden;\n\n\t\tborder: none;\n\t\tborder-radius: 0;\n\n\t\ta {\n\t\t\tpadding: 15px 20px 15px 15px;\n\n\t\t\tdisplay: block;\n\n\t\t\tline-height: 1;\n\t\t\ttext-decoration: none;\n\n\t\t\ti {\n\t\t\t\tmargin-left: 1em;\n\n\t\t\t\tdisplay: inline-block;\n\n\t\t\t\tfloat: right;\n\t\t\t}\n\t\t}\n\n\t\t&::after {\n\t\t\theight: 7px;\n\n\t\t\tposition: absolute;\n\t\t\ttop: -7px;\n\t\t\tright: 10px;\n\t\t\tleft: -10px;\n\n\t\t\tborder-radius: 100%;\n\n\t\t\tbox-shadow: 0 0 10px rgba(0, 0, 0, 0.5);\n\n\t\t\tcontent: \"\";\n\t\t}\n\n\t\t&.current {\n\t\t\t&::after {\n\t\t\t\t//top: 0;\n\t\t\t}\n\n\t\t\ta {\n\t\t\t\tpadding-left: 20px;\n\n\t\t\t\tcolor: #0D47A1;\n\n\t\t\t\t&:hover {\n\t\t\t\t\tcolor: #1976D2;\n\t\t\t\t}\n\n\t\t\t\t&:active {\n\t\t\t\t\tcolor: #E64A19;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n\nh2,\nh3 {\n\tmargin-top: 0.5em;\n}\n\ndl {\n\tmargin-bottom: 0;\n}\n\n.button {\n\tmargin-left: 10px;\n}\n\ntable {\n\t.button,\n\tinput,\n\tselect {\n\t\tmargin-top: 0 !important;\n\n\t\tfloat: none !important;\n\n\t\tfont-size: 1em !important;\n\t}\n}\n\n#twist-manager-repolist {\n\tul {\n\t\tli {\n\t\t\tdisplay: inline-block;\n\t\t\twidth:44%;\n\t\t\tpadding:2%;\n\t\t\theight:130px;\n\t\t\tmargin-bottom:1%;\n\t\t\tmargin-right:1%;\n\t\t\tborder:1px solid #CCC;\n\t\t\tfont-size: 0.8em;\n\t\t\t.package-logo{\n\t\t\t\tvertical-align: top;\n\t\t\t\ttext-align: left;\n\t\t\t\tdisplay: inline-block;\n\t\t\t\twidth:30%;\n\t\t\t\timg{\n\t\t\t\t\tdisplay: inline-block;\n\t\t\t\t\twidth:90%;\n\t\t\t\t}\n\t\t\t}\n\t\t\t.package-details{\n\t\t\t\tvertical-align: top;\n\t\t\t\tdisplay: inline-block;\n\t\t\t\twidth:60%;\n\t\t\t}\n\t\t}\n\t}\n}\n\n#progress-percentage-wrapper {\n\tmargin: 10px 10px 0;\n}\n\n\t#progress-percentage {\n\t\twidth: 0;\n\t\theight: 3px;\n\n\t\tbackground: #0E0;\n\n\t\t-webkit-transition: width 400ms ease, opacity 750ms ease;\n\t\t-moz-transition: width 400ms ease, opacity 750ms ease;\n\t\t-ms-transition: width 400ms ease, opacity 750ms ease;\n\t\t-o-transition: width 400ms ease, opacity 750ms ease;\n\t\ttransition: width 400ms ease, opacity 750ms ease;\n\t}\n\n#progress {\n\theight: 450px;\n\tmargin: 0 10px;\n\tpadding: 20px 20px 0;\n\n\t-webkit-box-sizing: border-box;\n\t-moz-box-sizing: border-box;\n\t-ms-box-sizing: border-box;\n\t-o-box-sizing: border-box;\n\tbox-sizing: border-box;\n\n\toverflow: hidden;\n\n\tcolor: #FFF;\n\tfont-size: 1.3em;\n\tfont-family: Monaco, \"Courier New\", Courier, monospace, mono;\n\n\tbackground: #000;\n\n\tborder-bottom: 20px #000 solid;\n\tborder-radius: 0 0 3px 3px;\n}\n\n#complete-actions {\n\tdisplay: none;\n\n\ttext-align: right;\n\n\t.button {\n\t\tmargin: 10px 10px 0 0;\n\t}\n}\n\n#init-update {\n\twidth: 0;\n\theight: 0;\n\tmargin: 0;\n\tpadding: 0;\n\n\tborder: none;\n}"],"mappings":"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","names":[],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/dist/twist/Core/Views/manager/_base.tpl b/dist/twist/Core/Views/manager/_base.tpl index 02b783c1..48d94a0c 100755 --- a/dist/twist/Core/Views/manager/_base.tpl +++ b/dist/twist/Core/Views/manager/_base.tpl @@ -1,5 +1,5 @@ - + TwistPHP Manager @@ -26,8 +26,8 @@

TwistPHP

-
    {view:./components/global/menu.php}
-
+ +
{route:response}
diff --git a/dist/twist/Core/Views/manager/_login.tpl b/dist/twist/Core/Views/manager/_login.tpl index 001965f7..6ccb336c 100755 --- a/dist/twist/Core/Views/manager/_login.tpl +++ b/dist/twist/Core/Views/manager/_login.tpl @@ -1,36 +1,36 @@ - - Login | TwistPHP Manager - - - + + Login | TwistPHP Manager + + + - - {resource:unsemantic} - {resource:font-awesome} - {resource:arable} - {resource:jquery} + + {resource:unsemantic} + {resource:font-awesome} + {resource:arable} + {resource:jquery} - - {resource:twist/manager} + + {resource:twist/manager} - - + + - - - - - - -
-
-

TwistPHP

-
-
- {route:response} -
-
- + + + + + + +
+
+

TwistPHP

+
+
+ {route:response} +
+
+ \ No newline at end of file diff --git a/dist/twist/Core/Views/manager/_update.tpl b/dist/twist/Core/Views/manager/_update.tpl index 1cb99de2..06c312d1 100755 --- a/dist/twist/Core/Views/manager/_update.tpl +++ b/dist/twist/Core/Views/manager/_update.tpl @@ -1,79 +1,79 @@ - - - Update | TwistPHP Manager - - - + + + Update | TwistPHP Manager + + + - - {resource:unsemantic} - {resource:font-awesome} - {resource:arable} - {resource:jquery} + + {resource:unsemantic} + {resource:font-awesome} + {resource:arable} + {resource:jquery} - - + + - - + + - - + + - - - - - - -
-
-

TwistPHP Updater

-
-
-
-
-
-
- -
- - -
- + getProgress(); + } + ); + +
+ \ No newline at end of file diff --git a/dist/twist/Core/Views/manager/components/global/menu-item.tpl b/dist/twist/Core/Views/manager/components/global/menu-item.tpl index 294a000b..127cccfa 100644 --- a/dist/twist/Core/Views/manager/components/global/menu-item.tpl +++ b/dist/twist/Core/Views/manager/components/global/menu-item.tpl @@ -1,4 +1,4 @@ - {data:name} + {data:name} {(route:uri=='/'&&data:uri=='')||(route:uri^=data:uri&&data:uri!='')?data:submenu:''} \ No newline at end of file diff --git a/dist/twist/Core/Views/manager/pages/dashboard.tpl b/dist/twist/Core/Views/manager/pages/dashboard.tpl index 360ba430..e64b8e43 100755 --- a/dist/twist/Core/Views/manager/pages/dashboard.tpl +++ b/dist/twist/Core/Views/manager/pages/dashboard.tpl @@ -1,4 +1,4 @@ -
+

Dashboard

TwistPHP Version
{data:version}
@@ -6,7 +6,7 @@
-
+

Status

[Turn {data:maintenance-mode=='Off'?'On':'Off'}]Maintenance Mode: {data:maintenance-mode}

[Turn {data:data-caching=='Off'?'On':'Off'}]Data Caching: {data:data-caching}

diff --git a/src/Core/Resources/twist/manager/scss/twistmanager.scss b/src/Core/Resources/twist/manager/scss/twistmanager.scss index adb14eb2..1bdb991d 100755 --- a/src/Core/Resources/twist/manager/scss/twistmanager.scss +++ b/src/Core/Resources/twist/manager/scss/twistmanager.scss @@ -24,39 +24,47 @@ * -------------- */ -html::after { - width: 475px; - height: 500px; +html{ + min-width: 320px; - display: block; + &::after { + width: 475px; + height: 500px; - position: fixed; - right: -50px; - bottom: -50px; + display: block; - background: url("../images/background.png") left no-repeat; + position: fixed; + right: -50px; + bottom: -50px; - content: ""; + background: url("../images/background.png") left no-repeat; - z-index: -1; + content: ""; + + z-index: -1; + } } body { - margin: 35px; + margin: 30px; } .grid-container { - padding: 20px 0 50px; + padding: 0 0 50px; + + background: rgba(255, 255, 255, 0.85); + //background: #FFF; - /*background: rgba(255, 255, 255, 0.85);*/ - background: #FFF; + //border: 1px #CCC solid; + //border-radius: 3px; - border: 1px #CCC solid; - border-radius: 3px; + box-shadow: 0 0.5em 1.25em rgba(0, 0, 0, 0.25); } h1 { - margin: 10px 20px; + margin: 10px 0; + padding-right: 30px !important; + padding-left: 30px !important; text-align: center; } @@ -70,68 +78,142 @@ h1 { vertical-align: bottom; } -ul.tabs { - margin-bottom: 30px; - padding-right: 10px; - padding-left: 10px; +#menu { + margin: 0; + padding: 0; - background-color: inherit; -} + overflow: visible; - ul.tabs li a i { - margin-left: 0.5em; + background-color: transparent; - display: inline-block; + //border: 1px #CCC solid; + //border-left-width: 0; + border-radius: 0 3px 3px 0; + + //box-shadow: 0 0.5em 1.25em rgba(0, 0, 0, 0.35); + + &::before, + &::after { + display: none; + } + + li { + margin: 0; + + display: block; + + overflow: hidden; + + border: none; + border-radius: 0; + + a { + padding: 15px 20px 15px 15px; + + display: block; + + line-height: 1; + text-decoration: none; + + i { + margin-left: 1em; + + display: inline-block; + + float: right; + } + } + + &::after { + height: 7px; - vertical-align: middle; + position: absolute; + top: -7px; + right: 10px; + left: -10px; + + border-radius: 100%; + + box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); + + content: ""; + } + + &.current { + &::after { + //top: 0; + } + + a { + padding-left: 20px; + + color: #0D47A1; + + &:hover { + color: #1976D2; + } + + &:active { + color: #E64A19; + } + } + } } +} h2, h3 { margin-top: 0.5em; } -.button { - margin-left: 10px; +dl { + margin-bottom: 0; } -table .button, -table input, -table select { - margin-top: 0 !important; - - float: none !important; - - font-size: 1em !important; +.button { + margin-left: 10px; } -#twist-manager-repolist ul li{ - display: inline-block; - width:44%; - padding:2%; - height:130px; - margin-bottom:1%; - margin-right:1%; - border:1px solid #CCC; - font-size: 0.8em; -} +table { + .button, + input, + select { + margin-top: 0 !important; -#twist-manager-repolist ul li .package-logo{ - vertical-align: top; - text-align: left; - display: inline-block; - width:30%; -} + float: none !important; -#twist-manager-repolist ul li .package-logo img{ - display: inline-block; - width:90%; + font-size: 1em !important; + } } -#twist-manager-repolist ul li .package-details{ - vertical-align: top; - display: inline-block; - width:60%; +#twist-manager-repolist { + ul { + li { + display: inline-block; + width:44%; + padding:2%; + height:130px; + margin-bottom:1%; + margin-right:1%; + border:1px solid #CCC; + font-size: 0.8em; + .package-logo{ + vertical-align: top; + text-align: left; + display: inline-block; + width:30%; + img{ + display: inline-block; + width:90%; + } + } + .package-details{ + vertical-align: top; + display: inline-block; + width:60%; + } + } + } } #progress-percentage-wrapper { @@ -178,11 +260,11 @@ table select { display: none; text-align: right; -} - #complete-actions .button { + .button { margin: 10px 10px 0 0; } +} #init-update { width: 0;