Safeguarding the past, present and future of RISC OS for everyone
Account
News | Downloads | Bugs | Bounties | Forums | Library
You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.
  • Changesets
  • » Changeset 327

Changeset 327

View, layout and stylesheet changes to make Collaboa fit in with
the March 2011 site update.

  • Comitted by: rool
  • Date: Friday March 18 14:46:32 2011 (over 13 years ago)

Affected files:

  • Updated rool/rails/collaboa/trunk/app/views/layouts/application.rhtml (diff)
  • Updated rool/rails/collaboa/trunk/app/views/shared/_powered.rhtml (diff)
  • Updated rool/rails/collaboa/trunk/app/views/tickets/show.rhtml (diff)
  • Updated rool/rails/collaboa/trunk/public/stylesheets/screen.css (diff)

rool/rails/collaboa/trunk/app/views/layouts/application.rhtml:

prev.current 
<%= stylesheet_link_tag '/stylesheets/syntaxes/xml' %>
<%= stylesheet_link_tag '/stylesheets/syntaxes/yaml' %>
<% end %>
18   <% if @params["controller"] == 'repository' %>
19   <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'changesets'}) -%>
  18 <% if @params["controller"] == 'repository' -%>
  19 <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'changesets'}) %>
<% elsif @params["controller"] == 'tickets' -%>
21   <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'tickets'}) -%>
  21 <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'tickets'}) %>
<% else -%>
23   <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'all'}) -%>
  23 <%= auto_discovery_link_tag(:rss, {:controller => 'rss', :action => 'all'}) %>
<% end -%>
<%= javascript_include_tag "prototype" %>
</head>
27   <body bgcolor="#ffffff" text="#333333" link="#6e915e" vlink="#8cb877" alink="#e5ffd4">
  27 <body>
<%= render 'shared/fixed_header' %>
30   <!-- Collaboa contents table -->
  30 <div id="template_main">
32   <div id="template_body_background"><div id="template_body_shadow_left" class="template_shadow_left"><div id="template_body_shadow_right" class="template_shadow_right"><div id="template_body_content" class="template_body_content template_overall_content">
  32 <!-- Main body content -->
34   <br />
35   <table align="center" cellpadding="0" cellspacing="0" width="100%">
36   <tr valign="top" align="left">
37   <td width="74%">
  34 <div id="template_body">
  35 <div id="template_body_content">
<%= hubssolib_flash_tags -%>
  37
<%= @content_for_layout %>
40   </td>
  39 </div>
  40 </div>
42   <td width="1%">&nbsp;&nbsp;</td>
43   <td bgcolor="#bbbbbb" class="template_column_divider"><img src="/images/utilities/blank.gif" width="1" height="1" alt="." border="0" /></td>
44   <td width="1%">&nbsp;&nbsp;</td>
  42 <!-- Sidebar -->
46   <td width="24%">
47   <div id="template_sidebar">
48   <div class="template_sidebar_node">
49   <h3>Search tickets</h3>
  44 <div id="template_sidebar">
  45 <div id="template_sidebar_content">
  46 <div class="template_sidebar_node">
  47 <h3>Search tickets</h3>
51   <p />
52   <div class="template_sidebar_static">
53   <%= form_tag({:controller => 'search', :action => 'index'}, :method => 'get') %>
54   <input name="q" type="text" value="<%= params[:q] -%>" size="15" />
55   <input type="submit" value="Go" />
56   <%= end_form_tag %>
57   </div>
  49 <p />
  50 <div class="template_sidebar_static">
  51 <%= form_tag({:controller => 'search', :action => 'index'}, :method => 'get') %>
  52 <input name="q" type="text" value="<%= params[:q] -%>" size="15" />
  53 <input type="submit" value="Go" />
  54 <%= end_form_tag %>
</div>
  56 </div>
