June 2011 - Nuiton-redmine-site-commits - mailman.cloud.codelutin.com

r30 - nuiton-theme/tags
by kcardineaud＠users.nuiton.org 22 Jun '11

22 Jun '11

Author: kcardineaud Date: 2011-06-22 11:52:43 +0200 (Wed, 22 Jun 2011) New Revision: 30 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/30 Log: create release 1.0 Added: nuiton-theme/tags/nuiton-theme-1.0/

1 0

r29 - cl-overview-project/tags
by kcardineaud＠users.nuiton.org 22 Jun '11

22 Jun '11

Author: kcardineaud Date: 2011-06-22 11:50:33 +0200 (Wed, 22 Jun 2011) New Revision: 29 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/29 Log: create release 1.0 Added: cl-overview-project/tags/cl-overview-project-1.0/

1 0

r28 - cl-overview-project/trunk/app/views/projects
by tchemit＠users.nuiton.org 22 Jun '11

22 Jun '11

Author: tchemit Date: 2011-06-22 11:13:21 +0200 (Wed, 22 Jun 2011) New Revision: 28 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/28 Log: Evolution #1599: Take account of the new forge.codelutin.com (report from tag 0.9 :() Modified: cl-overview-project/trunk/app/views/projects/show.rhtml Modified: cl-overview-project/trunk/app/views/projects/show.rhtml =================================================================== --- cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-21 13:57:50 UTC (rev 27) +++ cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-22 09:13:21 UTC (rev 28) @@ -1,8 +1,18 @@ <% if $PROGRAM_NAME.include?("redmine-chorem") - domain = "chorem" + domain = "chorem.org" + domainsonar = "org.chorem" + domainmaven = "org/chorem" else - domain = "nuiton" + if $PROGRAM_NAME.include?("redmine-nuiton") + domain = "nuiton.org" + domainsonar = "org.nuiton" + domainmaven = "org/nuiton" + else + domain = "forge.codelutin.com" + domainsonar = "com.codelutin.forge" + domainmaven = "forge.codelutin.com" + end end mavenrepo = "" mavencentral = false @@ -46,7 +56,7 @@ <div class="web-site box"> <h3 class="icon22">Site web</h3> <ul> - <li>Site web : <a href="http://maven-site.<%=domain%>.org/<%=(a)project.identifier%>" class="external">http://maven-site.<%=domain%>.org/<%=(a)project.identifier%></a></li> + <li>Site web : <a href="http://maven-site.<%=domain%>/<%=(a)project.identifier%>" class="external">http://maven-site.<%=domain%>/<%=(a)project.identifier%></a></li> <% unless @project.homepage.blank? %><li>Demo : <%= link_to(h((a)project.homepage), @project.homepage) %></li><% end %> <li><a href="<%=(a)project.identifier%>/files">Download</a></li> </ul> @@ -56,23 +66,23 @@ <div class="listes box"> <h3 class="icon22">Listes</h3> <ul> - <li>Liste pour que les utilisateurs puissent échanger : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external"><%=(a)project.identifier%>-users</a></li> - <li>Liste de discussion des développeurs : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external"><%=(a)project.identifier%>-devel</a></li> - <li>Liste recevant tous les commits svn : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external"><%=(a)project.identifier%>-commits</a></li> + <li>Liste pour que les utilisateurs puissent échanger : <a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external"><%=(a)project.identifier%>-users</a></li> + <li>Liste de discussion des développeurs : <a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external"><%=(a)project.identifier%>-devel</a></li> + <li>Liste recevant tous les commits svn : <a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external"><%=(a)project.identifier%>-commits</a></li> </ul> </div> <div class="dev box"> <h3 class="icon22">Environnement de développement</h3> <ul> - <li><a href="http://svn.<%=domain%>.org/svn/<%=(a)project.identifier%>" class="external">Dépot des sources (SVN)</a></li> - <li><a href="http://hudson.<%=domain%>.org/hudson/job/<%=(a)project.identifier%>" class="external">Integration continue (Jenkins)</li> - <li><a href="http://sonar.<%=domain%>.org/sonar/project/index/org.<%=domain%>:<%=(a)project.identifier%>" class="external">Analyses et metrics du code (Sonar)</li> -  + <li><a href="http://svn.<%=domain%>/svn/<%=(a)project.identifier%>" class="external">Dépot des sources (SVN)</a></li> + <li><a href="http://hudson.<%=domain%>/hudson/job/<%=(a)project.identifier%>" class="external">Integration continue (Hudson)</li> + <li><a href="http://sonar.<%=domain%>/sonar/project/index/<%=domainsonar%>:<%=(a)project.identifier%>" class="external">Analyses et metrics du code (Sonar)</li> +  - <li><a href="<%=mavenrepo%>org/<%=domain%>/<%=(a)project.identifier%>" class="external">Dépot des binaires (Maven)</a> + <li><a href="<%=mavenrepo%><%=domainmaven%>/<%=(a)project.identifier%>" class="external">Dépot des binaires (Maven)</a> <% if mavencentral == true %> - <a href="http://repo1.maven.org/maven2/org/<%=domain%>/<%=(a)project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> + <a href="http://repo1.maven.org/maven2/<%=domainmaven%>/<%=(a)project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> <% end %> </li> </ul>

