Revision 1356:a6a25685e5a6

View differences:

app/controllers/welcome_controller.rb
24 24 
  def index
25 25 
    @site_project = Project.find_by_identifier "soundsoftware-site"
26 26 
    @site_news = []
27 
    @site_news = News.latest_for @site_project if @site_project
27 
    @site_news = News.latest_for(@site_project, 3) if @site_project
28 28
29 29 
    # tests if user is logged in to generate the tips of the day list
30 30 
    if User.current.logged?
app/views/activities/_busy.html.erb
13 13 
   <ul>
14 14 

  		




  15
  15
  
    
   <% 


  		




  16
  
  
    
      for project in busy_projects(events, 5)


  		




  
  16
  
    
      for project in busy_projects(events, 7)


  		




  17
  17
  
    
   %>


  		




  18
  18
  
    

  		




  19
  19
  
    
   <li class="busy">


  		












  

    
      app/views/projects/explore.html.erb
    
  





  11
  11
  
    
<h2><%= l(:label_explore_projects) %></h2>


  		




  12
  12
  
    

  		




  13
  13
  
    
<div class="threecolumnleft">


  		




  14
  
  
    
<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>


  		




  
  14
  
    
<% cache(:action => 'explore', :action_suffix => 'tags') do %>


  		




  15
  15
  
    
  <div class="tags box">


  		




  16
  16
  
    
  <h3><%=l(:label_project_tags_all)%></h3>


  		




  17
  17
  
    
    <%= render :partial => 'projects/tagcloud' %>


  		




  ......




  28
  28
  
    
</div>


  		




  29
  29
  
    

  		




  30
  30
  
    
<div class="threecolumnleft">


  		




  31
  
  
    
  <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>


  		




  
  31
  
    
  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>


  		




  32
  32
  
    
  <div class="institutions box">


  		




  33
  33
  
    
  <h3><%=l(:label_institutions_busy)%></h3>


  		




  34
  34
  
    
    <%= render :partial => 'activities/busy_institution' %>


  		




  ......




  38
  38
  
    
</div>


  		




  39
  39
  
    

  		




  40
  40
  
    
<div class="threecolumnmid">


  		




  41
  
  
    
  <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>


  		




  
  41
  
    
  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>


  		




  42
  42
  
    
  <div class="projects box">


  		




  43
  43
  
    
  <h3><%=l(:label_projects_busy)%></h3>


  		




  44
  44
  
    
    <%= render :partial => 'activities/busy' %>


  		












  

    
      app/views/users/_form.html.erb
    
  





  1
  
  
    
<%= javascript_include_tag "ssamr_institutions" %>


  		




  2
  
  
    

  		




  
  1
  
    
<% content_for :header_tags do %>


  		




  
  2
  
    
  <%= javascript_include_tag "ssamr_institutions" %>


  		




  
  3
  
    
<% end %>


  		




  3
  4
  
    

  		




  4
  5
  
    
<%= error_messages_for 'user' %>


  		




  5
  6
  
    

  		




  ......




  27
  28
  
    

  		




  28
  29
  
    
<div class="box tabular">


  		




  29
  30
  
    
	<h3><%=l(:label_ssamr_details)%></h3>


  		




  30
  
  
    
          <%= labelled_fields_for :ssamr_user_details do |ssamr_user_detail| %>


  		




  
  31
  
    
          <%= labelled_fields_for :ssamr_user_detail, @user.ssamr_user_detail do |ssamr_user_detail| %>


  		




  31
  32
  
    
            <p>


  		




  32
  
  
    
              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            


  		




  
  33
  
    
              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>


  		




  33
  34
  
    
            </p>


  		




  34
  35
  
    

  		




  35
  36
  
    
            <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>


  		












  

    
      plugins/redmine_tags/assets/stylesheets/redmine_tags.css
    
  





  22
  22
  
    
ul.tags li { margin: .25em 0px; }


  		




  23
  23
  
    

  		




  24
  24
  
    
div.tags { text-align: center; }


  		




  
  25
  
    
div.tags h3 { text-align: left; }


  		




  25
  26
  
    
div.tags .tag-label { margin: .25em; }


  		




  26
  27
  
    
div.tags .tag-nube-1 { font-size: .8em; }


  		




  27
  28
  
    
div.tags .tag-nube-2 { font-size: .9em; }


  		












  

    
      public/themes/soundsoftware/stylesheets/application.css
    
  





  207
  207
  
    
    float: right;


  		




  208
  208
  
    
    width: 27%;


  		




  209
  209
  
    
    margin-right: 3%;


  		




  210
  
  
    
    margin-top: 2.5em;


  		




  
  210
  
    
    margin-top: 1em;


  		




  211
  211
  
    
    margin-left: 2em;


  		




  212
  212
  
    
    margin-bottom: 2em;


  		




  213
  213
  
    
}


  		












Also available in:  Unified diff