# HG changeset patch
# User Chris Cannam
# Date 1382443208 -3600
# Node ID e52de09132b17da988377f07fc2746334aaed5f2
# Parent  ea2a09a0fd907be181faf6a8b872f17fb9cf88fe# Parent  58335cde0730ce4105208ea1d2eb2bc9ae813c9b
Merge from live branch

diff -r ea2a09a0fd90 -r e52de09132b1 config/routes.rb
--- a/config/routes.rb	Fri Oct 11 16:42:44 2013 +0100
+++ b/config/routes.rb	Tue Oct 22 13:00:08 2013 +0100
@@ -336,6 +336,7 @@
 
   match 'sys/projects', :to => 'sys#projects', :via => :get
   match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
+  match 'sys/projects/:id/repository_cache.:format', :controller => 'sys', :action => 'clear_repository_cache', :conditions => { :method => :post }
   match 'sys/projects/:id/embedded.:format', :controller => 'sys', :action => 'set_embedded_active', :conditions => { :method => :post }
   match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
 
diff -r ea2a09a0fd90 -r e52de09132b1 extra/soundsoftware/convert-external-repos.rb
--- a/extra/soundsoftware/convert-external-repos.rb	Fri Oct 11 16:42:44 2013 +0100
+++ b/extra/soundsoftware/convert-external-repos.rb	Tue Oct 22 13:00:08 2013 +0100
@@ -146,7 +146,7 @@
   if project.identifier.empty?
     log("\tno identifier for project #{project.name}")
     next
-  elsif not project.identifier.match(/^[a-z0-9\-]+$/)
+  elsif not project.identifier.match(/^[a-z0-9_\-]+$/)
     log("\tinvalid identifier for project #{project.name} : #{project.identifier}");
     next
   end
diff -r ea2a09a0fd90 -r e52de09132b1 extra/soundsoftware/reposman-soundsoftware.rb
--- a/extra/soundsoftware/reposman-soundsoftware.rb	Fri Oct 11 16:42:44 2013 +0100
+++ b/extra/soundsoftware/reposman-soundsoftware.rb	Tue Oct 22 13:00:08 2013 +0100
@@ -263,7 +263,7 @@
   if project.identifier.empty?
     log("\tno identifier for project #{project.name}!")
     next
-  elsif not project.identifier.match(/^[a-z0-9\-_]+$/)
+  elsif not project.identifier.match(/^[a-z0-9_\-]+$/)
     log("\tinvalid identifier for project #{project.name} : #{project.identifier}!");
     next;
   end
diff -r ea2a09a0fd90 -r e52de09132b1 plugins/redmine_bibliography/app/views/projects/show.html.erb
--- a/plugins/redmine_bibliography/app/views/projects/show.html.erb	Fri Oct 11 16:42:44 2013 +0100
+++ b/plugins/redmine_bibliography/app/views/projects/show.html.erb	Tue Oct 22 13:00:08 2013 +0100
@@ -58,19 +58,20 @@
 		<%= textilizable @project.description %>
 	</div>	
   <% end %>
-	<ul>
-	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li><% end %>
+  <div class="overviewfields">
+	<% unless @project.homepage.blank? %><h4><%=l(:field_homepage)%>:</h4><ul><li><%= link_to h(@project.homepage), @project.homepage %></li></ul><% end %>
   <% if @subprojects.any? %>
- 	<li><%=l(:label_subproject_plural)%>:
-	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ").html_safe %></li>
+ 	<h4><%=l(:label_subproject_plural)%>:</h4>
+          <ul>
+	    <li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>").html_safe %></li>
+          </ul>
   <% end %>
 	<% @project.visible_custom_field_values.each do |custom_value| %>
 	<% if !custom_value.value.blank? %>
-	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+	   <h4><%= custom_value.custom_field.name%>:</h4><ul><li><%=h show_value(custom_value) %></li></ul>
 	<% end %>
 	<% end %>
-	</ul>	
-
+  </div>
   <% if User.current.allowed_to?(:view_issues, @project) and @open_issues_by_tracker.values.any? %>
   <div class="issues box">    
     <h3><%=l(:label_issue_tracking)%></h3>
diff -r ea2a09a0fd90 -r e52de09132b1 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Fri Oct 11 16:42:44 2013 +0100
+++ b/public/stylesheets/application.css	Tue Oct 22 13:00:08 2013 +0100
@@ -762,9 +762,9 @@
 
 #roadmap table.progress td { height: 1.2em; }
 /***** Tabs *****/
-#content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
-#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
-#content .tabs ul li {
+#content .tabs, #content .tabs2 {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
+#content .tabs ul, #content .tabs2 ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
+#content .tabs ul li, #content .tabs2 ul li {
   float:left;
   list-style-type:none;
   white-space:nowrap;
@@ -773,7 +773,7 @@
   position:relative;
   margin-bottom:-1px;
 }
-#content .tabs ul li a{
+#content .tabs ul li a, #content .tabs2 ul li a {
   display:block;
   font-size: 0.9em;
   text-decoration:none;
@@ -788,19 +788,19 @@
   border-top-right-radius:3px;
 }
 
-#content .tabs ul li a:hover {
+#content .tabs ul li a:hover, #content .tabs2 ul li a:hover {
   background-color: #ffffdd;
   text-decoration:none;
 }
 
-#content .tabs ul li a.selected {
+#content .tabs ul li a.selected, #content .tabs2 ul li a.selected {
   background-color: #fff;
   border: 1px solid #bbbbbb;
   border-bottom: 1px solid #fff;
   color:#444;
 }
 