<%= render 'shared/fixed_sidebar' %>
<% if hubssolib_privileged? -%>
  61 <p />
  62 <div class="template_sidebar_node">
  63 <% if current_user.login == 'Public' %>
  64 <h3>Collaboa admin</h3>
  65
<p />
64   <div class="template_sidebar_node">
65   <% if current_user.login == 'Public' %>
66   <h3>Collaboa admin</h3>
  67 <ul><li><%= link_to 'Log in', :controller => '/login', :action => 'login' -%></li></ul>
  68 <% else %>
  69 <h3>Collaboa admin</h3>
68   <p />
69   <ul><li><%= link_to 'Log in', :controller => '/login', :action => 'login' -%></li></ul>
70   <% else %>
71   <h3>Collaboa admin</h3>
72  
73   <p />
74   <ul><li>Logged in as <%= current_user.login %> <%= link_to '(Log out)', :controller => '/login', :action => 'logout' -%></li></ul>
75   <% end %>
76   </div>
  71 <p />
  72 <ul><li>Logged in as <%= current_user.login %> <%= link_to '(Log out)', :controller => '/login', :action => 'logout' -%></li></ul>
  73 <% end %>
  74 </div>
<% end -%>
  77 <p />
  78 <div class="template_sidebar_node">
  79 <h3>Options</h3>
  80
<p />
80   <div class="template_sidebar_node">
81   <h3>Options</h3>
  82 <ul>
  83 <% if current_user.view_tickets? -%>
  84 <li><%= link_to 'Tickets', :controller => '/tickets' -%></li>
  85 <% end -%>
  86 <% if current_user.create_tickets? -%>
  87 <li><%= link_to 'New ticket', :controller => '/tickets', :action => 'new' -%></li>
  88 <% end -%>
  89 <% if current_user.view_milestones? -%>
  90 <li><%= link_to 'Milestones', :controller => '/milestones' -%></li>
  91 <% end -%>
  92 <% if current_user.view_changesets? -%>
  93 <li>Subversion: <%= link_to 'Changesets', :controller => '/repository', :action => 'changesets' -%></li>
  94 <% end -%>
  95 <% if current_user.view_code? -%>
  96 <li>Subversion: <%= link_to 'Browse', :controller => '/repository', :action => 'browse', :path => nil -%></li>
  97 <% end -%>
  98 <% if current_user.view_changesets? -%>
  99 <li>CVS: <a href="/viewer/revisions">Revisions</a></li>
  100 <% end -%>
  101 <% if current_user.view_code? -%>
  102 <li>CVS: <a href="/viewer/view">Browse</a></li>
  103 <% end -%>
  104 <% if current_user.view_tickets? -%>
  105 <li><%= link_to 'Search', :controller => '/search' -%></li>
  106 <% end -%>
  107 <% if current_user.admin? -%>
  108 <li><%= link_to 'Admin', :controller => '/admin' -%></li>
  109 <% end -%>
  110 </ul>
  111 </div>
83   <p />
84   <ul>
85   <% if current_user.view_tickets? -%>
86   <li><%= link_to 'Tickets', :controller => '/tickets' -%></li>
87   <% end -%>
88   <% if current_user.create_tickets? -%>
89   <li><%= link_to 'New ticket', :controller => '/tickets', :action => 'new' -%></li>
90   <% end -%>
91   <% if current_user.view_milestones? -%>
92   <li><%= link_to 'Milestones', :controller => '/milestones' -%></li>
93   <% end -%>
94   <% if current_user.view_changesets? -%>
95   <li>Subversion: <%= link_to 'Changesets', :controller => '/repository', :action => 'changesets' -%></li>
96   <% end -%>
97   <% if current_user.view_code? -%>
98   <li>Subversion: <%= link_to 'Browse', :controller => '/repository', :action => 'browse', :path => nil -%></li>
99   <% end -%>
100   <% if current_user.view_changesets? -%>
101   <li>CVS: <a href="/viewer/revisions">Revisions</a></li>
102   <% end -%>
103   <% if current_user.view_code? -%>
104   <li>CVS: <a href="/viewer/view">Browse</a></li>
105   <% end -%>
106   <% if current_user.view_tickets? -%>
107   <li><%= link_to 'Search', :controller => '/search' -%></li>
108   <% end -%>
109   <% if current_user.admin? -%>
110   <li><%= link_to 'Admin', :controller => '/admin' -%></li>
111   <% end -%>
112   </ul>
113   </div>
  113 <p />
  114 <div class="template_sidebar_node">
  115 <h3>RSS feeds <%= image_tag("rss.gif") %></h3>
