From 4fa56dcb34f4c4812feeab24113ea946297c5f9f Mon Sep 17 00:00:00 2001 From: stojankukrika Date: Thu, 16 Jul 2015 10:54:20 +0200 Subject: [PATCH] fixed issue #133 --- .../Controllers/Admin/LanguageController.php | 4 ++-- .../admin/language/create_edit.blade.php | 6 ++--- .../views/admin/layouts/default.blade.php | 4 ++-- .../views/admin/news/create_edit.blade.php | 14 ++++++------ .../admin/newscategory/create_edit.blade.php | 2 +- .../views/admin/photo/create_edit.blade.php | 22 +++++++++---------- .../admin/photoalbum/create_edit.blade.php | 2 +- .../views/admin/users/create_edit.blade.php | 16 +++++++------- .../views/admin/video/create_edit.blade.php | 12 +++++----- .../admin/videoalbum/create_edit.blade.php | 2 +- resources/views/articles/_form.blade.php | 22 +++++++++---------- resources/views/articles/create.blade.php | 4 ++-- resources/views/articles/edit.blade.php | 4 ++-- resources/views/auth/login.blade.php | 4 ++-- resources/views/auth/password.blade.php | 2 +- resources/views/auth/register.blade.php | 2 +- resources/views/auth/reset.blade.php | 2 +- resources/views/news/view_news.blade.php | 4 ++-- resources/views/pages/home.blade.php | 20 ++++++++--------- resources/views/partials/nav.blade.php | 14 ++++++------ resources/views/site/auth/login.blade.php | 8 +++---- resources/views/site/auth/register.blade.php | 16 +++++++------- 22 files changed, 93 insertions(+), 93 deletions(-) diff --git a/app/Http/Controllers/Admin/LanguageController.php b/app/Http/Controllers/Admin/LanguageController.php index bbc05e78..41014478 100644 --- a/app/Http/Controllers/Admin/LanguageController.php +++ b/app/Http/Controllers/Admin/LanguageController.php @@ -144,8 +144,8 @@ public function data() 'languages.icon as icon')); // "" return Datatables::of($language) -// ->edit_column('icon', '{!! ($icon!="")? "":""; !!}') - ->edit_column('icon', '{!! ($icon!="")? " ":""; !!}') +// ->edit_column('icon', '{{ ($icon!="")? "":""; }}') + ->edit_column('icon', '{{ ($icon!="")? " ":""; }}') ->add_column('actions', ' {{ trans("admin/modal.edit") }} {{ trans("admin/modal.delete") }} diff --git a/resources/views/admin/language/create_edit.blade.php b/resources/views/admin/language/create_edit.blade.php index 1847c107..459d6141 100644 --- a/resources/views/admin/language/create_edit.blade.php +++ b/resources/views/admin/language/create_edit.blade.php @@ -20,7 +20,7 @@ class="form-group {{{ $errors->has('name') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('name', '')!!} + {{$errors->first('name', '')}}
trans("admin/language.code") }} - {!!$errors->first('lang_code', '')!!} + {{$errors->first('lang_code', '')}}
diff --git a/resources/views/admin/layouts/default.blade.php b/resources/views/admin/layouts/default.blade.php index d8852eca..2e2b55b4 100644 --- a/resources/views/admin/layouts/default.blade.php +++ b/resources/views/admin/layouts/default.blade.php @@ -9,7 +9,7 @@ @section('styles') @parent - + @endsection @@ -22,7 +22,7 @@ @section('scripts') @parent - + {{-- Not yet a part of Elixir workflow --}} diff --git a/resources/views/admin/news/create_edit.blade.php b/resources/views/admin/news/create_edit.blade.php index c8b4a03b..de46a482 100644 --- a/resources/views/admin/news/create_edit.blade.php +++ b/resources/views/admin/news/create_edit.blade.php @@ -41,7 +41,7 @@ class="form-group {{{ $errors->has('title') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('title', '')!!} + {{$errors->first('title', '')}}
trans("admin/news.introduction") }} - {!! $errors->first('introduction', '') - !!} + {{ $errors->first('introduction', '') + }}
trans("admin/news.content") }} - {!! $errors->first('content', '') - !!} + {{ $errors->first('content', '') + }}
trans("admin/news.source") }} - {!! $errors->first('source', '') - !!} + {{ $errors->first('source', '') + }}
@foreach($languages as $item) trans("admin/modal.title") }} - {!!$errors->first('title', ':message ')!!} + {{$errors->first('title', ':message ')}}
diff --git a/resources/views/admin/photo/create_edit.blade.php b/resources/views/admin/photo/create_edit.blade.php index 67defc1a..db245cc5 100644 --- a/resources/views/admin/photo/create_edit.blade.php +++ b/resources/views/admin/photo/create_edit.blade.php @@ -41,7 +41,7 @@ class="form-group {{{ $errors->has('name') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('name', ':message ')!!} + {{$errors->first('name', ':message ')}}
@@ -80,15 +80,15 @@ class="form-group {{{ $errors->has('album_cover') ? 'has-error' : '' }}}">
+ 'class'=>'radio')) }} {{ trans('admin/admin.no') }}
@@ -99,8 +99,8 @@ class="form-group {{{ $errors->has('content') ? 'has-error' : '' }}}"> trans("admin/photo.description") }} - {!! $errors->first('description', '') - !!} + {{ $errors->first('description', '') + }} diff --git a/resources/views/admin/photoalbum/create_edit.blade.php b/resources/views/admin/photoalbum/create_edit.blade.php index b34fed9b..9bfb00f1 100644 --- a/resources/views/admin/photoalbum/create_edit.blade.php +++ b/resources/views/admin/photoalbum/create_edit.blade.php @@ -34,7 +34,7 @@ class="form-group {{{ $errors->has('title') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('title', '')!!} + {{$errors->first('title', '')}}
diff --git a/resources/views/admin/users/create_edit.blade.php b/resources/views/admin/users/create_edit.blade.php index 6f13e985..ebb89f28 100644 --- a/resources/views/admin/users/create_edit.blade.php +++ b/resources/views/admin/users/create_edit.blade.php @@ -31,8 +31,8 @@ placeholder="{{ trans('admin/users.username') }}" name="username" id="username" value="{{{ Input::old('username', isset($user) ? $user->username : null) }}}" /> - {!! $errors->first('username', '')!!} + {{ $errors->first('username', '')}}
@@ -45,8 +45,8 @@ placeholder="{{ trans('admin/users.email') }}" name="email" id="email" value="{{{ Input::old('email', isset($user) ? $user->email : null) }}}" /> - {!! $errors->first('email', '')!!} + {{ $errors->first('email', '')}} @@ -59,8 +59,8 @@ - {!!$errors->first('password', '')!!} + {{$errors->first('password', '')}} @@ -72,8 +72,8 @@ - {!!$errors->first('password_confirmation', '')!!} + {{$errors->first('password_confirmation', '')}} diff --git a/resources/views/admin/video/create_edit.blade.php b/resources/views/admin/video/create_edit.blade.php index f2bcfc5a..dfe85fe1 100644 --- a/resources/views/admin/video/create_edit.blade.php +++ b/resources/views/admin/video/create_edit.blade.php @@ -37,7 +37,7 @@ class="form-group {{{ $errors->has('name') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('name', ':message ')!!} + {{$errors->first('name', ':message ')}}
-
@@ -82,7 +82,7 @@ class="form-group {{{ $errors->has('content') ? 'has-error' : '' }}}"> trans("admin/photo.description") }} - {!! $errors->first('description', '')!!} + {{ $errors->first('description', '')}}
diff --git a/resources/views/admin/videoalbum/create_edit.blade.php b/resources/views/admin/videoalbum/create_edit.blade.php index 19991369..e1a5a2b5 100644 --- a/resources/views/admin/videoalbum/create_edit.blade.php +++ b/resources/views/admin/videoalbum/create_edit.blade.php @@ -34,7 +34,7 @@ class="form-group {{{ $errors->has('title') ? 'has-error' : '' }}}"> trans("admin/modal.title") }} - {!!$errors->first('title', '')!!} + {{$errors->first('title', '')}}
diff --git a/resources/views/articles/_form.blade.php b/resources/views/articles/_form.blade.php index f18465df..b72e0f70 100644 --- a/resources/views/articles/_form.blade.php +++ b/resources/views/articles/_form.blade.php @@ -1,28 +1,28 @@
- {!! Form::label('title', 'Title:') !!} - {!! Form::text('title', null, ['class'=>'form-control']) !!} + {{ Form::label('title', 'Title:') }} + {{ Form::text('title', null, ['class'=>'form-control']) }}
- {!! Form::label('excerpt', 'Excerpt:') !!} - {!! Form::textarea('excerpt', null, ['class'=>'form-control']) !!} + {{ Form::label('excerpt', 'Excerpt:') }} + {{ Form::textarea('excerpt', null, ['class'=>'form-control']) }}
- {!! Form::label('body', 'Body:') !!} - {!! Form::textarea('body', null, ['class'=>'form-control']) !!} + {{ Form::label('body', 'Body:') }} + {{ Form::textarea('body', null, ['class'=>'form-control']) }}
- {!! Form::label('published_at', 'Publish On:') !!} - {!! Form::input('date', 'published_at', date('Y-m-d'), ['class'=>'form-control']) !!} + {{ Form::label('published_at', 'Publish On:') }} + {{ Form::input('date', 'published_at', date('Y-m-d'), ['class'=>'form-control']) }}
- {!! Form::label('tags', 'Tags:') !!} - {!! Form::select('tags', $tags, null, ['class'=>'form-control', 'multiple']) !!} + {{ Form::label('tags', 'Tags:') }} + {{ Form::select('tags', $tags, null, ['class'=>'form-control', 'multiple']) }}
- {!! Form::submit($submitButtonText, ['class'=>'btn btn-primary form-control']) !!} + {{ Form::submit($submitButtonText, ['class'=>'btn btn-primary form-control']) }}
diff --git a/resources/views/articles/create.blade.php b/resources/views/articles/create.blade.php index b214b6f3..dda45888 100644 --- a/resources/views/articles/create.blade.php +++ b/resources/views/articles/create.blade.php @@ -5,9 +5,9 @@

