Skip to content

O
OHR Support
Commit 0634591b authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Themes: 

* Fixed: themes are not found when running Apache+fastcgi
* Added 'Classic' theme (inspired from the v0.51 design)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@922 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 5e6fa147
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 10 deletions
app/views/layouts/base.rhtml
View file @ 0634591b
......@@ -22,18 +22,18 @@
<div id="account">
<% if User.current.logged? %>
<%=l(:label_logged_as)%> <%= User.current.login %> -
<%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' } %>
<%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' } %>
<%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
<%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout' %>
<% else %>
<%= link_to l(:label_login), { :controller => 'account', :action => 'login' } %>
<%= link_to(l(:label_register), :controller => 'account',:action => 'register') if Setting.self_registration? %>
<%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin' %>
<%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
<% end %>
</div>
<%= link_to l(:label_home), home_url %>
<%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'} if User.current.logged? %>
<%= link_to l(:label_project_plural), { :controller => 'projects' } %>
<%= link_to l(:label_administration), { :controller => 'admin' } if User.current.admin? %>
<%= link_to l(:label_help), Redmine::Info.help_url %>
<%= link_to l(:label_home), home_url, :class => 'home' %>
<%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => 'mypage' if User.current.logged? %>
<%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => 'projects' %>
<%= link_to l(:label_administration), { :controller => 'admin' }, :class => 'admin' if User.current.admin? %>
<%= link_to l(:label_help), Redmine::Info.help_url, :class => 'help' %>
</div>
<div id="header">
......
lib/redmine/themes.rb
View file @ 0634591b
......@@ -54,7 +54,7 @@ module Redmine
private
def self.scan_themes
dirs = Dir.glob('public/themes/*').select do |f|
dirs = Dir.glob("#{RAILS_ROOT}/public/themes/*").select do |f|
# A theme should at least override application.css
File.directory?(f) && File.exist?("#{f}/stylesheets/application.css")
end
......
public/themes/classic/stylesheets/application.css 0 → 100644
View file @ 0634591b
@import url(../../../stylesheets/application.css);
body{ color:#303030; background:#e8eaec; }
#top-menu { font-size: 80%; height: 2em; padding-top: 0.5em; background-color: #578bb8; }
#top-menu a { font-weight: bold; }
#header { background: #467aa7; height:5.8em; padding: 10px 0 0 0; }
#header h1 { margin-left: 6px; }
#quick-search { margin-right: 6px; }
#main-menu { background-color: #578bb8; left: 0; border-top: 1px solid #fff; width: 100%; }
#main-menu li { margin: 0; padding: 0; }
#main-menu li a { background-color: #578bb8; border-right: 1px solid #fff; font-size: 80%; padding: 4px 8px 4px 8px; font-weight: bold; }
#main-menu li a:hover { background-color: #80b0da; color: #ffffff; }
#footer { background-color: #578bb8; border: 0; color: #fff;}
#footer a { color: #fff; font-weight: bold; }
#main { font:90% Verdana,Tahoma,Arial,sans-serif; background: #e8eaec; }
#main a { font-weight: bold; color: #467aa7;}
#main a:hover { color: #2a5a8a; text-decoration: underline; }
#content { background: #fff; }
h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 { border-bottom: 0px; color:#606060; font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
h2, .wiki h1 { letter-spacing:-1px; }
h4 { border-bottom: dotted 1px #c0c0c0; }
#top-menu a.home, #top-menu a.mypage, #top-menu a.projects, #top-menu a.admin, #top-menu a.help {
background-position: 0% 40%;
background-repeat: no-repeat;
padding-left: 20px;
padding-top: 2px;
padding-bottom: 3px;
}
#top-menu a.home { background-image: url(../../../images/home.png); }
#top-menu a.mypage { background-image: url(../../../images/user_page.png); }
#top-menu a.projects { background-image: url(../../../images/projects.png); }
#top-menu a.admin { background-image: url(../../../images/admin.png); }
#top-menu a.help { background-image: url(../../../images/help.png); }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment