Skip to content

Commit

Permalink
Moved navigation view and styling out into their own files so that it…
Browse files Browse the repository at this point in the history
… may be included elsewhere
  • Loading branch information
jamesbrooks committed Apr 15, 2009
1 parent 2a4e6b6 commit b482b79
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 72 deletions.
44 changes: 0 additions & 44 deletions install/stylesheets/hush_cms_admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,6 @@ h1, h3 {
-opera-border-radius: 5px;
}

ul#navigation {
margin: -15px 0;
padding: 0;
list-style: none;
float: right;
font-size: 0.8em;
}
ul#navigation li {
float: left;
margin-left: 10px;
}
ul#navigation li a {
display: block;
height: 16px;
padding: 3px 0 0 18px;
color: #278FD5;
text-decoration: none;
background-repeat: no-repeat;
}
ul#navigation li a:hover {
text-decoration: underline;
}
ul#navigation li#nav-pages a {
background-image: url(../images/hush_cms/page.png);
}
ul#navigation li#nav-posts a {
background-image: url(../images/hush_cms/newspaper.png);
}
ul#navigation li#nav-calendars a {
background-image: url(../images/hush_cms/calendar.png);
}
ul#navigation li#nav-files a {
background-image: url(../images/hush_cms/image.png);
}
ul#navigation li#nav-snippets a {
background-image: url(../images/hush_cms/note.png);
}
ul#navigation li#nav-comments a {
background-image: url(../images/hush_cms/comments.png);
}
ul#navigation li#nav-logout a {
background-image: url(../images/hush_cms/door_open.png);
}

#links {
height: 16px;
margin: 2px 0 20px;
Expand Down
43 changes: 43 additions & 0 deletions install/stylesheets/hush_cms_admin_navigation.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
ul#navigation {
margin: -15px 0;
padding: 0;
list-style: none;
float: right;
font-size: 0.8em;
}
ul#navigation li {
float: left;
margin-left: 10px;
}
ul#navigation li a {
display: block;
height: 16px;
padding: 3px 0 0 18px;
color: #278FD5;
text-decoration: none;
background-repeat: no-repeat;
}
ul#navigation li a:hover {
text-decoration: underline;
}
ul#navigation li#nav-pages a {
background-image: url(../images/hush_cms/page.png);
}
ul#navigation li#nav-posts a {
background-image: url(../images/hush_cms/newspaper.png);
}
ul#navigation li#nav-calendars a {
background-image: url(../images/hush_cms/calendar.png);
}
ul#navigation li#nav-files a {
background-image: url(../images/hush_cms/image.png);
}
ul#navigation li#nav-snippets a {
background-image: url(../images/hush_cms/note.png);
}
ul#navigation li#nav-comments a {
background-image: url(../images/hush_cms/comments.png);
}
ul#navigation li#nav-logout a {
background-image: url(../images/hush_cms/door_open.png);
}
14 changes: 14 additions & 0 deletions lib/views/hush_cms_admin/shared/_navigation.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%ul#navigation
%li#nav-pages= link_to 'Pages', hush_cms_admin_pages_path
%li#nav-posts= link_to 'Posts', hush_cms_admin_post_categories_path
%li#nav-files= link_to 'Files', hush_cms_admin_files_path
%li#nav-calendars= link_to 'Calendars', hush_cms_admin_calendars_path
%li#nav-snippets= link_to 'Snippets', hush_cms_admin_snippets_path

- if HushCMS::PostCategory.any_with_comments?
%li#nav-comments= link_to "Comments#{HushCMS::Comment.unapproved.count > 0 ? " (#{HushCMS::Comment.unapproved.count})" : ''}", hush_cms_admin_comments_path

- HushCMS.navigation.each do |name, path|
%li{:id => "nav-#{name.slugify}"}= link_to name, path

