# HG changeset patch # User Chris Cannam # Date 1371649442 -3600 # Node ID 5490d6392ee32e6401160b87d34d25cedd572d15 # Parent b189ccd72882861d65a263169573194213310350 Prepare simplification of front page diff -r b189ccd72882 -r 5490d6392ee3 app/views/account/register.html.erb --- 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 @@

<%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %>

+<%= l(:text_who_can_register).html_safe %> + <%= labelled_form_for @user, :url => register_path do |f| %> <%= error_messages_for 'user' %> diff -r b189ccd72882 -r 5490d6392ee3 app/views/welcome/index.html.erb --- 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? %> -
- <%= textilizable Setting.notifications_text %> +
+ <%= textilizable Setting.notifications_text %>
<% end %> -

<%= l(:label_home_heading) %>

+
-
- <%= textilizable Setting.welcome_text %> +<%= textilizable Setting.welcome_text %> + +
- <%= call_hook(:view_welcome_index_left, :projects => @projects) %> -
- -
- <% if @site_news.any? %> -
-

<%=l(:label_news_site_latest)%>

- <%= 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' } %> -
- <% end %> -
-

<%=l(:label_project_latest)%>

- <%= render :partial => 'projects/latest' %> - <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %> -
- <%= call_hook(:view_welcome_index_right, :projects => @projects) %> -
- <% 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)}") %> diff -r b189ccd72882 -r 5490d6392ee3 config/locales/en.yml --- 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.
Once saved, the identifier cannot be changed.' + + text_who_can_register: '

Who can register here?

You can register if you are a researcher in the audio and music field are you are:

Please ensure you provide enough information in the description below to establish which of these is the case.

(You do not need to register in order to download or use code from this site — only to host your own code here.)

' diff -r b189ccd72882 -r 5490d6392ee3 public/themes/soundsoftware/stylesheets/application.css --- 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; }