Revision 1319:5490d6392ee3

View differences:

app/views/account/register.html.erb
3 3

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

  
6
<%= l(:text_who_can_register).html_safe %>
7

  
6 8
<%= labelled_form_for @user, :url => register_path do |f| %>
7 9
<%= error_messages_for 'user' %>
8 10

  
app/views/welcome/index.html.erb
1

  
1 2
<% if not Setting.notifications_text.empty? %>
2
  <div class="notifications flash error">
3
    <%= textilizable Setting.notifications_text %>
3
  <div class="notifications flash newsalert">
4
    <%= textilizable Setting.notifications_text %> 
4 5
  </div>
5 6
<% end %>
6 7

  
7
<h2><%= l(:label_home_heading) %></h2>
8
<div id="welcomepage">
8 9

  
9
<div class="splitcontentleft">
10
  <%= textilizable Setting.welcome_text %>
10
<%= textilizable Setting.welcome_text %>
11

  
12
</div>
11 13
  
12
  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
13
</div>
14

  
15
<div class="splitcontentright">
16
  <% if @site_news.any? %>
17
    <div class="news box">
18
       <h3><%=l(:label_news_site_latest)%></h3>
19
	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
20
	<%= link_to l(:label_news_more), { :controller => 'projects', :action => @site_project.identifier, :id => 'news' } %>
21
  </div>
22
  <% end %>
23
  <div class="projects box">
24
  <h3><%=l(:label_project_latest)%></h3>
25
    <%= render :partial => 'projects/latest' %>
26
    <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %>
27
  </div>
28
    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
29
</div>
30

  
31 14
<% content_for :header_tags do %>
32 15
<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
33 16
                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
config/locales/en.yml
1166 1166
  description_date_from: Enter start date
1167 1167
  description_date_to: Enter end date
1168 1168
  text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
1169

  
1170
  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 &mdash; only to host your own code here.)</p>'
public/themes/soundsoftware/stylesheets/application.css
176 176
#top-menu a.administration { background-image: url(../images/wrench.png); }
177 177
#top-menu a.help { background-image: url(../../../images/help.png); }
178 178

  
179
#welcomepage {
180
    width: 80%;
181
    margin-left: 71px;
182
    margin-top: 10px;
183
}
184
#welcomepage p, #welcomepage li {
185
    font-size: 1.2em;
186
    color: #3e442c;
187
}
188
#welcomepage p {
189
    margin-left: 2em;
190
    margin-top: 0.7em;
191
    margin-bottom: 0.7em;
192
}
193

  
194
div.flash.newsalert {
195
  float: right;
196
  width: 25%;
197
  padding: 0px 10px 2px 24px;
198
  margin: 1.2em 1em 1em 2em;
199
  border-color: #dd0000;
200
}
201

  
179 202
/* for Javadoc in Embedded context: */
180 203

  
181 204
.TableHeadingColor { background-color: #fdf7e4; color: #3e442c; border: 0px solid #fff; }

Also available in: Unified diff