1 0

r27 - cl-overview-project/tags/cl-overview-project-0.9/app/views/projects
by tchemit＠users.nuiton.org 21 Jun '11

21 Jun '11

Author: tchemit Date: 2011-06-21 15:57:50 +0200 (Tue, 21 Jun 2011) New Revision: 27 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/27 Log: prise en compte du redmine forge.codelutin.com Modified: cl-overview-project/tags/cl-overview-project-0.9/app/views/projects/show.rhtml Modified: cl-overview-project/tags/cl-overview-project-0.9/app/views/projects/show.rhtml =================================================================== --- cl-overview-project/tags/cl-overview-project-0.9/app/views/projects/show.rhtml 2011-06-10 13:09:58 UTC (rev 26) +++ cl-overview-project/tags/cl-overview-project-0.9/app/views/projects/show.rhtml 2011-06-21 13:57:50 UTC (rev 27) @@ -1,8 +1,18 @@ <% if $PROGRAM_NAME.include?("redmine-chorem") - domain = "chorem" + domain = "chorem.org" + domainsonar = "org.chorem" + domainmaven = "org/chorem" else - domain = "nuiton" + if $PROGRAM_NAME.include?("redmine-nuiton") + domain = "nuiton.org" + domainsonar = "org.nuiton" + domainmaven = "org/nuiton" + else + domain = "forge.codelutin.com" + domainsonar = "com.codelutin.forge" + domainmaven = "forge.codelutin.com" + end end mavenrepo = "" mavencentral = false @@ -23,7 +33,6 @@ <link href="/plugin_assets/redmine_projects/stylesheets/redmine_projects.css" media="screen" rel="stylesheet" type="text/css" /> - <div class="splitcontentleft"> <%= textilizable @project.description %> <ul> @@ -43,7 +52,7 @@ <div class="web-site box"> <h3 class="icon22">Site web</h3> <ul> - <li><a href="http://maven-site.<%=domain%>.org/<%=(a)project.identifier%>" class="external">Site web: http://maven-site.<%=domain%>.org/<%=(a)project.identifier%></a></li> + <li><a href="http://maven-site.<%=domain%>/<%=(a)project.identifier%>" class="external">Site web: http://maven-site.<%=domain%>/<%=(a)project.identifier%></a></li> <% unless @project.homepage.blank? %><li>Demo: <%= link_to(h((a)project.homepage), @project.homepage) %></li><% end %> <li><a href="<%=(a)project.identifier%>/files">Download</a></li> </ul> @@ -53,23 +62,23 @@ <div class="listes box"> <h3 class="icon22">Listes</h3> <ul> - <li><a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external"><%=(a)project.identifier%>-users</a> : Liste pour que les utilisateurs puissent échanger</li> - <li><a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external"><%=(a)project.identifier%>-devel</a> : Liste de discussion des développeurs</li> - <li><a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external"><%=(a)project.identifier%>-commmits</a> : Liste recevant tous les commits svn</li> + <li><a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external"><%=(a)project.identifier%>-users</a> : Liste pour que les utilisateurs puissent échanger</li> + <li><a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external"><%=(a)project.identifier%>-devel</a> : Liste de discussion des développeurs</li> + <li><a href="http://list.<%=domain%>/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external"><%=(a)project.identifier%>-commmits</a> : Liste recevant tous les commits svn</li> </ul> </div> <div class="dev box"> <h3 class="icon22">Environnement de développement</h3> <ul> - <li><a href="http://svn.<%=domain%>.org/svn/<%=(a)project.identifier%>" class="external">Dépot des sources (SVN)</a></li> - <li><a href="http://hudson.<%=domain%>.org/hudson/job/<%=(a)project.identifier%>" class="external">Integration continue (Hudson)</li> - <li><a href="http://sonar.<%=domain%>.org/sonar/project/index/org.<%=domain%>:<%=(a)project.identifier%>" class="external">Analyses et metrics du code (Sonar)</li> -  + <li><a href="http://svn.<%=domain%>/svn/<%=(a)project.identifier%>" class="external">Dépot des sources (SVN)</a></li> + <li><a href="http://hudson.<%=domain%>/hudson/job/<%=(a)project.identifier%>" class="external">Integration continue (Hudson)</li> + <li><a href="http://sonar.<%=domain%>/sonar/project/index/<%=domainsonar%>:<%=(a)project.identifier%>" class="external">Analyses et metrics du code (Sonar)</li> +  - <li><a href="<%=mavenrepo%>org/<%=domain%>/<%=(a)project.identifier%>" class="external">Dépot des binaires (Maven)</a> + <li><a href="<%=mavenrepo%><%=domainmaven%>/<%=(a)project.identifier%>" class="external">Dépot des binaires (Maven)</a> <% if mavencentral == true %> - <a href="http://repo1.maven.org/maven2/org/<%=domain%>/<%=(a)project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> + <a href="http://repo1.maven.org/maven2/<%=domainmaven%>/<%=(a)project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> <% end %> </li> </ul>