-#content .tabs ul li a.selected:hover {background-color: #fff;}
+#content .tabs ul li a.selected:hover, #content .tabs2 ul li a.selected:hover {background-color: #fff;}
 
 div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
 
diff -r ea2a09a0fd90 -r e52de09132b1 public/themes/soundsoftware/stylesheets/application.css
--- a/public/themes/soundsoftware/stylesheets/application.css	Fri Oct 11 16:42:44 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Tue Oct 22 13:00:08 2013 +0100
@@ -158,6 +158,9 @@
 
 .wiki p, .wiki li { margin-left: 30px; margin-right: 3em; }
 
+.overviewfields h4 { margin-left: 30px; margin-bottom: 0; }
+.overviewfields ul { margin-top: 0; }
+
 .repository-info .wiki p { margin-left: 0 }
 
 div.issue { background: #fdfaf0; border: 1px solid #a9b680; border-left: 4px solid #a9b680; }
@@ -231,16 +234,25 @@
 .TableRowColor td { background-color: #fdfbf5; color: #000000; border: 0; }
 .NavBarCell1 { background-color: #ffe69b; color:#000000 }
 
-.embedded table { border: 0px solid #fff; }
-.embedded h3 { margin-top: 0.5em; }
-.embedded hr { color: #a9b680; background-color: #a9b680 }
-.embedded center { text-align: left; } /* haha */
+.controller-redmine_embedded table { border: 0px solid #fff; }
+.controller-redmine_embedded h3 { margin-top: 0.5em; }
+.controller-redmine_embedded hr { color: #a9b680; background-color: #a9b680 }
+.controller-redmine_embedded center { text-align: left; } /* haha */
+.controller-redmine_embedded th { font-weight: normal; text-align: left; }
+.controller-redmine_embedded caption { text-align: left; font-weight: bold; font-size: 14px; margin-top: 1em; }
+.controller-redmine_embedded li.blockList { list-style-type: none; }
+
+.controller-redmine_embedded .summary { font-style: normal; margin-bottom: 1.5em; }
 
 /* Special hack to hide the FRAMES | NO FRAMES links -- they don't
    work in this context -- and right-align the All Classes and Detail links */
-.embedded .NavBarCell2 a[target=_top] { width: 0px; visibility: hidden; }
-.embedded .NavBarCell2 + .NavBarCell2 { text-align: right; }
-.embedded .NavBarCell3 + .NavBarCell3 { text-align: right; }
+.controller-redmine_embedded .NavBarCell2 a[target=_top] { width: 0px; visibility: hidden; }
+.controller-redmine_embedded .NavBarCell2 + .NavBarCell2 { text-align: right; }
+.controller-redmine_embedded .NavBarCell3 + .NavBarCell3 { text-align: right; }
+
+.topNav, .bottomNav { position: relative; overflow: hidden; }
+.topNav ul li, .bottomNav ul li { float: left; list-style-type: none; margin-right: 14px; position: relative; font-weight: bold; }
+.controller-redmine_embedded .subNav .navList { display: none; }
 
 /* For Doxygen in Embedded context (though note some of the Javadoc
    rules will also apply to Doxygen): */
@@ -251,37 +263,33 @@
 .memTemplItemLeft,
 .memTemplItemRight,
 .indexkey,
-.indexvalue,
 .memproto,
 .memproto td,
-.memdoc a,
-.embedded li .el,
-.embedded a.el { font-family: monospace; }
+.memdoc a { font-family: 'SourceCodePro-Regular', monospace; font-size: 0.9em; font-weight: normal; }
 
-.embedded .memTemplParams { font-style: italic; }
+.controller-redmine_embedded .memTemplParams { font-style: italic; }
 
-.embedded .memItemRight a:first-child,
-.embedded .memTemplItemRight a:first-child,
-.embedded .indexkey a:first-child,
-.embedded a.el,
-.embedded .memdoc a { font-weight: bold; } /* function names, etc */
+.controller-redmine_embedded #projectname,
+.controller-redmine_embedded .title { font-weight: bold; font-size: 14px; }
 
-.embedded .memitem { border-bottom: 1px solid #a9b680; padding-top: 0.5em; } 
-.embedded .memitem:last-child { border-bottom: 0px; } 
+.controller-redmine_embedded h2 { font-size: 16px; } 
 
-.embedded .contents { margin-top: 0.5em; }
-.embedded .contents td { padding: 0px; }
+.controller-redmine_embedded .memitem { border-bottom: 1px solid #a9b680; padding-top: 0.5em; } 
+.controller-redmine_embedded .memitem:last-child { border-bottom: 0px; } 
 
-.embedded .contents h1,
-.embedded .contents h2,
-.embedded .navigation h1,
-.embedded .navigation h2 { padding-top: 0.5em; padding-bottom: 0.25em; }
+.controller-redmine_embedded .contents { margin-top: 0.5em; }
+.controller-redmine_embedded .contents td { padding: 0px; }
 
-.embedded .contents .center { text-align: center; } /* undo javadoc hack above */
+.controller-redmine_embedded .contents h1,
+.controller-redmine_embedded .contents h2,
+.controller-redmine_embedded .navigation h1,
+.controller-redmine_embedded .navigation h2 { padding-top: 1em; padding-bottom: 0; }
+
+.controller-redmine_embedded .contents .center { text-align: center; } /* undo javadoc hack above */
 
 /* For MATLAB documentation */
 
-.embedded #matlabdoc th { text-align: left; }
+.controller-redmine_embedded #matlabdoc th { text-align: left; }
 
 /* autocomplete positioning fix */
 div.autocomplete {