%li#nav-logout= link_to 'Logout', hush_cms_admin_logout_path
18 changes: 3 additions & 15 deletions lib/views/layouts/hush_cms_admin.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%title Hush CMS Administration
%meta{'http-equiv' => 'content-type', 'content' => 'text/html;charset=utf-8'}
%meta{'http-equiv' => 'Content-Style-Type', 'content' => 'text/css'}
= stylesheet_link_tag 'hush_cms_admin', 'hush_cms_admin_extensions', 'hush_cms_date_picker'
= stylesheet_link_tag 'hush_cms_admin', 'hush_cms_admin_navigation', 'hush_cms_admin_extensions', 'hush_cms_date_picker'
/[if IE]
= stylesheet_link_tag 'hush_cms_ie_admin'
= include_tiny_mce_js_if_needed
Expand All @@ -13,22 +13,10 @@

%body
#container
%ul#navigation
%li#nav-pages= link_to 'Pages', hush_cms_admin_pages_path
%li#nav-posts= link_to 'Posts', hush_cms_admin_post_categories_path
%li#nav-files= link_to 'Files', hush_cms_admin_files_path
%li#nav-calendars= link_to 'Calendars', hush_cms_admin_calendars_path
%li#nav-snippets= link_to 'Snippets', hush_cms_admin_snippets_path

- if HushCMS::PostCategory.any_with_comments?
%li#nav-comments= link_to "Comments#{HushCMS::Comment.unapproved.count > 0 ? " (#{HushCMS::Comment.unapproved.count})" : ''}", hush_cms_admin_comments_path

- HushCMS.navigation.each do |name, path|
%li{:id => "nav-#{name.slugify}"}= link_to name, path

%li#nav-logout= link_to 'Logout', hush_cms_admin_logout_path
= render :partial => 'hush_cms_admin/shared/navigation'

%h1= @title

#links
- if @links && [email protected]?
%ul
Expand Down
29 changes: 16 additions & 13 deletions tasks/hush_cms.rake
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@ namespace :hush_cms do
task :update => :environment do
require 'fileutils'

hush_config = "#{RAILS_ROOT}/config/hush.yml"
hush_images = "#{RAILS_ROOT}/public/images/hush_cms"
hush_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_admin.js"
hush_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_admin.css"
date_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_picker.js"
date_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_date_picker.css"
date_languages = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_lang"
hush_config = "#{RAILS_ROOT}/config/hush.yml"
hush_images = "#{RAILS_ROOT}/public/images/hush_cms"
hush_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_admin.js"
hush_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_admin.css"
hush_nav_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_admin_navigation.css"
date_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_picker.js"
date_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_date_picker.css"
date_languages = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_lang"

FileUtils.rm_r hush_images if File.exist?(hush_images)
FileUtils.rm_r hush_javascripts if File.exist?(hush_javascripts)
FileUtils.rm_r hush_stylesheets if File.exist?(hush_stylesheets)
FileUtils.rm_r hush_nav_stylesheets if File.exist?(hush_nav_stylesheets)
FileUtils.rm_r date_javascripts if File.exist?(date_javascripts)
FileUtils.rm_r date_stylesheets if File.exist?(date_stylesheets)
FileUtils.rm_r date_languages if File.exist?(date_languages)

FileUtils.cp_r File.dirname(__FILE__) + '/../install/images', hush_images unless File.exist?(hush_images)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_admin.js', hush_javascripts unless File.exist?(hush_javascripts)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/stylesheets/hush_cms_admin.css', hush_stylesheets unless File.exist?(hush_stylesheets)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_date_picker.js', date_javascripts unless File.exist?(date_javascripts)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/stylesheets/hush_cms_date_picker.css', date_stylesheets unless File.exist?(date_stylesheets)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_date_lang', date_languages unless File.exist?(date_languages)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/images', hush_images unless File.exist?(hush_images)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_admin.js', hush_javascripts unless File.exist?(hush_javascripts)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/stylesheets/hush_cms_admin.css', hush_stylesheets unless File.exist?(hush_stylesheets)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/stylesheets/hush_cms_admin_navigation.css', hush_nav_stylesheets unless File.exist?(hush_nav_stylesheets)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_date_picker.js', date_javascripts unless File.exist?(date_javascripts)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/stylesheets/hush_cms_date_picker.css', date_stylesheets unless File.exist?(date_stylesheets)
FileUtils.cp_r File.dirname(__FILE__) + '/../install/javascripts/hush_cms_date_lang', date_languages unless File.exist?(date_languages)

puts "\nHush CMS support files have been successfully updated."
end
Expand Down

0 comments on commit b482b79

Please sign in to comment.