1 0

r26 - nuiton-theme/trunk/stylesheets
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 15:09:58 +0200 (Fri, 10 Jun 2011) New Revision: 26 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/26 Log: Delete a useless property Modified: nuiton-theme/trunk/stylesheets/application.css Modified: nuiton-theme/trunk/stylesheets/application.css =================================================================== --- nuiton-theme/trunk/stylesheets/application.css 2011-06-10 13:02:49 UTC (rev 25) +++ nuiton-theme/trunk/stylesheets/application.css 2011-06-10 13:09:58 UTC (rev 26) @@ -359,10 +359,6 @@ background:none; } -a.mavencentral { - padding-left:18px; -} - h2,h3 { border:none; }

1 0

r25 - cl-overview-project/trunk/app/views/projects
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 15:02:49 +0200 (Fri, 10 Jun 2011) New Revision: 25 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/25 Log: Change some link presentation in the box "listes" Modified: cl-overview-project/trunk/app/views/projects/show.rhtml Modified: cl-overview-project/trunk/app/views/projects/show.rhtml =================================================================== --- cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 13:00:49 UTC (rev 24) +++ cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 13:02:49 UTC (rev 25) @@ -56,9 +56,9 @@ <div class="listes box"> <h3 class="icon22">Listes</h3> <ul> - <li><%=(a)project.identifier%>-users : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external">Liste pour que les utilisateurs puissent échanger</a></li> - <li><%=(a)project.identifier%>-devel : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external">Liste de discussion des développeurs</a></li> - <li><%=(a)project.identifier%>-commits : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external">Liste recevant tous les commits svn</a></li> + <li>Liste pour que les utilisateurs puissent échanger : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-users" class="external"><%=(a)project.identifier%>-users</a></li> + <li>Liste de discussion des développeurs : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-devel" class="external"><%=(a)project.identifier%>-devel</a></li> + <li>Liste recevant tous les commits svn : <a href="http://list.<%=domain%>.org/cgi-bin/mailman/listinfo/<%=(a)project.identifier%>-commits" class="external"><%=(a)project.identifier%>-commits</a></li> </ul> </div>

1 0

r24 - cl-overview-project/trunk/assets/stylesheets
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 15:00:49 +0200 (Fri, 10 Jun 2011) New Revision: 24 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/24 Log: Fix the repeat background problem when the plugin is used without the nuiton style Modified: cl-overview-project/trunk/assets/stylesheets/cl-overview-project.css Modified: cl-overview-project/trunk/assets/stylesheets/cl-overview-project.css =================================================================== --- cl-overview-project/trunk/assets/stylesheets/cl-overview-project.css 2011-06-10 09:57:46 UTC (rev 23) +++ cl-overview-project/trunk/assets/stylesheets/cl-overview-project.css 2011-06-10 13:00:49 UTC (rev 24) @@ -1,7 +1,5 @@ a.mavencentral { - background-image:url('../images/mavencentral.png'); + background-repeat:no-repeat; + background-image:url('../images/mavencentral.png'); + padding-left:18px; } - -div.boxes { - margin-top:20px; -}

1 0

