resolved conflicts

docker/statistics/Modules/ClinicalData/Resources/views/occupations/edit.blade.php

@@ -0,0 +1,43 @@
+@extends('layouts.main')
+
+@section('content')
+<div class="row bg-title">
+    <div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
+        <h4 class="page-title">{{ __('occupations.edit_occupation') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('occupations.dashboard') }}</a></li>
+            <li><a href="/occupations/index">{{ __('occupations.occupations') }}</a></li>
+            <li class="active">{{ __('occupations.edit') }}</li>
+        </ol>
+    </div>
+</div>
+
+@include('clinical_data::occupations.menu')
+
+<div class="row">
+    <div class="col-sm-12">
+        <!--Flash messages at the top -->
+        @include('flash::message')
+        <div class="white-box">
+            {{ Form::model($occupation, ['method' => 'PUT', 'route' => ['occupations.update',$occupation], 'data-toggle' => 'validator']) }}
+
+            <div class="form-group">
+                {{ Form::label('name', __('occupations.occupation_name')) }}
+                {{ Form::text('name', $occupation->name, ['class' => 'form-control compulsory', 'required', 'placeholder'=>'e.g. Peasant']) }}
+                <div class="help-block with-errors"></div>
+            </div>
+
+            {{ Form::button(__('occupations.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
+            {{ Form::button(__('occupations.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
+
+            {{ Form::close() }}
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+<script src="{{ asset('elite/js/validator.js') }}"></script>
+@endpush