<p />
116   <div class="template_sidebar_node">
117   <h3>RSS feeds <%= image_tag("rss.gif") %></h3>
118  
119   <p />
120   <ul>
121   <% if @params["controller"] == 'repository' -%>
122   <li><%= link_to 'Changesets', :controller => 'rss', :action => 'changesets' %></li>
123   <% elsif @params["controller"] == 'tickets' -%>
124   <li><%= link_to 'Tickets', :controller => 'rss', :action => 'tickets' %></li>
125   <% end -%>
126   <li><%= link_to 'Everything!', :controller => 'rss', :action => 'all' %></li>
127   <li><%= link_to 'More feeds...', :controller => 'rss', :action => 'index' -%></li>
128   </ul>
129   </div>
  118 <ul>
  119 <% if @params["controller"] == 'repository' -%>
  120 <li><%= link_to 'Changesets', :controller => 'rss', :action => 'changesets' %></li>
  121 <% elsif @params["controller"] == 'tickets' -%>
  122 <li><%= link_to 'Tickets', :controller => 'rss', :action => 'tickets' %></li>
  123 <% end -%>
  124 <li><%= link_to 'Everything!', :controller => 'rss', :action => 'all' %></li>
  125 <li><%= link_to 'More feeds...', :controller => 'rss', :action => 'index' -%></li>
  126 </ul>
</div>
131   </td>
132   </tr>
133   </table>
134   <br />
  128 </div>
  129 </div>
  130 </div>
136   </div></div></div></div>
137  
<%= render 'shared/fixed_footer' %>
</body>
</html>

rool/rails/collaboa/trunk/app/views/shared/_powered.rhtml:

prev.current 
1   --><%= link_to(image_tag('logo_small', :alt => 'Visit Collaboa.org', :align => 'left', :style => 'border: none;' ), 'http://collaboa.org/') %>&nbsp;Powered&nbsp;by&nbsp;<a href="http://collaboa.org/">Collaboa</a><!--
  1 -->Powered&nbsp;by&nbsp;<a href="http://theexciter.com/articles/collaboa-reloaded.html">Collaboa</a><!--

rool/rails/collaboa/trunk/app/views/tickets/show.rhtml:

prev.current 
<h3>Changelog:</h3>
<div id="ticket-changes">
<% first = false; end -%>
  51 <div id="ticket-change-entry">
  52 <h4>Modified by <%= format_author change.author -%> <%= change.created_at.strftime('%a, %B %d %Y - %H:%M:%S %Z') -%></h4>
  53 <ul>
  54 <% change.each_log do |log_entry| -%>
  55 <li><%= format_changes log_entry %></li>
  56 <% end -%>
  57 <% if change.has_attachment? -%>
  58 <li><strong>Attachment</strong> added: <%= link_to(change.attachment, :action => "attachment", :id => change.id) %></li>
  59 <% end -%>
  60 </ul>
52   <h4>Modified by <%= format_author change.author -%> <%= change.created_at.strftime('%a, %B %d %Y - %H:%M:%S %Z') -%></h4>
53   <ul>
54   <% change.each_log do |log_entry| -%>
55   <li><%= format_changes log_entry %></li>
56   <% end -%>
57   <% if change.has_attachment? -%>
58   <li><strong>Attachment</strong> added: <%= link_to(change.attachment, :action => "attachment", :id => change.id) %></li>
59   <% end -%>
60   </ul>
61  
62   <% unless change.comment.nil? -%>
63   <div id="ticket-change-comment"><%= make_links(htmlize(change.comment)) %></div>
64   <% end -%>
  62 <% unless change.comment.nil? -%>
  63 <div id="ticket-change-comment"><%= make_links(htmlize(change.comment)) %></div>
  64 <% end -%>
  65 </div>
