Merge pull request #87 from TwistPHP/update-managerui

Update managerui
TwistPHP · Apr 5, 2016 · 66c02d1 · 66c02d1
2 parents 3384113 + a51b6e8
commit 66c02d1
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 200 deletions.
diff --git 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']) ? '<span class="success">Twist is Up-to-date</span>' : '<span class="warning">A new version of TwistPHP is available, <a href="https://twistphp.com/">download from twist.com</a>!</span>';
+			$arrTags['version_status'] = (\Twist::version() == $arrLatestVersion['stable']['version']) ? '<span class="tag green">Twist is Up-to-date</span>' : 'A new version of TwistPHP is available [<a href="https://github.com/TwistPHP/TwistPHP/releases" target="_blank">download it now</a>]';
 		}else{
-			$arrTags['version_status'] = '<span class="error">Failed to retrieve version information, try again later!</span>';
+			$arrTags['version_status'] = '<span class="tag red">Failed to retrieve version information, try again later!</span>';
 		}
 
 		$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('<strong>%d</strong> Superadmin,<br><strong>%d</strong> Admin,<br><strong>%d</strong> Advanced,<br><strong>%d</strong> Member',
+		$arrTags['user-accounts'] = sprintf('<strong>%d</strong> Superadmin<br><strong>%d</strong> Admin<br><strong>%d</strong> Advanced<br><strong>%d</strong> 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
diff --git a/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css b/dist/twist/Core/Resources/twist/manager/css/twistmanager.min.css