Merge branch 'New-form-template'

sdebacker · May 17, 2014 · adcdc9a · adcdc9a
2 parents dd6ff71 + 5033e9d
commit adcdc9a
Show file tree

Hide file tree

Showing 33 changed files with 612 additions and 601 deletions.
diff --git a/app/TypiCMS/Macros.php b/app/TypiCMS/Macros.php
@@ -39,7 +39,7 @@
 /**
  * Back end buttons in view list 
  */
-HTML::macro('langButton', function ($locale = null) {
+HTML::macro('langButton', function ($locale = null, $attributes = []) {
 
     $inputs = Input::except('locale');
     $inputs['locale'] = $locale;

diff --git a/app/TypiCMS/Modules/Categories/Views/categories/admin/_form.blade.php b/app/TypiCMS/Modules/Categories/Views/categories/admin/_form.blade.php
@@ -2,43 +2,40 @@
     {{ HTML::script(asset('js/form.js')) }}
 @stop
 
-<div class="row">
+@include('admin._buttons-form')
 
-    @include('admin._buttons-form')
+{{ Form::hidden('id'); }}
 
-    {{ Form::hidden('id'); }}
+@include('admin._tabs-lang')
 
-    <div class="col-sm-6">
+<div class="tab-content">
 
-        @include('admin._tabs-lang')
+    @foreach ($locales as $lang)
 
-        <div class="tab-content">
-
-            @foreach ($locales as $lang)
-
-            <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
-                <div class="form-group">
-                    {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
-                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'input-lg form-control')) }}
-                </div>
-                <div class="form-group @if($errors->has($lang.'.slug'))has-error@endif">
-                    {{ Form::label($lang.'[slug]', trans('validation.attributes.slug')) }}
-                    {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
-                    @if($errors->has($lang.'.slug'))
-                    <span class="help-block">{{ $errors->first($lang.'.slug') }}</span>
-                    @endif
-                </div>
-                <div class="form-group">
-                    <label class="checkbox">
-                        {{ Form::checkbox($lang.'[status]', 1, $model->$lang->status) }} @lang('validation.attributes.online')
-                    </label>
-                </div>
+    <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
+        <div class="form-group">
+            {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
+            {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'form-control')) }}
+        </div>
+        <div class="form-group @if($errors->has($lang.'.slug'))has-error@endif">
+            {{ Form::label($lang.'[slug]', trans('validation.attributes.slug')) }}
+            <div class="input-group">
+                {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
+                <span class="input-group-btn">
+                    <button class="btn btn-default btn-slug @if($errors->has($lang.'.slug'))btn-danger@endif" type="button">@lang('validation.attributes.generate')</button>
+                </span>
             </div>
-
-            @endforeach
-
+            @if($errors->has($lang.'.slug'))
+            <span class="help-block">{{ $errors->first($lang.'.slug') }}</span>
+            @endif
+        </div>
+        <div class="form-group">
+            <label class="checkbox">
+                {{ Form::checkbox($lang.'[status]', 1, $model->$lang->status) }} @lang('validation.attributes.online')
+            </label>
         </div>
-
     </div>
 
+    @endforeach
+
 </div>
diff --git a/app/TypiCMS/Modules/Contacts/Views/contacts/admin/_form.blade.php b/app/TypiCMS/Modules/Contacts/Views/contacts/admin/_form.blade.php
@@ -1,6 +1,6 @@
-<div class="row">
+@include('admin._buttons-form')
 
-    @include('admin._buttons-form')
+<div class="row">
 
     {{ Form::hidden('id'); }}
     {{ Form::hidden('locale', App::getLocale()); }}

diff --git a/app/TypiCMS/Modules/Contacts/Views/contacts/public/form.blade.php b/app/TypiCMS/Modules/Contacts/Views/contacts/public/form.blade.php
@@ -4,7 +4,7 @@
 
     @if ($formIsSent)
         <div class="jubotron alert alert-success text-center">
-            <h1>Merci !</h1>
+            <h1>@lang('db.message when contact form is sent')</h1>
         </div>
     @else
 

diff --git a/app/TypiCMS/Modules/Events/Views/events/admin/_form.blade.php b/app/TypiCMS/Modules/Events/Views/events/admin/_form.blade.php
@@ -3,110 +3,104 @@
     {{ HTML::script(asset('js/form.js')) }}
 @stop
 
-<div class="row">
-
-    @include('admin._buttons-form')
+@include('admin._buttons-form')
 
-    {{ Form::hidden('id'); }}
+{{ Form::hidden('id'); }}
 
-    <div class="col-sm-6">
-
-        <div class="row">
-            <div class="col-xs-8 form-group @if($errors->has('start_date'))has-error@endif">
-                {{ Form::label('start_date', trans('validation.attributes.start_date'), array('class' => 'control-label')) }}
-                <div class="input-group picker-date picker-date-start">
-                    {{ Form::text('start_date', $model->present()->dateOrNow('start_date', 'd.m.Y'), array('class' => 'form-control', 'placeholder' => trans('validation.attributes.DDMMYYYY'))) }}
-                    <span class="input-group-btn">
-                        <button class="btn btn-default" type="button">
-                            <i class="fa fa-calendar"></i>
-                        </button>
-                    </span>
-                </div>
-                @if($errors->has('start_date'))
-                <span class="help-block">{{ $errors->first('start_date') }}</span>
-                @endif
-            </div>
-            <div class="col-xs-4 form-group">
-                {{ Form::label('start_time', trans('validation.attributes.start_time'), array('class' => 'control-label')) }}
-                <div class="input-group picker-time">
-                    {{ Form::text('start_time', null, array('class' => 'form-control', 'placeholder' => trans('validation.attributes.HH:MM'))) }}
-                    <span class="input-group-btn">
-                        <button class="btn btn-default" type="button">
-                            <i class="fa fa-clock-o"></i>
-                        </button>
-                    </span>
-                </div>
-            </div>
+<div class="row">
+    <div class="col-sm-4 form-group @if($errors->has('start_date'))has-error@endif">
+        {{ Form::label('start_date', trans('validation.attributes.start_date'), array('class' => 'control-label')) }}
+        <div class="input-group picker-date picker-date-start">
+            {{ Form::text('start_date', $model->present()->dateOrNow('start_date', 'd.m.Y'), array('class' => 'form-control', 'placeholder' => trans('validation.attributes.DDMMYYYY'))) }}
+            <span class="input-group-btn">
+                <button class="btn btn-default" type="button">
+                    <i class="fa fa-calendar"></i>
+                </button>
+            </span>
         </div>
+        @if($errors->has('start_date'))
+        <span class="help-block">{{ $errors->first('start_date') }}</span>
+        @endif
+    </div>
+    <div class="col-sm-3 form-group">
+        {{ Form::label('start_time', trans('validation.attributes.start_time'), array('class' => 'control-label')) }}
+        <div class="input-group picker-time">
+            {{ Form::text('start_time', null, array('class' => 'form-control', 'placeholder' => trans('validation.attributes.HH:MM'))) }}
+            <span class="input-group-btn">
+                <button class="btn btn-default" type="button">
+                    <i class="fa fa-clock-o"></i>
+                </button>
+            </span>
+        </div>
+    </div>
+</div>
 
-        <div class="row">
-            <div class="col-xs-8 form-group @if($errors->has('end_date'))has-error@endif">
-                {{ Form::label('end_date', trans('validation.attributes.end_date'), array('class' => 'control-label')) }}
-                <div class="input-group picker-date picker-date-end">
-                    {{ Form::text('end_date', $model->present()->dateOrNow('end_date', 'd.m.Y'), array('class' => 'form-control', 'placeholder' => trans('validation.attributes.DDMMYYYY'))) }}
-                    <span class="input-group-btn">
-                        <button class="btn btn-default" type="button">
-                            <i class="fa fa-calendar"></i>
-                        </button>
-                    </span>
-                </div>
-                @if($errors->has('end_date'))
-                <span class="help-block">{{ $errors->first('end_date') }}</span>
-                @endif
-            </div>
-            <div class="col-xs-4 form-group">
-                {{ Form::label('end_time', trans('validation.attributes.end_time'), array('class' => 'control-label')) }}
-                <div class="input-group picker-time">
-                    {{ Form::text('end_time', null, array('class' => 'form-control', 'placeholder' => trans('validation.attributes.HH:MM'))) }}
-                    <span class="input-group-btn">
-                        <button class="btn btn-default" type="button">
-                            <i class="fa fa-clock-o"></i>
-                        </button>
-                    </span>
-                </div>
-            </div>
+<div class="row">
+    <div class="col-sm-4 form-group @if($errors->has('end_date'))has-error@endif">
+        {{ Form::label('end_date', trans('validation.attributes.end_date'), array('class' => 'control-label')) }}
+        <div class="input-group picker-date picker-date-end">
+            {{ Form::text('end_date', $model->present()->dateOrNow('end_date', 'd.m.Y'), array('class' => 'form-control', 'placeholder' => trans('validation.attributes.DDMMYYYY'))) }}
+            <span class="input-group-btn">
+                <button class="btn btn-default" type="button">
+                    <i class="fa fa-calendar"></i>
+                </button>
+            </span>
         </div>
+        @if($errors->has('end_date'))
+        <span class="help-block">{{ $errors->first('end_date') }}</span>
+        @endif
+    </div>
+    <div class="col-sm-3 form-group">
+        {{ Form::label('end_time', trans('validation.attributes.end_time'), array('class' => 'control-label')) }}
+        <div class="input-group picker-time">
+            {{ Form::text('end_time', null, array('class' => 'form-control', 'placeholder' => trans('validation.attributes.HH:MM'))) }}
+            <span class="input-group-btn">
+                <button class="btn btn-default" type="button">
+                    <i class="fa fa-clock-o"></i>
+                </button>
+            </span>
+        </div>
+    </div>
+</div>
 
-        @include('admin._tabs-lang')
+@include('admin._tabs-lang')
 
-        <div class="tab-content">
+<div class="tab-content">
 
-            @foreach ($locales as $lang)
+    @foreach ($locales as $lang)
 
-            <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
-                <div class="form-group">
-                    {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
-                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'input-lg form-control')) }}
-                </div>
-                <div class="form-group @if($errors->has($lang.'.slug'))has-error@endif">
-                    {{ Form::label($lang.'[slug]', trans('validation.attributes.slug'), array('class' => 'control-label')) }}
-                    {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
-                    @if($errors->has($lang.'.slug'))
-                    <span class="help-block">{{ $errors->first($lang.'.slug') }}</span>
-                    @endif
-                </div>
-                <div class="form-group">
-                    <label class="checkbox">
-                        {{ Form::checkbox($lang.'[status]', 1, $model->$lang->status) }} @lang('validation.attributes.online')
-                    </label>
-                </div>
-                <div class="form-group">
-                    {{ Form::label($lang.'[summary]', trans('validation.attributes.summary')) }}
-                    {{ Form::textarea($lang.'[summary]', $model->$lang->summary, array('class' => 'form-control', 'rows' => 4)) }}
-                </div>
-                <div class="form-group">
-                    {{ Form::label($lang.'[body]', trans('validation.attributes.body')) }}
-                    {{ Form::textarea($lang.'[body]', $model->$lang->body, array('class' => 'editor form-control')) }}
-                </div>
+    <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
+        <div class="form-group">
+            {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
+            {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'form-control')) }}
+        </div>
+        <div class="form-group @if($errors->has($lang.'.slug'))has-error@endif">
+            {{ Form::label($lang.'[slug]', trans('validation.attributes.slug'), array('class' => 'control-label')) }}
+            <div class="input-group">
+                {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
+                <span class="input-group-btn">
+                    <button class="btn btn-default btn-slug @if($errors->has($lang.'.slug'))btn-danger@endif" type="button">@lang('validation.attributes.generate')</button>
+                </span>
             </div>
-
-            @endforeach
-
+            @if($errors->has($lang.'.slug'))
+            <span class="help-block">{{ $errors->first($lang.'.slug') }}</span>
+            @endif
+        </div>
+        <div class="form-group">
+            <label class="checkbox">
+                {{ Form::checkbox($lang.'[status]', 1, $model->$lang->status) }} @lang('validation.attributes.online')
+            </label>
+        </div>
+        <div class="form-group">
+            {{ Form::label($lang.'[summary]', trans('validation.attributes.summary')) }}
+            {{ Form::textarea($lang.'[summary]', $model->$lang->summary, array('class' => 'form-control', 'rows' => 4)) }}
+        </div>
+        <div class="form-group">
+            {{ Form::label($lang.'[body]', trans('validation.attributes.body')) }}
+            {{ Form::textarea($lang.'[body]', $model->$lang->body, array('class' => 'editor form-control')) }}
         </div>
-
     </div>
 
-    <div class="col-sm-6">
-    </div>
+    @endforeach
 
 </div>
diff --git a/app/TypiCMS/Modules/Files/Views/files/admin/_form.blade.php b/app/TypiCMS/Modules/Files/Views/files/admin/_form.blade.php
@@ -3,13 +3,9 @@
     {{ HTML::script(asset('js/form.js')) }}
 @stop
 
-<div class="row">
+@include('admin._buttons-form')
 
-    <div class="form-group col-sm-12">
-        <button class="btn-primary btn" type="submit">@lang('validation.attributes.save')</button>
-        <button class="btn-primary btn" value="true" id="exit" name="exit" type="submit">@lang('validation.attributes.save and exit')</button>
-        <a href="{{ route('admin.files.index') }}" class="btn btn-default">@lang('validation.attributes.exit')</a>
-    </div>
+<div class="row">
 
     {{ Form::hidden('id'); }}
 

diff --git a/app/TypiCMS/Modules/Galleries/Views/galleries/admin/_form.blade.php b/app/TypiCMS/Modules/Galleries/Views/galleries/admin/_form.blade.php
@@ -3,11 +3,11 @@
     {{ HTML::script(asset('js/form.js')) }}
 @stop
 
-<div class="row">
+@include('admin._buttons-form')
 
-    @include('admin._buttons-form')
+{{ Form::hidden('id'); }}
 
-    {{ Form::hidden('id'); }}
+<div class="row">
 
     <div class="col-sm-6">
 
@@ -20,11 +20,16 @@
             <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
                 <div class="form-group">
                     {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
-                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'input-lg form-control')) }}
+                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'form-control')) }}
                 </div>
                 <div class="form-group @if($errors->has($lang.'.slug'))has-error@endif">
                     {{ Form::label($lang.'[slug]', trans('validation.attributes.slug'), array('class' => 'control-label')) }}
