resolved conflicts

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

@@ -0,0 +1,47 @@
+@extends('layouts.main')
+
+@section('title', '| Edit Drug Unit')
+
+@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">{{ __('drug_units.edit_drug_unit') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('drug_units.dashboard') }}</a></li>
+            <li><a href="{{ route('clinical_data.index') }}">{{ __('drug_units.clinical_data') }}</a></li>
+            <li><a href="/drug_units/">{{ __('drug_units.drug_units') }}</a></li>
+            <li class="active">{{ __('drug_units.edit_drug_unit') }}</li>
+        </ol>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::drug_units.menu')
+    </div>
+</div>
+
+
+@include('flash::message')
+
+<div class="panel panel-default" style="border-radius: 5px;">
+
+    <div class="panel-body">
+        {{ Form::model($drug_unit, ['method' => 'PUT', 'route' => ['drug_units.update',$drug_unit]]) }}
+
+        <div class="form-group">
+            {{ Form::label('name', __('drug_units.drug_unit_name')) }}
+            {{ Form::text('name', $drug_unit->name, ['class' => 'form-control compulsory']) }}
+        </div>
+
+        {{ Form::button( __('drug_units.save'),['type'=>'submit','class'=>'btn btn-success btn-rounded waves-effect waves-light m-r-10']) }}
+        {{ Form::button( __('drug_units.cancel'),['type'=>'reset','class'=>'btn btn-default btn-rounded waves-effect waves-light']) }}
+
+        {{ Form::close() }}
+    </div>
+</div>
+@endsection