From 4a4fc38c43c87a91879ce6f8b11fdc7a724f091f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 5 Oct 2018 00:57:18 -0700
Subject: [PATCH] Style updates

---
 .../views/partials/forms/edit/model-select.blade.php |  2 +-
 resources/views/partials/forms/edit/status.blade.php |  2 +-
 resources/views/settings/branding.blade.php          |  6 +++---
 resources/views/settings/general.blade.php           |  2 +-
 resources/views/settings/slack.blade.php             | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index 48385b6a7..ababc68da 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -4,7 +4,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id">
+        <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id" {!!  ((isset($required) && ($required =='true'))) ?  ' data-validation="required"' : '' !!}>
             @if ($model_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $model_id }}" selected="selected">
                     {{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index d3457a98b..74e239c88 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -2,7 +2,7 @@
 <div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
     <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
     <div class="col-md-7 col-sm-11{{  (\App\Helpers\Helper::checkIfRequired($item, 'status_id')) ? ' required' : '' }}">
-        {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id')) }}
+        {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'placeholder' => trans('general.select_statuslabel'))) }}
         {!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
     </div>
     <div class="col-md-2 col-sm-2 text-left">
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 4a7170459..f23a1b146 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -20,7 +20,7 @@
         }
     </style>
 
-    {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'create-form' ]) }}
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -45,12 +45,12 @@
                             <div class="col-md-3">
                                 {{ Form::label('site_name', trans('admin/settings/general.site_name')) }}
                             </div>
-                            <div class="col-md-7">
+                            <div class="col-md-7 required">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Snipe-IT Asset Management')) }}
                                 @else
                                     {{ Form::text('site_name',
-                                        Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
+                                        Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'data-validation' => 'required')) }}
                                 @endif
                                 {!! $errors->first('site_name', '<span class="alert-msg">:message</span>') !!}
                             </div>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index af93a7c8e..db7dc49ec 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -292,7 +292,7 @@
                                     'default' => 'Linear (default)', 
                                     'half_1' => 'Half-year convention, always applied', 
                                     'half_2' => 'Half-year convention, applied with condition', 
-                                ), Input::old('username_format', $setting->depreciation_method)) }}
+                                ), Input::old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
                            </div>
                        </div>
                        <!-- /.form-group -->
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 1fa20def0..a726e71e0 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -38,7 +38,7 @@
                 <div class="box-body">
 
 
-                    <p style="border-bottom: 0px;">
+                    <p style="padding: 20px;">
                         {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
 
                     @if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))
@@ -55,7 +55,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
                                 @else
@@ -70,7 +70,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
                                 @else
@@ -85,7 +85,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
                             </div>
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
                                 @else
@@ -100,10 +100,10 @@
                             <div class="col-md-3">
                                 {{ Form::label('est_slack', 'Test Slack') }}
                             </div>
-                            <div class="col-md-9" id="slacktestrow">
+                            <div class="col-md-8" id="slacktestrow">
                                 <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test <i class="fa fa-slack"></i> Integration</a>
                             </div>
-                            <div class="col-md-9 col-md-offset-3">
+                            <div class="col-md-8 col-md-offset-3">
                                 <span id="slacktesticon"></span>
                                 <span id="slacktestresult"></span>
                                 <span id="slackteststatus"></span>