Write an Article

- {!! Form::open(['url' => 'articles']) !!} + {{ Form::open(['url' => 'articles']) }} @include('articles._form', ['submitButtonText' => 'Add article']) - {!! Form::close() !!} + {{ Form::close() }} @include('errors.list') diff --git a/resources/views/articles/edit.blade.php b/resources/views/articles/edit.blade.php index 5661a115..62de9fab 100644 --- a/resources/views/articles/edit.blade.php +++ b/resources/views/articles/edit.blade.php @@ -5,9 +5,9 @@

Edit an Article

- {!! Form::model($article, ['method' => 'PATCH', 'action' => ['ArticlesController@update', $article->id]]) !!} + {{ Form::model($article, ['method' => 'PATCH', 'action' => ['ArticlesController@update', $article->id]]) }} @include('articles._form', ['submitButtonText' => 'Update article']) - {!! Form::close() !!} + {{ Form::close() }} @include('errors.list') diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 32269aac..be245b03 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -20,7 +20,7 @@ @include('errors.list') -
+
@@ -55,7 +55,7 @@ Login - Forgot Your Password? + Forgot Your Password?
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php index 4fc8e8c9..b6122140 100644 --- a/resources/views/auth/password.blade.php +++ b/resources/views/auth/password.blade.php @@ -15,7 +15,7 @@ @include('errors.list') -
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 6e6a96c8..2ebfecee 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -20,7 +20,7 @@ @include('errors.list') - +
diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php index 9a175a9b..ca42a651 100644 --- a/resources/views/auth/reset.blade.php +++ b/resources/views/auth/reset.blade.php @@ -10,7 +10,7 @@ @include('errors.list') - + diff --git a/resources/views/news/view_news.blade.php b/resources/views/news/view_news.blade.php index 04ad07eb..e4a1d13b 100644 --- a/resources/views/news/view_news.blade.php +++ b/resources/views/news/view_news.blade.php @@ -5,8 +5,8 @@ @stop {{-- Content --}} @section('content')

