Mercurial > hg > soundsoftware-site
changeset 1319:5490d6392ee3 redmine-2.2-integration
Prepare simplification of front page
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Wed, 19 Jun 2013 14:44:02 +0100 |
parents | b189ccd72882 |
children | 75f258d6f747 |
files | app/views/account/register.html.erb app/views/welcome/index.html.erb config/locales/en.yml public/themes/soundsoftware/stylesheets/application.css |
diffstat | 4 files changed, 34 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/account/register.html.erb Tue Jun 18 15:33:49 2013 +0100 +++ b/app/views/account/register.html.erb Wed Jun 19 14:44:02 2013 +0100 @@ -3,6 +3,8 @@ <h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2> +<%= l(:text_who_can_register).html_safe %> + <%= labelled_form_for @user, :url => register_path do |f| %> <%= error_messages_for 'user' %>
--- a/app/views/welcome/index.html.erb Tue Jun 18 15:33:49 2013 +0100 +++ b/app/views/welcome/index.html.erb Wed Jun 19 14:44:02 2013 +0100 @@ -1,33 +1,16 @@ + <% if not Setting.notifications_text.empty? %> - <div class="notifications flash error"> - <%= textilizable Setting.notifications_text %> + <div class="notifications flash newsalert"> + <%= textilizable Setting.notifications_text %> </div> <% end %> -<h2><%= l(:label_home_heading) %></h2> +<div id="welcomepage"> -<div class="splitcontentleft"> - <%= textilizable Setting.welcome_text %> +<%= textilizable Setting.welcome_text %> + +</div> - <%= call_hook(:view_welcome_index_left, :projects => @projects) %> -</div> - -<div class="splitcontentright"> - <% if @site_news.any? %> - <div class="news box"> - <h3><%=l(:label_news_site_latest)%></h3> - <%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %> - <%= link_to l(:label_news_more), { :controller => 'projects', :action => @site_project.identifier, :id => 'news' } %> - </div> - <% end %> - <div class="projects box"> - <h3><%=l(:label_project_latest)%></h3> - <%= render :partial => 'projects/latest' %> - <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %> - </div> - <%= call_hook(:view_welcome_index_right, :projects => @projects) %> -</div> - <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
--- a/config/locales/en.yml Tue Jun 18 15:33:49 2013 +0100 +++ b/config/locales/en.yml Wed Jun 19 14:44:02 2013 +0100 @@ -1166,3 +1166,5 @@ description_date_from: Enter start date description_date_to: Enter end date text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.' + + text_who_can_register: '<h3>Who can register here?</h3><p>You can register if you are a researcher in the audio and music field are you are:<ul><li>working in the UK,</li><li>working with UK researchers who are also using this site, <i>or</i></li><li>working on projects having an audience within the UK research community.</li></ul></p><p>Please ensure you provide enough information in the description below to establish which of these is the case.</p><p>(You do not need to register in order to download or use code from this site — only to host your own code here.)</p>'
--- a/public/themes/soundsoftware/stylesheets/application.css Tue Jun 18 15:33:49 2013 +0100 +++ b/public/themes/soundsoftware/stylesheets/application.css Wed Jun 19 14:44:02 2013 +0100 @@ -176,6 +176,29 @@ #top-menu a.administration { background-image: url(../images/wrench.png); } #top-menu a.help { background-image: url(../../../images/help.png); } +#welcomepage { + width: 80%; + margin-left: 71px; + margin-top: 10px; +} +#welcomepage p, #welcomepage li { + font-size: 1.2em; + color: #3e442c; +} +#welcomepage p { + margin-left: 2em; + margin-top: 0.7em; + margin-bottom: 0.7em; +} + +div.flash.newsalert { + float: right; + width: 25%; + padding: 0px 10px 2px 24px; + margin: 1.2em 1em 1em 2em; + border-color: #dd0000; +} + /* for Javadoc in Embedded context: */ .TableHeadingColor { background-color: #fdf7e4; color: #3e442c; border: 0px solid #fff; }