From tchemit@users.nuiton.org Wed Mar 21 12:21:21 2012
From: tchemit@users.nuiton.org
To: nuiton-redmine-site-commits@list.nuiton.org
Subject: [Nuiton-redmine-site-commits] r36 -
	cl-overview-project/trunk/app/views/projects
Date: Wed, 21 Mar 2012 12:21:21 +0100
Message-ID: <20120321112121.AC73A5A551@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1792603824215438369=="

--===============1792603824215438369==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2012-03-21 12:21:21 +0100 (Wed, 21 Mar 2012)
New Revision: 36

Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/36

Log:
fixes #2023 (templates are notc ompatible with redmine 1.3)

Added:
   cl-overview-project/trunk/app/views/projects/show.html.erb
Removed:
   cl-overview-project/trunk/app/views/projects/show.rhtml

Copied: cl-overview-project/trunk/app/views/projects/show.html.erb (from rev =
35, cl-overview-project/trunk/app/views/projects/show.rhtml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cl-overview-project/trunk/app/views/projects/show.html.erb	              =
          (rev 0)
+++ cl-overview-project/trunk/app/views/projects/show.html.erb	2012-03-21 11:=
21:21 UTC (rev 36)
@@ -0,0 +1,158 @@
+<%=20
+if $PROGRAM_NAME.include?("redmine-chorem")
+  domain =3D "chorem.org"
+  domainsonar =3D "org.chorem"
+  domainmaven =3D "org/chorem"
+else
+   if $PROGRAM_NAME.include?("redmine-nuiton")
+     domain =3D "nuiton.org"
+     domainsonar =3D "org.nuiton"
+     domainmaven =3D "org/nuiton"
+  else=20
+     domain =3D "forge.codelutin.com"
+     domainsonar =3D "com.codelutin.forge"
+     domainmaven =3D "forge.codelutin.com"
+  end
+end
+mavenrepo =3D ""
+mavencentral =3D false
+@project.custom_values.each do |custom_value|=20
+  if !custom_value.value.empty? && custom_value.custom_field.name =3D=3D "ma=
ven-release-repository"
+    mavenrepo=3Dcustom_value.value
+    if mavenrepo =3D=3D "http://nexus.nuiton.org/nexus/content/repositories/=
central-releases/"
+      mavencentral =3D true
+    end
+  end
+end
+
+if mavenrepo =3D=3D ""
+  mavenrepo =3D "http://nexus.nuiton.org/nexus/content/repositories/other-re=
leases/"
+end
+
+%>
+
+<link href=3D"/plugin_assets/cl-overview-project/stylesheets/cl-overview-pro=
ject.css" media=3D"screen" rel=3D"stylesheet" type=3D"text/css" />=20
+
+<%=3D textilizable @project.description %>
+
+	<ul>
+    <% if @subprojects.any? %>
+ 	<li><%=3Dl(:label_subproject_plural)%>: <%=3D @subprojects.collect{|p| lin=
k_to(h(p.name), :action =3D> 'show', :id =3D> p)}.join(", ") %></li>
+    <% end %>
+	<% if @project.parent %>
+	<li><%=3Dl(:field_parent)%>: <%=3D link_to h(@project.parent.name), :contro=
ller =3D> 'projects', :action =3D> 'show', :id =3D> @project.parent %></li>
+	<% end %>
+	<% @project.custom_values.each do |custom_value| %>
+	<% if !custom_value.value.empty? && ! custom_value =3D=3D "maven-release-re=
pository" %>
+	   <li><%=3D custom_value.custom_field.name%>: <%=3Dh show_value(custom_val=
ue) %></li>
+	<% end %>
+	<% end %>
+	</ul>=09
+
+<div class=3D"boxes">
+
+<div class=3D"splitcontentleft">
+
+  <div class=3D"web-site box">   =20
+    <h3 class=3D"icon22">Site web</h3>
+    <ul>
+	<li>Site web : <a href=3D"http://maven-site.<%=3Ddomain%>/<%=3D@project.ide=
ntifier%>" class=3D"external">http://maven-site.<%=3Ddomain%>/<%=3D@project.i=
dentifier%></a></li>
+	<% unless @project.homepage.blank? %><li>Demo : <%=3D link_to(h(@project.ho=
mepage), @project.homepage) %></li><% end %>=20
+        <li><a href=3D"<%=3D@project.identifier%>/files">Download</a></li>
+    </ul>
+  </div>
+
+
+  <div class=3D"listes box">   =20
+    <h3 class=3D"icon22">Listes</h3>
+    <ul>
+	<li>Liste pour que les utilisateurs puissent =C3=A9changer : <a href=3D"htt=
p://list.<%=3Ddomain%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-us=
ers" class=3D"external"><%=3D@project.identifier%>-users</a></li>
+	<li>Liste de discussion des d=C3=A9veloppeurs : <a href=3D"http://list.<%=
=3Ddomain%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-devel" class=
=3D"external"><%=3D@project.identifier%>-devel</a></li>
+	<li>Liste recevant tous les commits svn : <a href=3D"http://list.<%=3Ddomai=
n%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-commits" class=3D"ext=
ernal"><%=3D@project.identifier%>-commits</a></li>
+    </ul>
+  </div>
+
+  <div class=3D"dev box">   =20
+    <h3 class=3D"icon22">Environnement de d=C3=A9veloppement</h3>
+    <ul>
+	<li><a href=3D"http://svn.<%=3Ddomain%>/svn/<%=3D@project.identifier%>" cla=
ss=3D"external">D=C3=A9pot des sources (SVN)</a></li>
+	<li><a href=3D"http://ci.<%=3Ddomain%>/jenkins/job/<%=3D@project.identifier=
%>" class=3D"external">Integration continue (Hudson)</li>
+	<li><a href=3D"http://qa.<%=3Ddomain%>/sonar/project/index/<%=3Ddomainsonar=
%>:<%=3D@project.identifier%>" class=3D"external">Analyses et metrics du code=
 (Sonar)</li>
+	<!--li><a href=3D"http://maven.<%=3Ddomain%>/release/<%=3Ddomainmaven%>/<%=
=3D@project.identifier%>" class=3D"external">D=C3=A9pot des binaires (Maven)<=
/li-->
+
+	<li><a href=3D"<%=3Dmavenrepo%><%=3Ddomainmaven%>/<%=3D@project.identifier%=
>" class=3D"external">D=C3=A9pot des binaires (Maven)</a>=20
+        <% if mavencentral =3D=3D true %>
+          <a href=3D"http://repo1.maven.org/maven2/<%=3Ddomainmaven%>/<%=3D@=
project.identifier%>" class=3D"icon22 mavencentral">synchronized on Central</=
a>=20
+        <% end %>
+        </li>
+    </ul>
+  </div>
+=20
+</div>
+
+<div class=3D"splitcontentright">
+  <%=3D render :partial =3D> 'members_box' %>
+
+  <% if User.current.allowed_to?(:view_issues, @project) %>
+  <div class=3D"issues box">   =20
+    <h3><%=3Dl(:label_issue_tracking)%></h3>
+    <ul>
+    <% for tracker in @trackers %>   =20
+      <li><%=3D link_to tracker.name, :controller =3D> 'issues', :action =3D=
> 'index', :project_id =3D> @project,=20
+                                                :set_filter =3D> 1,=20
+                                                "tracker_id" =3D> tracker.id=
 %>:
+                                        <%=3D l(:label_x_open_issues_abbr_on=
_total, :count =3D> @open_issues_by_tracker[tracker].to_i,
+                                                                            =
                                                                             =
                                      =20
+                :total =3D> @total_issues_by_tracker[tracker].to_i) %>
+                        </li>
+    <% end %>
+    </ul>
+    <p>
+        <%=3D link_to l(:label_issue_view_all), :controller =3D> 'issues', :=
action =3D> 'index', :project_id =3D> @project, :set_filter =3D> 1 %>
+    </p>
+  </div>
+  <% end %>
+
+   =20
+  <% if @news.any? && authorize_for('news', 'index') %>
+  <div class=3D"last-news box">
+    <h3><%=3Dl(:label_news_latest)%></h3> =20
+    <%=3D render :partial =3D> 'news/news', :collection =3D> @news %>
+    <p><%=3D link_to l(:label_news_view_all), :controller =3D> 'news', :acti=
on =3D> 'index', :project_id =3D> @project %></p>
+  </div> =20
+  <% end %>
+</div>
+
+
+</div>
+
+<% content_for :sidebar do %>
+  <div id=3D"planning">
+    <h3>Planning</h3>
+        <p><% if User.current.allowed_to?(:view_calendar, @project, :global =
=3D> true) %>
+                                <%=3D link_to(l(:label_calendar), :controlle=
r =3D> 'calendars', :action =3D> 'show', :project_id =3D> @project) %>
+                        <% end %>
+                        <% if User.current.allowed_to?(:view_gantt, @project=
, :global =3D> true) %>
+                                | <%=3D link_to(l(:label_gantt), :controller=
 =3D> 'gantts', :action =3D> 'show', :project_id =3D> @project) %>
+                        <% end %>
+        </p>
+   =20
+  </div>
+
+ =20
+    <% if @total_hours && User.current.allowed_to?(:view_time_entries, @proj=
ect) %>
+   <div id=3D"time">
+    <h3><%=3D l(:label_spent_time) %></h3>
+    <p><span class=3D"icon icon-time"><%=3D l_hours(@total_hours) %></span><=
/p>
+    <p><%=3D link_to(l(:label_details), {:controller =3D> 'timelog', :action=
 =3D> 'index', :project_id =3D> @project}) %> |
+    <%=3D link_to(l(:label_report), {:controller =3D> 'time_entry_reports', =
:action =3D> 'report', :project_id =3D> @project}) %></p>
+   </div>
+    <% end %>
+<% end %>
+ =20
+
+<% content_for :header_tags do %>
+<%=3D auto_discovery_link_tag(:atom, {:controller =3D> 'activities', :action=
 =3D> 'index', :id =3D> @project, :format =3D> 'atom', :key =3D> User.current=
.rss_key}) %>
+<% end %>
+
+<% html_title(l(:label_overview)) -%>

Deleted: cl-overview-project/trunk/app/views/projects/show.rhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cl-overview-project/trunk/app/views/projects/show.rhtml	2012-03-19 19:00:=
49 UTC (rev 35)
+++ cl-overview-project/trunk/app/views/projects/show.rhtml	2012-03-21 11:21:=
21 UTC (rev 36)
@@ -1,158 +0,0 @@
-<%=20
-if $PROGRAM_NAME.include?("redmine-chorem")
-  domain =3D "chorem.org"
-  domainsonar =3D "org.chorem"
-  domainmaven =3D "org/chorem"
-else
-   if $PROGRAM_NAME.include?("redmine-nuiton")
-     domain =3D "nuiton.org"
-     domainsonar =3D "org.nuiton"
-     domainmaven =3D "org/nuiton"
-  else=20
-     domain =3D "forge.codelutin.com"
-     domainsonar =3D "com.codelutin.forge"
-     domainmaven =3D "forge.codelutin.com"
-  end
-end
-mavenrepo =3D ""
-mavencentral =3D false
-@project.custom_values.each do |custom_value|=20
-  if !custom_value.value.empty? && custom_value.custom_field.name =3D=3D "ma=
ven-release-repository"
-    mavenrepo=3Dcustom_value.value
-    if mavenrepo =3D=3D "http://nexus.nuiton.org/nexus/content/repositories/=
central-releases/"
-      mavencentral =3D true
-    end
-  end
-end
-
-if mavenrepo =3D=3D ""
-  mavenrepo =3D "http://nexus.nuiton.org/nexus/content/repositories/other-re=
leases/"
-end
-
-%>
-
-<link href=3D"/plugin_assets/cl-overview-project/stylesheets/cl-overview-pro=
ject.css" media=3D"screen" rel=3D"stylesheet" type=3D"text/css" />=20
-
-<%=3D textilizable @project.description %>
-
-	<ul>
-    <% if @subprojects.any? %>
- 	<li><%=3Dl(:label_subproject_plural)%>: <%=3D @subprojects.collect{|p| lin=
k_to(h(p.name), :action =3D> 'show', :id =3D> p)}.join(", ") %></li>
-    <% end %>
-	<% if @project.parent %>
-	<li><%=3Dl(:field_parent)%>: <%=3D link_to h(@project.parent.name), :contro=
ller =3D> 'projects', :action =3D> 'show', :id =3D> @project.parent %></li>
-	<% end %>
-	<% @project.custom_values.each do |custom_value| %>
-	<% if !custom_value.value.empty? && ! custom_value =3D=3D "maven-release-re=
pository" %>
-	   <li><%=3D custom_value.custom_field.name%>: <%=3Dh show_value(custom_val=
ue) %></li>
-	<% end %>
-	<% end %>
-	</ul>=09
-
-<div class=3D"boxes">
-
-<div class=3D"splitcontentleft">
-
-  <div class=3D"web-site box">   =20
-    <h3 class=3D"icon22">Site web</h3>
-    <ul>
-	<li>Site web : <a href=3D"http://maven-site.<%=3Ddomain%>/<%=3D@project.ide=
ntifier%>" class=3D"external">http://maven-site.<%=3Ddomain%>/<%=3D@project.i=
dentifier%></a></li>
-	<% unless @project.homepage.blank? %><li>Demo : <%=3D link_to(h(@project.ho=
mepage), @project.homepage) %></li><% end %>=20
-        <li><a href=3D"<%=3D@project.identifier%>/files">Download</a></li>
-    </ul>
-  </div>
-
-
-  <div class=3D"listes box">   =20
-    <h3 class=3D"icon22">Listes</h3>
-    <ul>
-	<li>Liste pour que les utilisateurs puissent =C3=A9changer : <a href=3D"htt=
p://list.<%=3Ddomain%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-us=
ers" class=3D"external"><%=3D@project.identifier%>-users</a></li>
-	<li>Liste de discussion des d=C3=A9veloppeurs : <a href=3D"http://list.<%=
=3Ddomain%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-devel" class=
=3D"external"><%=3D@project.identifier%>-devel</a></li>
-	<li>Liste recevant tous les commits svn : <a href=3D"http://list.<%=3Ddomai=
n%>/cgi-bin/mailman/listinfo/<%=3D@project.identifier%>-commits" class=3D"ext=
ernal"><%=3D@project.identifier%>-commits</a></li>
-    </ul>
-  </div>
-
-  <div class=3D"dev box">   =20
-    <h3 class=3D"icon22">Environnement de d=C3=A9veloppement</h3>
-    <ul>
-	<li><a href=3D"http://svn.<%=3Ddomain%>/svn/<%=3D@project.identifier%>" cla=
ss=3D"external">D=C3=A9pot des sources (SVN)</a></li>
-	<li><a href=3D"http://ci.<%=3Ddomain%>/jenkins/job/<%=3D@project.identifier=
%>" class=3D"external">Integration continue (Hudson)</li>
-	<li><a href=3D"http://qa.<%=3Ddomain%>/sonar/project/index/<%=3Ddomainsonar=
%>:<%=3D@project.identifier%>" class=3D"external">Analyses et metrics du code=
 (Sonar)</li>
-	<!--li><a href=3D"http://maven.<%=3Ddomain%>/release/<%=3Ddomainmaven%>/<%=
=3D@project.identifier%>" class=3D"external">D=C3=A9pot des binaires (Maven)<=
/li-->
-
-	<li><a href=3D"<%=3Dmavenrepo%><%=3Ddomainmaven%>/<%=3D@project.identifier%=
>" class=3D"external">D=C3=A9pot des binaires (Maven)</a>=20
-        <% if mavencentral =3D=3D true %>
-          <a href=3D"http://repo1.maven.org/maven2/<%=3Ddomainmaven%>/<%=3D@=
project.identifier%>" class=3D"icon22 mavencentral">synchronized on Central</=
a>=20
-        <% end %>
-        </li>
-    </ul>
-  </div>
-=20
-</div>
-
-<div class=3D"splitcontentright">
-  <%=3D render :partial =3D> 'members_box' %>
-
-  <% if User.current.allowed_to?(:view_issues, @project) %>
-  <div class=3D"issues box">   =20
-    <h3><%=3Dl(:label_issue_tracking)%></h3>
-    <ul>
-    <% for tracker in @trackers %>   =20
-      <li><%=3D link_to tracker.name, :controller =3D> 'issues', :action =3D=
> 'index', :project_id =3D> @project,=20
-                                                :set_filter =3D> 1,=20
-                                                "tracker_id" =3D> tracker.id=
 %>:
-                                        <%=3D l(:label_x_open_issues_abbr_on=
_total, :count =3D> @open_issues_by_tracker[tracker].to_i,
-                                                                            =
                                                                             =
                                      =20
-                :total =3D> @total_issues_by_tracker[tracker].to_i) %>
-                        </li>
-    <% end %>
-    </ul>
-    <p>
-        <%=3D link_to l(:label_issue_view_all), :controller =3D> 'issues', :=
action =3D> 'index', :project_id =3D> @project, :set_filter =3D> 1 %>
-    </p>
-  </div>
-  <% end %>
-
-   =20
-  <% if @news.any? && authorize_for('news', 'index') %>
-  <div class=3D"last-news box">
-    <h3><%=3Dl(:label_news_latest)%></h3> =20
-    <%=3D render :partial =3D> 'news/news', :collection =3D> @news %>
-    <p><%=3D link_to l(:label_news_view_all), :controller =3D> 'news', :acti=
on =3D> 'index', :project_id =3D> @project %></p>
-  </div> =20
-  <% end %>
-</div>
-
-
-</div>
-
-<% content_for :sidebar do %>
-  <div id=3D"planning">
-    <h3>Planning</h3>
-        <p><% if User.current.allowed_to?(:view_calendar, @project, :global =
=3D> true) %>
-                                <%=3D link_to(l(:label_calendar), :controlle=
r =3D> 'calendars', :action =3D> 'show', :project_id =3D> @project) %>
-                        <% end %>
-                        <% if User.current.allowed_to?(:view_gantt, @project=
, :global =3D> true) %>
-                                | <%=3D link_to(l(:label_gantt), :controller=
 =3D> 'gantts', :action =3D> 'show', :project_id =3D> @project) %>
-                        <% end %>
-        </p>
-   =20
-  </div>
-
- =20
-    <% if @total_hours && User.current.allowed_to?(:view_time_entries, @proj=
ect) %>
-   <div id=3D"time">
-    <h3><%=3D l(:label_spent_time) %></h3>
-    <p><span class=3D"icon icon-time"><%=3D l_hours(@total_hours) %></span><=
/p>
-    <p><%=3D link_to(l(:label_details), {:controller =3D> 'timelog', :action=
 =3D> 'index', :project_id =3D> @project}) %> |
-    <%=3D link_to(l(:label_report), {:controller =3D> 'time_entry_reports', =
:action =3D> 'report', :project_id =3D> @project}) %></p>
-   </div>
-    <% end %>
-<% end %>
- =20
-
-<% content_for :header_tags do %>
-<%=3D auto_discovery_link_tag(:atom, {:controller =3D> 'activities', :action=
 =3D> 'index', :id =3D> @project, :format =3D> 'atom', :key =3D> User.current=
.rss_key}) %>
-<% end %>
-
-<% html_title(l(:label_overview)) -%>


--===============1792603824215438369==--