<% end -%>
<% unless first -%>
</div>

rool/rails/collaboa/trunk/public/stylesheets/screen.css:

prev.current 
* Based on the Collaboa default stylesheet.
*/
6   @import url("/css/risc_os_open.css");
  6 @import url("/css/risc_os_open_2011.css");
/* Some general properties */
... ...
border-bottom: 1px dotted;
}
25   div#content h1
  25 div#ticket h1
{
padding: 0;
font-size: 160%;
margin-bottom: 10px;
}
32   div#content h2
  32 div#ticket h2
{
font-size: 140%;
}
37   div#content h3
  37 div#ticket h3
{
margin: 10px 0;
}
... ...
background: #ffc;
border: 1px solid #aaa;
padding: 10px;
  309 margin: 20px 0;
}
#ticket h1 {border: none; margin-bottom: 10px;}
... ...
float: right;
}
322   table.ticket-details
  323 table#ticket-details
{
margin: 20px auto 20px auto;
width: 90%;
border-collapse: collapse;
}
329   table.ticket-details tr td
  330 table#ticket-details tr td
{
border-bottom: 1px solid #eea;
font-size: 80%;
}
335   table.ticket-details tr td.info
  336 table#ticket-details tr td.info
{
width: 100px;
color: #650;
... ...
fieldset table tr td { padding: 3px 5px 3px 5px; }
fieldset table tr.set-status { background: #ddd; }
345   #ticket-changes { margin: 0 20px 10px 20px; }
  346 #ticket-changes
  347 {
  348 margin: 20px;
  349 }
#ticket-changes h4
{
... ...
color: #888;
border-bottom: 1px solid #eee;
margin-bottom: 5px;
354   margin-top: 20px;
}
#ticket-changes ul
... ...
padding: 1px;
}
  379 #ticket-change-entry
  380 {
  381 background: #f0f0f0 url( /images/risc_os_open/top_fade.png ) top left repeat-x;
  382 padding: 15px;
  383 margin-bottom: 1em;
  384 color: #333;
  385
  386 /* border-radius: 8px; */ /* Valid, but the W3C CSS3 validator is buggy and complains - and has since 2006! */
  387 -moz-border-radius: 8px;
  388 -webkit-border-radius: 8px;
  389
  390 box-shadow: 0px 0px 5px #888;
  391 -moz-box-shadow: #888 0 0 5px;
  392 -webkit-box-shadow: #888 0 0 5px;
  393 }
  394
#ticket-change-comment ul
{
margin-top: 0;
... ...
.ticket-next-prev
{
text-align: right;
429   margin-bottom: -18px;
  448 margin-bottom: -12px;
}
/**

Search tickets

Social

Follow us on and

ROOL Store

Buy RISC OS Open merchandise here, including SD cards for Raspberry Pi and more.

Donate! Why?

Help ROOL make things happen – please consider donating!

RISC OS IPR

RISC OS is an Open Source operating system owned by RISC OS Developments Ltd and licensed primarily under the Apache 2.0 license.

Options

  • Tickets
  • New ticket
  • Milestones
  • Subversion: Changesets
  • Subversion: Browse
  • CVS: Revisions
  • CVS: Browse
  • Search

RSS feeds Rss

  • Changesets
  • Everything!
  • More feeds...
Contact Us  |  About Us

The RISC OS Open Collaboa theme is distantly based on the Collaboa default layout
Site design © RISC OS Open Limited 2024 except where indicated

Hosted by Arachsys

Powered by Collaboa
This site runs on Rails