r23 - cl-overview-project/trunk/app/views/projects
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 11:57:46 +0200 (Fri, 10 Jun 2011) New Revision: 23 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/23 Log: #1552 Ajout de l'ic?\195?\180ne du sablier pour le temps pass?\195?\169 : plugin Modified: cl-overview-project/trunk/app/views/projects/show.rhtml Modified: cl-overview-project/trunk/app/views/projects/show.rhtml =================================================================== --- cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 09:56:56 UTC (rev 22) +++ cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 09:57:46 UTC (rev 23) @@ -117,6 +117,7 @@ </div> <% content_for :sidebar do %> + <div id="planning"> <h3>Planning</h3> <p><% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %> @@ -126,13 +127,19 @@ <% end %> </p> + </div> + + <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> + <div id="time"> <h3><%= l(:label_spent_time) %></h3> <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p> + </div> <% end %> <% end %> + <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>

1 0

r22 - in nuiton-theme/trunk: images/logopageprojet stylesheets
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 11:56:56 +0200 (Fri, 10 Jun 2011) New Revision: 22 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/22 Log: #1552 Ajout de l'ic?\195?\180ne du sablier pour le temps pass?\195?\169 : th?\195?\168me Modified: nuiton-theme/trunk/images/logopageprojet/logopageprojetplanning.png nuiton-theme/trunk/images/logopageprojet/logopageprojettempspasse.png nuiton-theme/trunk/stylesheets/application.css Modified: nuiton-theme/trunk/images/logopageprojet/logopageprojetplanning.png =================================================================== (Binary files differ) Modified: nuiton-theme/trunk/images/logopageprojet/logopageprojettempspasse.png =================================================================== (Binary files differ) Modified: nuiton-theme/trunk/stylesheets/application.css =================================================================== --- nuiton-theme/trunk/stylesheets/application.css 2011-06-10 09:15:01 UTC (rev 21) +++ nuiton-theme/trunk/stylesheets/application.css 2011-06-10 09:56:56 UTC (rev 22) @@ -341,12 +341,22 @@ line-height:0em; } +#planning { + background-image:url('../images/logopageprojet/logopageprojetplanning.png'); + background-repeat:no-repeat; + background-position:0px 28px; + padding-top:1px; +} + +#time { + background-image:url('../images/logopageprojet/logopageprojettempspasse.png'); + background-repeat:no-repeat; + background-position:4px 29px; + padding-top:1px; +} + .icon-time { background:none; - /* background-image:url('../images/logopageprojet/logopageprojettempspasse.png'); - background-repeat:no-repeat; - background-position:left top; */ - } a.mavencentral {

1 0

r21 - in nuiton-theme/trunk: images/logoentete stylesheets
by kcardineaud＠users.nuiton.org 10 Jun '11

10 Jun '11

Author: kcardineaud Date: 2011-06-10 11:15:01 +0200 (Fri, 10 Jun 2011) New Revision: 21 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/21 Log: #1584 Modify the icons home and projects Modified: nuiton-theme/trunk/images/logoentete/logonuitonaccueil.png nuiton-theme/trunk/images/logoentete/logonuitonprojet.png nuiton-theme/trunk/stylesheets/application.css Modified: nuiton-theme/trunk/images/logoentete/logonuitonaccueil.png =================================================================== (Binary files differ) Modified: nuiton-theme/trunk/images/logoentete/logonuitonprojet.png =================================================================== (Binary files differ) Modified: nuiton-theme/trunk/stylesheets/application.css =================================================================== --- nuiton-theme/trunk/stylesheets/application.css 2011-06-10 08:32:07 UTC (rev 20) +++ nuiton-theme/trunk/stylesheets/application.css 2011-06-10 09:15:01 UTC (rev 21) @@ -36,39 +36,35 @@ #top-menu a { background-image: url(../images/null.png); /*on définit une image par defaut*/ - padding-top: 53px; + padding-top: 102px; color:#000000; font-weight: bold; background-repeat: no-repeat; - background-position:center 20px; - padding-right: 10px; - padding-left: 10px; + background-position:center 65px; + padding-right: 12px; + padding-left: 12px; } /*définition des icones de la barre de navigation principale (logoentete)*/ #top-menu a.home { background-image: url(../images/logoentete/logonuitonaccueil.png); - background-position: 12px; - padding-top: 102px; + background-position: center center; } #top-menu a.my-page { background-image: url(../images/logoentete/iconebarreoutilmapage.png); - background-position: 12px; - padding-top: 67px; + background-position: center 51px; } #top-menu a.projects { background-image: url(../images/logoentete/logonuitonprojet.png); - padding-top: 62px; - background-position:9px 10px; + background-position:center 50px; } #top-menu a.administration { background-image: url(../images/logoentete/logonuitonadministration.png); - padding-top: 64px; - background-position:center 10px; + background-position:center 50px; } #top-menu a.help { display:none;

1 0