From 5a1dec431ad4dc457ce43f1ca8c5e1e52b4d40cd Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 29 Nov 2017 16:37:04 +0300 Subject: [PATCH] close #101 Fixed: Apps page overlapping content and surprise offline payment overlap issue :) --- .../Resources/views/edit.blade.php | 148 +++++++++--------- resources/views/modules/home/index.blade.php | 48 +++--- 2 files changed, 102 insertions(+), 94 deletions(-) diff --git a/modules/OfflinePayment/Resources/views/edit.blade.php b/modules/OfflinePayment/Resources/views/edit.blade.php index 99305c2f1..97caf406b 100644 --- a/modules/OfflinePayment/Resources/views/edit.blade.php +++ b/modules/OfflinePayment/Resources/views/edit.blade.php @@ -3,82 +3,84 @@ @section('title', trans('offlinepayment::offlinepayment.offlinepayment')) @section('content') -
-
-
-

{{ trans('offlinepayment::offlinepayment.add_new') }}

- -
- - - {!! Form::open(['url' => 'apps/offlinepayment/settings', 'files' => true, 'role' => 'form']) !!} - -
-
- - {{ Form::textGroup('name', trans('general.name'), 'id-card-o', ['required' => 'required'], null, 'col-md-12') }} - - {{ Form::textGroup('code', trans('offlinepayment::offlinepayment.code'), 'key', ['required' => 'required'], null, 'col-md-12') }} - - {{ Form::radioGroup('customer', trans('offlinepayment::offlinepayment.customer'), '', ['required' => 'required'], 0, 'col-md-12') }} - - {{ Form::textGroup('order', trans('offlinepayment::offlinepayment.order'), 'sort', [], null, 'col-md-12') }} - - {{ Form::textareaGroup('description', trans('general.description')) }} -
- - - - - - {!! Form::close() !!} -
- -
-
- -
-
-

{{ trans('offlinepayment::offlinepayment.payment_gateways') }}

- -
- -
-
- - - - - - - - - - - @if($items) - @foreach($items as $item) - - - - - - - @endforeach - @else - - @endif - -
{{ trans('general.name') }}{{ trans('offlinepayment::offlinepayment.code') }}{{ trans('offlinepayment::offlinepayment.order') }}{{ trans('general.actions') }}
{{ $item->name }}{{ $item->code }}{{ $item->order }} - - -
+
+
+
+
+

{{ trans('offlinepayment::offlinepayment.add_new') }}

+
+ + + {!! Form::open(['url' => 'apps/offlinepayment/settings', 'files' => true, 'role' => 'form']) !!} + +
+
+ + {{ Form::textGroup('name', trans('general.name'), 'id-card-o', ['required' => 'required'], null, 'col-md-12') }} + + {{ Form::textGroup('code', trans('offlinepayment::offlinepayment.code'), 'key', ['required' => 'required'], null, 'col-md-12') }} + + {{ Form::radioGroup('customer', trans('offlinepayment::offlinepayment.customer'), '', ['required' => 'required'], 0, 'col-md-12') }} + + {{ Form::textGroup('order', trans('offlinepayment::offlinepayment.order'), 'sort', [], null, 'col-md-12') }} + + {{ Form::textareaGroup('description', trans('general.description')) }} +
+ + + + + + {!! Form::close() !!}
- + +
+
+ +
+
+

{{ trans('offlinepayment::offlinepayment.payment_gateways') }}

+ +
+ +
+
+ + + + + + + + + + + @if($items) + @foreach($items as $item) + + + + + + + @endforeach + @else + + @endif + +
{{ trans('general.name') }}{{ trans('offlinepayment::offlinepayment.code') }}{{ trans('offlinepayment::offlinepayment.order') }}{{ trans('general.actions') }}
{{ $item->name }}{{ $item->code }}{{ $item->order }} + + +
+
+
+ +
+
-
@endsection diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php index 10187c24d..2d481360a 100644 --- a/resources/views/modules/home/index.blade.php +++ b/resources/views/modules/home/index.blade.php @@ -5,33 +5,39 @@ @section('content') @include('partials.modules.bar') -
-
-

{{ trans('modules.top_paid') }}

-
+
+
+
+

{{ trans('modules.top_paid') }}

+
- @foreach ($paid as $module) - @include('partials.modules.item') - @endforeach + @foreach ($paid as $module) + @include('partials.modules.item') + @endforeach +
-
-
-

{{ trans('modules.new') }}

-
+
+
+
+

{{ trans('modules.new') }}

+
- @foreach ($new as $module) - @include('partials.modules.item') - @endforeach + @foreach ($new as $module) + @include('partials.modules.item') + @endforeach +
-
-
-

{{ trans('modules.top_free') }}

-
+
+
+
+

{{ trans('modules.top_free') }}

+
- @foreach ($free as $module) - @include('partials.modules.item') - @endforeach + @foreach ($free as $module) + @include('partials.modules.item') + @endforeach +
@endsection \ No newline at end of file