From 4aff9d6e7348a60c533b4408205682490d90dabb Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 20 Jun 2015 18:22:33 +0200
Subject: [PATCH] Some more stuff done. Layout mostly.

---
 resources/twig/layout/default.twig        | 13 +----
 resources/twig/partials/control-bar.twig  | 59 +++++++++++++++++++++--
 resources/twig/partials/menu-sidebar.twig | 50 ++++++++++++++-----
 resources/twig/transactions/create.twig   |  6 +--
 4 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index ae5ebe1579..60ea988fe3 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -66,20 +66,9 @@
                     <!-- Notifications: style can be found in dropdown.less -->
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        <a href="#">
                             <span class="hidden-xs">{{ Auth.user.email }}</span>
                         </a>
-                        <ul class="dropdown-menu">
-                            <!-- Menu Footer-->
-                            <li class="user-footer">
-                                <div class="pull-left">
-                                    <a href="#" class="btn btn-default btn-flat">Profile</a>
-                                </div>
-                                <div class="pull-right">
-                                    <a href="#" class="btn btn-default btn-flat">Sign out</a>
-                                </div>
-                            </li>
-                        </ul>
                     </li>
                     <li>
                         <a href="#" data-toggle="control-sidebar"><i class="fa fa-plus-circle"></i></a>
diff --git a/resources/twig/partials/control-bar.twig b/resources/twig/partials/control-bar.twig
index 1da645734d..a0cb6c411d 100644
--- a/resources/twig/partials/control-bar.twig
+++ b/resources/twig/partials/control-bar.twig
@@ -5,7 +5,7 @@
     <div class="tab-content">
         <!-- Home tab content -->
         <div class="tab-panel active" id="control-sidebar-home-tab">
-            <h3 class="control-sidebar-heading">Create new something.</h3>
+            <h3 class="control-sidebar-heading">Create new stuff</h3>
             <ul class='control-sidebar-menu'>
                 <li>
                     <a href="javascript::;">
@@ -15,14 +15,63 @@
                         </div>
                     </a>
                 </li>
-
                 <li>
                     <a href="javascript::;">
-                        <h4 class="control-sidebar-subheading">
-                            Create new something
-                        </h4>
+                        <i class="menu-icon fa fa-long-arrow-right bg-green"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New deposit</h4>
+                        </div>
                     </a>
                 </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-exchange bg-blue"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New transfer</h4>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-money bg-maroon"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New asset account</h4>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-shopping-cart bg-maroon"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New expense account</h4>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-download bg-maroon"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New revenue</h4>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-sort-amount-asc bg-teal"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New piggy bank</h4>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="javascript::;">
+                        <i class="menu-icon fa fa-download bg-purple"></i>
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">New bill</h4>
+                        </div>
+                    </a>
+                </li>
+
             </ul><!-- /.control-sidebar-menu -->
 
         </div><!-- /.tab-pane -->
diff --git a/resources/twig/partials/menu-sidebar.twig b/resources/twig/partials/menu-sidebar.twig
index ef11909dbe..ce0541b58a 100644
--- a/resources/twig/partials/menu-sidebar.twig
+++ b/resources/twig/partials/menu-sidebar.twig
@@ -52,12 +52,15 @@
         </a>
     </li>
 
+    <!-- reports -->
     <li class="{{ activeRoutePartial('reports') }}">
         <a href="{{ route('reports.index') }}">
             <i class="fa fa-line-chart fa-fw"></i>
             <span>{{ 'reports'|_ }}</span>
         </a>
     </li>
+
+    <!-- transactions -->
     <li class="{{ activeRoutePartial('transactions') }} treeview">
         <a href="#">
             <i class="fa fa-repeat fa-fw"></i>
@@ -82,6 +85,7 @@
         </ul>
 
     </li>
+    <!-- money management -->
     <li class="{{ activeRoutePartial('bills') }} {{ activeRoutePartial('piggy-banks') }} treeview">
             <a href="#">
                 <i class="fa fa-euro fa-fw"></i>
@@ -98,22 +102,42 @@
                     <i class="fa fa-calendar-o fa-fw"></i> {{ 'bills'|_ }}</a>
             </li>
         </ul>
-    </li>
-    <li class="hidden-sm hidden-md hidden-lg">
-        <a class="{{ activeRouteStrict('profile') }}" href="{{ route('profile') }}"><i class="fa fa-user fa-fw"></i> {{ Auth.user.email }}</a>
+
     </li>
 
-    <li class="hidden-sm hidden-md hidden-lg">
-        <a class="{{ activeRouteStrict('preferences') }}" href="{{ route('preferences') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
+    <!-- options and preferences -->
+    <li class="{{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
+        <a href="#">
+            <i class="fa fa-gears fa-fw"></i>
+            <span>{{ 'options'|_ }}</span>
+            <i class="fa fa-angle-left pull-right"></i>
+        </a>
+
+        <ul class="treeview-menu">
+            <li class="{{ activeRoutePartial('profile') }}">
+                <a class="{{ activeRouteStrict('profile') }}" href="{{ route('profile') }}"><i class="fa fa-user fa-fw"></i> Profile</a>
+            </li>
+            <li class="{{ activeRoutePartial('preferences') }}">
+                <a class="{{ activeRouteStrict('preferences') }}" href="{{ route('preferences') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
+            </li>
+            <li class="{{ activeRoutePartial('currency') }}">
+                <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currency.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
+            </li>
+        </ul>
+
+
     </li>
-    <li class="hidden-sm hidden-md hidden-lg">
-        <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currency.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currency'|_ }}</a>
-    </li>
-    <li class="hidden-sm hidden-md hidden-lg">
-        <a class="{{ activeRoutePartial('reminders') }}" href="{{ route('reminders.index') }}"><i class="fa fa-clock-o fa-fw"></i> {{ 'reminders'|_ }}</a>
-    </li>
-    <li class="hidden-sm hidden-md hidden-lg">
-        <a href="{{ route('logout') }}"><i class="fa fa-sign-out fa-fw"></i> {{ 'logout'|_ }}</a>
+
+
+    <!-- other options -->
+
+
+
+    <li>
+        <a href="{{ route('logout') }}">
+            <i class="fa fa-sign-out fa-fw"></i>
+            <span>{{ 'logout'|_ }}</span>
+        </a>
     </li>
 
     <!-- reminders, again-->
diff --git a/resources/twig/transactions/create.twig b/resources/twig/transactions/create.twig
index 18fb15c85f..bf535ccc7a 100644
--- a/resources/twig/transactions/create.twig
+++ b/resources/twig/transactions/create.twig
@@ -12,7 +12,7 @@
         <div class="col-lg-6 col-md-12 col-sm-12">
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
+                    <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
                 </div>
                 <div class="box-body">
                     <div class="form-group">
@@ -57,7 +57,7 @@
         <div class="col-lg-6 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
+                    <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
                 </div>
                 <div class="box-body">
                     <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
@@ -77,7 +77,7 @@
             <!-- panel for options -->
             <div class="box">
                 <div class="box-header with-border">
-                    <i class="fa fa-bolt"></i> {{ 'options'|_ }}
+                    <h3 class="box-title">{{ 'options'|_ }}</h3>
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.optionsList('create','transaction') }}