Merge pull request #13 from dappur/dev

Merge v2.0.3 into master

Author: edwardteach42

app/views/dashboard/inc/sidebar.twig

@@ -54,7 +54,7 @@
         <a href="javascript:;" data-toggle="collapse" data-target="#developer-tools-menu"><i class="fa fa-fw fa-wrench"></i> Developer Tools <i class="fa fa-fw fa-caret-down"></i></a>
         <ul id="developer-tools-menu" class="collapse {% if currentRoute starts with '/dashboard/developer/settings' %}in{% endif %} nav">
             {% if auth.hasAccess('settings.developer.view') %}
-                <li class="active">
+                <li class="{% if currentRoute starts with '/dashboard/developer/settings' %}active{% endif %}">
                     <a href="{{ path_for('settings-developer')}}"><i class="fa fa-life-ring fa-fw"></i> Edit settings.json</a>
                 </li>
             {% endif %}

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "dappur/framework",
-    "description": "PHP App Framework built on the Slim PHP Micro Framework, Twig templating engine, Eloquent ORM database interactions, Phinx database migrations, Sentinel user management, Monolog w/ Logentries Support, form validation with CSRF protection, cookie management, database controlled config and Cloudinary CMS integration.",
-    "keywords": ["slim", "eloquent", "twig", "sentinel", "monolog", "logentries", "validation", "config", "framework", "phinx", "cloudinary"],
-    "version": "2.0.2",
+    "description": "PHP App Framework built on the Slim PHP Micro Framework, Twig templating engine, Eloquent ORM database interactions, Phinx database migrations, Sentinel user management, Monolog w/ Logentries Support, form validation with CSRF protection, PSR7 cookie management, dashboard controlled site configm, custom email templating systemm, Cloudinary CMS integration and GitHub auto deployment",
+    "keywords": ["slim", "eloquent", "twig", "sentinel", "monolog", "logentries", "validation", "config", "framework", "phinx", "cloudinary", "phpmailer", "email", "deployment", "github"],
+    "version": "2.0.3",
     "homepage": "https://github.com/dappur/framework",
     "license": "MIT",
     "authors": [

database/migrations/20170118012924_init_database.php

@@ -243,7 +243,7 @@ public function up()
             array(1, 'logo', 'Site Logo', 5, 'https://res.cloudinary.com/dappur/image/upload/c_scale,w_600/v1479072913/site-images/logo-horizontal.png'),
             array(1, 'header-logo', 'Header Logo', 5, 'https://res.cloudinary.com/dappur/image/upload/c_scale,h_75/v1479072913/site-images/logo-horizontal.png'),
             array(2, 'dashboard-theme', 'Dashboard Theme', 3, 'dashboard'),
-            array(2, 'dashboard-bootswatch', 'Dashboard Bootswatch', 4, 'yeti'),
+            array(2, 'dashboard-bootswatch', 'Dashboard Bootswatch', 4, 'slate'),
             array(2, 'dashboard-logo', 'Dashboard Logo', 5, 'https://res.cloudinary.com/dappur/image/upload/c_scale,h_75/v1479072913/site-images/logo-horizontal.png'),
             array(1, 'ga', 'Google Analytics UA', 2, ''),
             array(1, 'activation', 'Activation Required', 6, 1),

database/sql/init-database-20170914.sql

@@ -432,7 +432,7 @@ INSERT INTO config VALUES
 (8, 1, 5, 'logo', 'Site Logo', 'https://res.cloudinary.com/dappur/image/upload/c_scale,w_600/v1479072913/site-images/logo-horizontal.png', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
 (9, 1, 5, 'header-logo', 'Header Logo', 'https://res.cloudinary.com/dappur/image/upload/c_scale,h_75/v1479072913/site-images/logo-horizontal.png', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
 (10, 2, 3, 'dashboard-theme', 'Dashboard Theme', 'dashboard', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
-(11, 2, 4, 'dashboard-bootswatch', 'Dashboard Bootswatch', 'yeti', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
+(11, 2, 4, 'dashboard-bootswatch', 'Dashboard Bootswatch', 'slate', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
 (12, 2, 5, 'dashboard-logo', 'Dashboard Logo', 'https://res.cloudinary.com/dappur/image/upload/c_scale,h_75/v1479072913/site-images/logo-horizontal.png', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
 (13, 1, 2, 'ga', 'Google Analytics UA', '', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),
 (14, 1, 6, 'activation', 'Activation Required', '1', '2017-09-15 00:57:56', '2017-09-15 00:57:56'),

public/assets/dashboard/css/custom.css

@@ -72,7 +72,7 @@
 #page-content-wrapper {
     width: 100%;
     position: relative;
-    padding: 15px;
+    padding: 0px;
 }
 
 #wrapper.toggled #page-content-wrapper {
@@ -142,7 +142,7 @@
     }
 
     #page-content-wrapper {
-        padding: 10px;
+        padding: 0px;
         position: relative;
     }
 
@@ -161,7 +161,7 @@
   background-color: #777;
 }
 
-.nav>li {
+.nav>li>.nav>li {
     padding-left: 20px;
 }