dashboard message count and fixed navbar
6 gewijzigde bestanden met toevoegingen van 26 en 5 verwijderingen
+ 1
- 0
app/assets/javascripts/admin_panel.js.coffee
@@ -5,6 +5,7 @@ |
||
| 5 | 5 |
|
| 6 | 6 |
attachHandler = -> |
| 7 | 7 |
$(".bootstrap_switch").bootstrapSwitch('size', 'large');
|
| 8 |
+ $('#admin_navbar').affix()
|
|
| 8 | 9 |
|
| 9 | 10 |
$(document).ready attachHandler |
| 10 | 11 |
$(document).on "page:load", attachHandler |
+ 2
- 0
app/controllers/admin_panel_controller.rb
@@ -15,6 +15,8 @@ class AdminPanelController < ApplicationController |
||
| 15 | 15 |
@users = User.all |
| 16 | 16 |
@posts = BlogPost.all |
| 17 | 17 |
@files = Upload.all |
| 18 |
+ @contact_messages = ContactMessage.all |
|
| 19 |
+ @new_messages = @contact_messages.find_all_by_unread(true) |
|
| 18 | 20 |
end |
| 19 | 21 |
|
| 20 | 22 |
def posts |
+ 3
- 2
app/views/admin_panel/_sidebar_nav.html.erb
@@ -1,4 +1,4 @@ |
||
| 1 |
-<div class="span3" style="margin-top: 25px;"> |
|
| 1 |
+<div id="admin_navbar" data-spy="affix" data-offset-top="0px" class="span3" style="margin-top: 25px;"> |
|
| 2 | 2 |
<ul class="nav nav-pills nav-stacked"> |
| 3 | 3 |
|
| 4 | 4 |
<% if current_page?(:action => 'dashboard')%><li class="active"> <% else %><li><% end %> |
@@ -20,4 +20,5 @@ |
||
| 20 | 20 |
<%= link_to ('<i class="icon-cog icon-white"></i> '+(t "admin_panel.configurations")).html_safe, admin_config_path %></li>
|
| 21 | 21 |
|
| 22 | 22 |
</ul> |
| 23 |
-</div> |
|
| 23 |
+</div> |
|
| 24 |
+<div class="span3"></div> |
+ 14
- 3
app/views/admin_panel/dashboard.html.erb
@@ -8,13 +8,24 @@ |
||
| 8 | 8 |
<%= bootstrap_flash %> |
| 9 | 9 |
<div class="well summary"> |
| 10 | 10 |
<ul> |
| 11 |
- <li> |
|
| 11 |
+ <li style="width: 25%"> |
|
| 12 |
+ <a href="<%= admin_contact_messages_path %>"><span class="count"><%= (@new_messages.length.to_s + '/' + @contact_messages.length.to_s) %></span> |
|
| 13 |
+ <% if @new_messages.length > 1 %> |
|
| 14 |
+ <% t "admin_panel.new_messages" %> <%= t "admin_panel.contact_messages" %> |
|
| 15 |
+ <% elsif @new_messages.length == 1 %> |
|
| 16 |
+ <% t "admin_panel.new" %> <%= t "admin_panel.message" %> |
|
| 17 |
+ <% else %> |
|
| 18 |
+ <%= t "admin_panel.contact_messages" %> |
|
| 19 |
+ <% end %> |
|
| 20 |
+ </a> |
|
| 21 |
+ </li> |
|
| 22 |
+ <li style="width: 25%"> |
|
| 12 | 23 |
<a href="<%= admin_users_path %>"><span class="count"><%= @users.length %></span> <%= t "admin_panel.users" %></a> |
| 13 | 24 |
</li> |
| 14 |
- <li> |
|
| 25 |
+ <li style="width: 25%"> |
|
| 15 | 26 |
<a href="<%= admin_files_path %>"><span class="count"><%= @files.length %></span> <%= t "admin_panel.files" %></a> |
| 16 | 27 |
</li> |
| 17 |
- <li class="last"> |
|
| 28 |
+ <li class="last" style="width: 25%"> |
|
| 18 | 29 |
<a href="<%= admin_posts_path %>"><span class="count"><%= @posts.length %></span> <%= t "admin_panel.posts" %></a> |
| 19 | 30 |
</li> |
| 20 | 31 |
</ul> |
+ 3
- 0
config/locales/en.yml
@@ -224,7 +224,9 @@ en: |
||
| 224 | 224 |
config_update_success: Configurations saved successfully |
| 225 | 225 |
contact_messages: Contact Messages |
| 226 | 226 |
new: New |
| 227 |
+ new_messages: New |
|
| 227 | 228 |
messages: Messages |
| 229 |
+ message: Message |
|
| 228 | 230 |
maintenance_mode: Maintenance Mode |
| 229 | 231 |
maintenance_title: Maintenance Page Title |
| 230 | 232 |
maintenance_message: Maintenance Page Message |
@@ -236,6 +238,7 @@ en: |
||
| 236 | 238 |
unmake_admin_success: The user lost his admin access. |
| 237 | 239 |
make_admin_error: User permission was not altered. |
| 238 | 240 |
permission_denied: You dont have permission to access that page! |
| 241 |
+ contact_messages: Messages |
|
| 239 | 242 |
nav: |
| 240 | 243 |
admin_panel: Admin Panel |
| 241 | 244 |
account: Account |
+ 3
- 0
config/locales/pt-BR.yml
@@ -226,7 +226,9 @@ pt-BR: |
||
| 226 | 226 |
server_email: Email do servidor |
| 227 | 227 |
contact_messages: Mensagens de Contato |
| 228 | 228 |
new: Nova |
| 229 |
+ new_messages: Novas |
|
| 229 | 230 |
messages: Mensagens |
| 231 |
+ message: Mensagem |
|
| 230 | 232 |
maintenance_mode: Modo de Manutenção |
| 231 | 233 |
maintenance_title: Titulo da página de manutenção |
| 232 | 234 |
maintenance_message: Mensagem de manutenção |
@@ -238,6 +240,7 @@ pt-BR: |
||
| 238 | 240 |
unmake_admin_success: O usuário não tem mais acesso de administrador. |
| 239 | 241 |
make_admin_error: A permissão não foi alterada. |
| 240 | 242 |
permission_denied: Você não tem permissão para acessar aquela página! |
| 243 |
+ contact_messages: Mensagens |
|
| 241 | 244 |
nav: |
| 242 | 245 |
admin_panel: Painel de Controle |
| 243 | 246 |
account: Conta |