From e98d556022c9aeb3b496015e51201ec4fc567955 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 20 Jun 2015 22:18:54 +0200
Subject: [PATCH] Some new templates and a bug fix [skip ci]

---
 app/Models/Tag.php                      |  5 +++++
 resources/twig/tags/create.twig         | 23 +++++++++--------------
 resources/twig/tags/delete.twig         | 12 +++++-------
 resources/twig/tags/edit.twig           | 20 ++++++++------------
 resources/twig/transactions/delete.twig |  3 +--
 5 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 27c7703ed7..637f93b2c4 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -110,6 +110,7 @@ class Tag extends Model
             $journal->tag_count = $count;
             $journal->save();
         }
+
         return parent::save($options);
     }
 
@@ -131,6 +132,10 @@ class Tag extends Model
      */
     public function getDescriptionAttribute($value)
     {
+        if (is_null($value)) {
+            return $value;
+        }
+
         return Crypt::decrypt($value);
     }
 
diff --git a/resources/twig/tags/create.twig b/resources/twig/tags/create.twig
index 0740d02a39..79ed8a1f0d 100644
--- a/resources/twig/tags/create.twig
+++ b/resources/twig/tags/create.twig
@@ -11,7 +11,7 @@
     <div class="col-lg-5 col-md-5 col-sm-12">
         <div class="box box-primary">
             <div class="box-header with-border">
-                <i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
+                <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
             </div>
             <div class="box-body">
                 {{ ExpandedForm.text('tag') }}
@@ -24,7 +24,7 @@
 
         <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">
                     {{ ExpandedForm.date('date') }}
@@ -36,26 +36,21 @@
         <!-- 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','tag') }}
             </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-success pull-right">
+                    Store new tag
+                </button>
+            </div>
         </div>
 
     </div>
 </div>
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-        <p>
-            <button type="submit" class="btn btn-lg btn-success">
-                <i class="fa fa-plus-circle"></i> Store new tag
-            </button>
-        </p>
-    </div>
-</div>
-
-</form>
+{{ Form.close|raw }}
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
diff --git a/resources/twig/tags/delete.twig b/resources/twig/tags/delete.twig
index fd1da3d214..60a29469ef 100644
--- a/resources/twig/tags/delete.twig
+++ b/resources/twig/tags/delete.twig
@@ -7,27 +7,25 @@
 {% block content %}
     {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('tags.destroy',tag.id)}) }}
 <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
         <div class="box box-danger">
             <div class="box-header with-border">
-                Delete tag "{{ tag.tag }}"
+                <h3 class="box-title">Delete tag "{{ tag.tag }}"</h3>
             </div>
             <div class="box-body">
                 <p>
                 Are you sure that you want to delete tag "{{ tag.tag }}"?
                 </p>
-
                 {% if tag.transactionjournals|length > 0 %}
                     <p class="text-info">
                         Tag "{{ tag.tag }}" still has {{ tag.transactionjournals|length }} transaction(s) connected
                         to it. These will <strong>not</strong> be removed but will lose their connection to this tag.
                     </p>
                 {% endif %}
-
-                <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
+            </div>
+            <div class="box-footer">
+                    <button type="submit" class="btn btn-danger pull-right">Delete permanently</button>
                     <a href="{{ URL.previous() }}" class="btn-default btn">Cancel</a >
-                </p>
             </div>
         </div>
     </div>
diff --git a/resources/twig/tags/edit.twig b/resources/twig/tags/edit.twig
index f683c88a71..1743aeed72 100644
--- a/resources/twig/tags/edit.twig
+++ b/resources/twig/tags/edit.twig
@@ -13,7 +13,7 @@
     <div class="col-lg-5 col-md-5 col-sm-12">
         <div class="box box-primary">
             <div class="box-header with-border">
-                <i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
+                <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
             </div>
             <div class="box-body">
                 {{ ExpandedForm.text('tag') }}
@@ -26,7 +26,7 @@
 
         <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">
                     {{ ExpandedForm.date('date', tag.date.format('Y-m-d')) }}
@@ -38,24 +38,20 @@
         <!-- 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('update','tag') }}
             </div>
+            <div class="box-footer">
+                <button type="submit" class="btn pull-right btn-success">
+                    <i class="fa fa-plus-circle"></i> Update tag
+                </button>
+            </div>
         </div>
 
     </div>
 </div>
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-        <p>
-            <button type="submit" class="btn btn-lg btn-success">
-                <i class="fa fa-plus-circle"></i> Update tag
-            </button>
-        </p>
-    </div>
-</div>
 
 </form>
 {% endblock %}
diff --git a/resources/twig/transactions/delete.twig b/resources/twig/transactions/delete.twig
index b1c2f387ae..ee4233b8dd 100644
--- a/resources/twig/transactions/delete.twig
+++ b/resources/twig/transactions/delete.twig
@@ -11,8 +11,7 @@
     <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
         <div class="box box-danger">
             <div class="box-header with-border">
-                <i class="fa fa-exclamation-circle"></i>
-                {{ trans('form.delete_journal', {'description': journal.description}) }}
+                <h3 class="box-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>
             </div>
             <div class="box-body">
                 <p class="text-danger">