{{ $user->name }}@if ($user->is_admin) @endif
- {{ $user->email }}
+ {{ $user->email }}
|
@if (!$user->is_activated)
@@ -41,7 +41,7 @@
{{ $users->links() }}
-
+
@can('admin:manage-groups')
@lang('admin.list_groups_title')
@endcan
diff --git a/resources/views/themes/base/admin/settings.blade.php b/resources/views/themes/base/admin/settings.blade.php
index c638cfb..d84b574 100644
--- a/resources/views/themes/base/admin/settings.blade.php
+++ b/resources/views/themes/base/admin/settings.blade.php
@@ -20,10 +20,10 @@
{{-- Nav tabs --}}
@include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'general', 'tab_icon' => 'info-circle', 'tab_text' => trans('admin.settings_general_tab')])
- @include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'image-processing', 'tab_icon' => 'picture-o', 'tab_text' => trans('admin.settings.image_processing_tab')])
+ @include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'image-processing', 'tab_icon' => 'image', 'tab_text' => trans('admin.settings.image_processing_tab')])
@include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'email', 'tab_icon' => 'envelope', 'tab_text' => trans('admin.settings_email_tab')])
@include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'security', 'tab_icon' => 'lock', 'tab_text' => trans('admin.settings_security_tab')])
- @include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'analytics', 'tab_icon' => 'line-chart', 'tab_text' => trans('admin.settings.analytics_tab')])
+ @include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'analytics', 'tab_icon' => 'chart-line', 'tab_text' => trans('admin.settings.analytics_tab')])
@include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'social', 'tab_icon' => 'users', 'tab_text' => trans('admin.settings.social_tab')])
@include(Theme::viewName('partials.tab'), ['active_tab' => 'general', 'tab_name' => 'comments', 'tab_icon' => 'edit', 'tab_text' => trans('admin.settings.comments_tab')])
@@ -490,7 +490,7 @@
{{-- Facebook --}}
-
+
@@ -537,7 +537,7 @@
{{-- Twitter --}}
-
+
@@ -584,7 +584,7 @@
{{-- Google+ --}}
-
+
@lang('forms.cancel_action')
diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index 20c2145..c5a371e 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -18,14 +18,14 @@
- @lang('admin.open_album')
+ @lang('admin.open_album')
{{ $album->name }}
{!! nl2br(e($album->description)) !!}
- @include(Theme::viewName('partials.tab'), ['tab_name' => 'photos', 'tab_icon' => 'photo', 'tab_text' => trans('admin.album_photos_tab')])
+ @include(Theme::viewName('partials.tab'), ['tab_name' => 'photos', 'tab_icon' => 'images', 'tab_text' => trans('admin.album_photos_tab')])
@can('upload-photos', $album)
@include(Theme::viewName('partials.tab'), ['tab_name' => 'upload', 'tab_icon' => 'upload', 'tab_text' => trans('admin.album_upload_tab')])
@endcan
diff --git a/resources/views/themes/base/layout.blade.php b/resources/views/themes/base/layout.blade.php
index 3f059be..52a749f 100644
--- a/resources/views/themes/base/layout.blade.php
+++ b/resources/views/themes/base/layout.blade.php
@@ -58,7 +58,7 @@
- {{ $warning }}
+ {{ $warning }}
@endif
diff --git a/resources/views/themes/base/partials/admin_manage_widget.blade.php b/resources/views/themes/base/partials/admin_manage_widget.blade.php
index 28caabc..ef10515 100644
--- a/resources/views/themes/base/partials/admin_manage_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_manage_widget.blade.php
@@ -13,30 +13,48 @@
@endif
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/admin_stats_widget.blade.php b/resources/views/themes/base/partials/admin_stats_widget.blade.php
index e65c6eb..85a1f8c 100644
--- a/resources/views/themes/base/partials/admin_stats_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_stats_widget.blade.php
@@ -7,7 +7,7 @@
{{ $label_count }} {{ trans_choice('admin.stats_widget.labels', $label_count) }}
@can('admin:access')
- {{ $user_count }} {{ trans_choice('admin.stats_widget.users', $user_count) }} / {{ $group_count }} {{ trans_choice('admin.stats_widget.groups', $group_count) }}
+ {{ $user_count }} {{ trans_choice('admin.stats_widget.users', $user_count) }} · {{ $group_count }} {{ trans_choice('admin.stats_widget.groups', $group_count) }}
@endcan
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/album_settings_tab.blade.php b/resources/views/themes/base/partials/album_settings_tab.blade.php
index e0c41cd..e628433 100644
--- a/resources/views/themes/base/partials/album_settings_tab.blade.php
+++ b/resources/views/themes/base/partials/album_settings_tab.blade.php
@@ -52,7 +52,7 @@
@lang('admin.save_changes_intro')
-
+
diff --git a/resources/views/themes/base/partials/register.blade.php b/resources/views/themes/base/partials/register.blade.php
index 06608aa..b08448d 100644
--- a/resources/views/themes/base/partials/register.blade.php
+++ b/resources/views/themes/base/partials/register.blade.php
@@ -77,7 +77,7 @@
@if ($errors->has('recaptcha'))
-
+
{{ $errors->first('recaptcha') }}
diff --git a/resources/views/themes/base/partials/single_photo_admin.blade.php b/resources/views/themes/base/partials/single_photo_admin.blade.php
index 6071ac9..28afbb4 100644
--- a/resources/views/themes/base/partials/single_photo_admin.blade.php
+++ b/resources/views/themes/base/partials/single_photo_admin.blade.php
@@ -18,14 +18,14 @@
@if ($canManipulate)
|