{{ $news->title }}

-

{!! $news->introduction() !!}

-

{!! $news->content() !!}

+

{{ $news->introduction() }}

+

{{ $news->content() }}

Posted {{{ $news->created_at }}}
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php index 91f1e0e6..ae26aa01 100644 --- a/resources/views/pages/home.blade.php +++ b/resources/views/pages/home.blade.php @@ -14,8 +14,8 @@

- {!! - $post->title !!} + {{ + $post->title }}

@@ -25,7 +25,7 @@ src="http://placehold.it/260x180" alt="">
-

{!! $post->introduction !!}

+

{{ $post->introduction }}

by {!! $post->author->name !!} | {!! $post->created_at !!} + class="muted">{{ $post->author->name }} | {{ $post->created_at }}

@@ -58,16 +58,16 @@ class="glyphicon glyphicon-calendar"> {!! $post->created_at !!} @if($item->album_image!="") + src="{{'appfiles/photoalbum/'.$item->folder_id.'/thumbs/'.$item->album_image }}"> @elseif($item->album_image_first!="") + src="{{'appfiles/photoalbum/'.$item->folder_id.'/thumbs/'.$item->album_image_first }}"> @else - + @endif -
{!!$item->name!!}
+
{{$item->name}}
@endforeach @@ -92,7 +92,7 @@ class="hover-effect"> @if($item->album_image!="") @endif -
{!!$item->name!!}
+
{{$item->name}}
@endforeach diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php index 3312d4fd..5f04487e 100644 --- a/resources/views/partials/nav.blade.php +++ b/resources/views/partials/nav.blade.php @@ -14,22 +14,22 @@ @@ -29,8 +29,8 @@ class="help-block">:message ')!!}
{!!$errors->first('password', - ':message ')!!} + name="password" id="password"> {{$errors->first('password', + ':message ')}}
diff --git a/resources/views/site/auth/register.blade.php b/resources/views/site/auth/register.blade.php index c16865a7..ec39823e 100644 --- a/resources/views/site/auth/register.blade.php +++ b/resources/views/site/auth/register.blade.php @@ -15,8 +15,8 @@ class="form-control" placeholder="{{{ trans('site/user.name') }}}" type="text" name="name" id="name" value="{{{ Input::old('name') }}}"> {!!$errors->first('name', ':message ')!!} + class="help-block">{{$errors->first('name', ':message ')}}
@@ -25,8 +25,8 @@ class="help-block">:message ')!!} {!!$errors->first('email', ':message ')!!} + class="help-block">{{$errors->first('email', ':message ')}}
@@ -34,8 +34,8 @@ class="help-block">:message ')!!} {!!$errors->first('password', ':message ')!!} + class="help-block">{{$errors->first('password', ':message ')}}
class="form-control" placeholder="{{{ trans('site/user.password_confirmation') }}}" type="password" name="password_confirmation" - id="password_confirmation"> {!!$errors->first('password_confirmation', - ':message ')!!} + id="password_confirmation"> {{$errors->first('password_confirmation', + ':message ')}}