From 4b5a78b320ca212a1138b0afcebcdf6980969bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 27 Jan 2016 00:23:35 +0100
Subject: [PATCH] FEATURE: move selectbox for type of custom field

---
 .../admin/customFields/newForm.blade.php      | 35 +++++++++----------
 .../admin/customFields/overview.blade.php     |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/resources/views/admin/customFields/newForm.blade.php b/resources/views/admin/customFields/newForm.blade.php
index db5ff09a..9c5898c5 100644
--- a/resources/views/admin/customFields/newForm.blade.php
+++ b/resources/views/admin/customFields/newForm.blade.php
@@ -2,7 +2,7 @@
     {!! csrf_field() !!}
 
     <div class="row">
-        <div class="large-6 columns">
+        <div class="large-12 columns">
             <label>
                 @lang('admin/customFields.name')
                 <input type="text" placeholder="@lang('admin/customFields.name')" value="{{old('name')}}" name="name">
@@ -14,23 +14,6 @@
                 @endif
             </label>
         </div>
-        <div class="large-6 columns">
-            <label>
-                @lang('admin/customFields.type')
-
-                <select name="type">
-                    @foreach($types as $type => $translation)
-                        <option value="{{$type}}"@if(old('type') == $type) selected @endif>@lang($translation)</option>
-                    @endforeach
-                </select>
-
-                @if (isset($errors) && $errors->has('type'))
-                    <div class="callout alert">
-                        {{ $errors->first('type') }}
-                    </div>
-                @endif
-            </label>
-        </div>
     </div>
     <div class="row">
         <div class="large-6 columns">
@@ -43,6 +26,22 @@
 
         <div class="large-6 columns">
 
+            <label>
+                @lang('admin/customFields.type')
+
+                <select name="type">
+                    @foreach($types as $type => $translation)
+                        <option value="{{$type}}"@if(old('type') == $type) selected @endif>@lang($translation)</option>
+                    @endforeach
+                </select>
+
+                @if (isset($errors) && $errors->has('type'))
+                    <div class="callout alert">
+                        {{ $errors->first('type') }}
+                    </div>
+                @endif
+            </label>
+
             <label>
                 @lang('admin/customFields.resource')
 
diff --git a/resources/views/admin/customFields/overview.blade.php b/resources/views/admin/customFields/overview.blade.php
index 8e7dec40..9af246ed 100644
--- a/resources/views/admin/customFields/overview.blade.php
+++ b/resources/views/admin/customFields/overview.blade.php
@@ -16,7 +16,7 @@
             <ul class="tabs" data-tabs id="customFieldsOverview">
                 <?php $isFirst = true?>
                 @foreach($usedResources as $i => $resource)
-                    <li class="tabs-title @if($isFirst)is-active @endif"><a href="#customFieldResource{{$resource}}">@lang($resources[$resource]){{key($usedResources)}}</a></li>
+                    <li class="tabs-title @if($isFirst)is-active @endif"><a href="#customFieldResource{{$resource}}">@lang($resources[$resource])</a></li>
                     <?php $isFirst = false?>
                 @endforeach
             </ul>