Merge branch 'dev' of https://github.com/Awilum/monstra-cms into dev

admin/themes/default/css/default.css

@@ -50,11 +50,20 @@ ul.navbar-nav {
     background: #333;
 }
 
+.navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
+    background: #333; 
+}
+
 a.navbar-brand {
     font-weight: bold;
     color: #FAFAFA!important;
 }
 
+.navbar-nav .dropdown-menu {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
 .navbar-nav .dropdown-menu > li > a {
     padding: 7px 20px;
 }
@@ -361,6 +370,21 @@ footer {
     border-radius: 0px;
     background: #fff;
     color: #555;
-    -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.2);
+  -webkit-font-smoothing: subpixel-antialiased;
-            box-shadow: 0 1px 1px rgba(0,0,0,0.2);
+    -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.13);
+            box-shadow: 0 1px 3px rgba(0,0,0,.13);
+
+}
+
+
+.dashboard-well {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
+.dashboard-well a.welcome-back {
+  text-decoration: none;
+  color: #333;
+  font-size: 16px;
+  padding-left: 0;
 }

admin/themes/default/index.template.php

@@ -60,11 +60,12 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="<?php echo Option::get('siteurl'); ?>/admin">MONSTRA</a>
+            <a class="navbar-brand" href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard">MONSTRA</a>
           </div>
 
           <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">      
             <ul class="nav navbar-nav">          
+              <li<?php if (Request::get('id') == 'dashboard') { ?> class="active"<?php } ?>><a href="<?php echo Site::url(); ?>/admin/index.php?id=dashboard">Dashboard</a></li>              
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo __('Content', 'pages'); ?> <b class="caret"></b></a>
                 <ul class="dropdown-menu">

plugins/box/dashboard/dashboard.admin.php

@@ -1,8 +1,5 @@
 <?php
 
-// Admin Navigation: add new item
-Navigation::add(__('Dashbord', 'dashboard'), 'content', 'dashboard', 10);
-
 /**
  * Dashboard admin class
  */
@@ -15,7 +12,7 @@ class DashboardAdmin extends Backend
     {
             
         // Display view
-        View::factory('dashboard/views/backend/index')->display();
+        View::factory('box/dashboard/views/backend/index')->display();
     
     }
 

plugins/box/dashboard/dashboard.plugin.php

@@ -17,11 +17,14 @@ Plugin::register( __FILE__,
                 __('Dashboard plugin for Monstra', 'dashboard'),
                 '1.0.0',
                 'Awilum',
-                'http://monstra.org/');
+                'http://monstra.org/',
+                null,
+                'box');
+
 
 // Load Sandbox Admin for Editor and Admin
 if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin', 'editor'))) {
 
-    Plugin::admin('dashboard');
+    Plugin::admin('dashboard', 'box');
 
 }

plugins/box/dashboard/views/backend/index.view.php

@@ -1 +1,54 @@
-Dashboard backend view
+<div class="well dashboard-well">
+	<div class="row">
+		<div class="col-md-6">
+			<a class="btn btn-link welcome-back">Welcome back, <strong>Monstra</strong></a>			
+		</div>
+		<div class="col-md-6">
+			<div class="pull-right">
+				<div class="btn-group">
+				  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+				    Create New <span class="caret"></span>
+				  </button>
+				  <ul class="dropdown-menu" role="menu">
+				    <li><a href="#">Page</a></li>
+				    <li><a href="#">Block</a></li>
+				    <li><a href="#">Snippet</a></li>
+				  </ul>
+				</div>
+
+				<?php //echo ( Html::anchor(__('Create New Page', 'pages'), 'index.php?id=pages&action=add_page', array('title' => __('Create New Page', 'pages'), 'class' => 'btn btn-primary'))); ?>
+				<?php echo ( Html::anchor(__('Upload File', 'pages'), 'index.php?id=pages&action=add_page', array('title' => __('Upload File', 'pages'), 'class' => 'btn btn-primary'))); ?>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="well dashboard-well">
+	<div class="row">
+		<div class="col-md-3">
+			<h3>Content</h3>
+			<ul class="list-unstyled">
+				<?php Navigation::draw('content'); ?>
+			</ul>
+		</div>
+		<div class="col-md-3">			
+			<h3>Extends</h3>
+			<ul class="list-unstyled">
+				<?php Navigation::draw('extends'); ?>
+			</ul>
+		</div>			
+		<div class="col-md-3">			
+			<h3>System</h3>
+			<ul class="list-unstyled">
+				<?php Navigation::draw('system'); ?>
+			</ul>
+		</div>
+		<div class="col-md-3">			
+			<h3>Help</h3>
+			<ul class="list-unstyled">
+                <li><a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a></li>              
+                <li><a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a></li>
+			</ul>
+		</div>
+	</div>
+</div>