-                    {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
+                    <div class="input-group">
+                        {{ Form::text($lang.'[slug]', $model->$lang->slug, array('class' => 'form-control')) }}
+                        <span class="input-group-btn">
+                            <button class="btn btn-default btn-slug @if($errors->has($lang.'.slug'))btn-danger@endif" type="button">@lang('validation.attributes.generate')</button>
+                        </span>
+                    </div>
                     @if($errors->has($lang.'.slug'))
                     <span class="help-block">{{ $errors->first($lang.'.slug') }}</span>
                     @endif

diff --git a/app/TypiCMS/Modules/Groups/Views/admin/groups/_form.blade.php b/app/TypiCMS/Modules/Groups/Views/admin/groups/_form.blade.php
@@ -4,13 +4,9 @@
 
 {{ Form::hidden('id') }}
 
-<div class="row">
-
-    <div class="form-group col-sm-12">
-        <button class="btn-primary btn" value="true" id="exit" name="exit" type="submit">@lang('validation.attributes.save and exit')</button>
-        <a href="{{ route('admin.groups.index') }}" class="btn btn-default">@lang('validation.attributes.exit')</a>
-    </div>
-
+<div class="form-group">
+    <button class="btn-primary btn" value="true" id="exit" name="exit" type="submit">@lang('validation.attributes.save and exit')</button>
+    <a href="{{ route('admin.groups.index') }}" class="btn btn-default">@lang('validation.attributes.exit')</a>
 </div>
 
 <div class="row">

diff --git a/app/TypiCMS/Modules/Menulinks/Views/menulinks/admin/_form.blade.php b/app/TypiCMS/Modules/Menulinks/Views/menulinks/admin/_form.blade.php
@@ -3,13 +3,13 @@
     {{ HTML::script(asset('js/form.js')) }}
 @stop
 
-<div class="row">
+<div class="form-group">
+    <button class="btn btn-primary" type="submit">@lang('validation.attributes.save')</button>
+    <button class="btn btn-default" value="true" id="exit" name="exit" type="submit">@lang('validation.attributes.save and exit')</button>
+    <a href="{{ route('admin.menus.menulinks.index', $menu->id) }}" class="btn btn-default">@lang('validation.attributes.exit')</a>
+</div>
 
-    <div class="form-group col-sm-12">
-        <button class="btn-primary btn" type="submit">@lang('validation.attributes.save')</button>
-        <button class="btn-primary btn" value="true" id="exit" name="exit" type="submit">@lang('validation.attributes.save and exit')</button>
-        <a href="{{ route('admin.menus.menulinks.index', $menu->id) }}" class="btn btn-default">@lang('validation.attributes.exit')</a>
-    </div>
+<div class="row">
 
     {{ Form::hidden('id'); }}
 
@@ -24,7 +24,7 @@
             <div class="tab-pane fade @if ($locale == $lang)in active@endif" id="{{ $lang }}">
                 <div class="form-group">
                     {{ Form::label($lang.'[title]', trans('validation.attributes.title')) }}
-                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'input-lg form-control')) }}
+                    {{ Form::text($lang.'[title]', $model->$lang->title, array('autofocus' => 'autofocus', 'class' => 'form-control')) }}
                 </div>
                 <div class="form-group">
                     {{ Form::label($lang.'[uri]', trans('validation.attributes.uri')) }}