Author: echatellier Date: 2016-02-09 15:31:57 +0100 (Tue, 09 Feb 2016) New Revision: 63 Url: http://forge.nuiton.org/projects/nuiton-redmine-site/repository/revisions/63 Log: fixes #3874: Support gitlab scm url Modified: cl_overview_project/trunk/app/views/hooks/cl_overview_project/_view_projects_show_left.erb cl_overview_project/trunk/init.rb Modified: cl_overview_project/trunk/app/views/hooks/cl_overview_project/_view_projects_show_left.erb =================================================================== --- cl_overview_project/trunk/app/views/hooks/cl_overview_project/_view_projects_show_left.erb 2014-10-08 07:50:15 UTC (rev 62) +++ cl_overview_project/trunk/app/views/hooks/cl_overview_project/_view_projects_show_left.erb 2016-02-09 14:31:57 UTC (rev 63) @@ -1,4 +1,4 @@ -<% +<% if $PROGRAM_NAME.include?("redmine-chorem") domain = "chorem.org" domainsonar = "org.chorem" @@ -8,7 +8,7 @@ domain = "nuiton.org" domainsonar = "org.nuiton" domainmaven = "org/nuiton" - else + else domain = "codelutin.com" domainsonar = "com.codelutin.forge" domainmaven = "forge.codelutin.com" @@ -17,7 +17,7 @@ mavenrepo = "" mavencentral = false scmType = "" -@project.custom_values.each do |custom_value| +@project.custom_values.each do |custom_value| if custom_value.custom_field.name == "maven-release-repository" && !custom_value.value.empty? mavenrepo=custom_value.value if mavenrepo == "https://nexus.nuiton.org/nexus/content/repositories/central-releases/" @@ -44,25 +44,25 @@ %> -<link href="/plugin_assets/cl_overview_project/stylesheets/cl_overview_project.css" media="screen" rel="stylesheet" type="text/css" /> +<link href="/plugin_assets/cl_overview_project/stylesheets/cl_overview_project.css" media="screen" rel="stylesheet" type="text/css" /> - <div class="web-site box"> + <div class="web-site box"> <h3 class="icon22">Site web</h3> <ul> - <li>Site web : <a href="https://doc.<%=domain%>/<%=@project.identifier%>" + <li>Site web : <a href="https://doc.<%=domain%>/<%=@project.identifier%>" class="external">https://doc.<%=domain%>/<%=@project.identifier%></a></li> - <% unless @project.homepage.blank? %><li>Demo : <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %> + <% unless @project.homepage.blank? %><li>Demo : <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %> <li><a href="<%=@project.identifier%>/files">Download</a></li> </ul> </div> - <div class="listes box"> + <div class="listes box"> <h3 class="icon22">Listes</h3> <ul> - <li>Liste pour que les utilisateurs puissent échanger : <a + <li>Liste pour que les utilisateurs puissent échanger : <a href="https://ml.<%=domain%>/cgi-bin/mailman/listinfo/<%=@project.identifier%>-users" class="external"><%=@project.identifier%>-users</a></li> - <li>Liste de discussion des développeurs : <a href="https://ml.<%=domain%>/cgi-bin/mailman/listinfo/<%=@project.identifier%>-devel" + <li>Liste de discussion des développeurs : <a href="https://ml.<%=domain%>/cgi-bin/mailman/listinfo/<%=@project.identifier%>-devel" class="external"><%=@project.identifier%>-devel</a></li> <li>Liste recevant tous les commits <%=scmType%> : <a href="https://ml.<%=domain%>/cgi-bin/mailman/listinfo/<%=@project.identifier%>-commits" class="external"><%=@project.identifier%>-commits</a></li> <li>Liste recevant toutes les notification de build Jenkins : <a href="https://ml.<%=domain%>/cgi-bin/mailman/listinfo/<%=@project.identifier%>-build" class="external"><%=@project.identifier%>-build</a></li> @@ -69,15 +69,18 @@ </ul> </div> - <div class="dev box"> + <div class="dev box"> <h3 class="icon22">Environnement de développement</h3> <ul> <% if scmType == "svn" %> - <li><a href="https://svn.<%=domain%>/<%=@project.identifier%>" class="external">Dépot des sources (SVN)</a></li> + <li><a href="https://svn.<%=domain%>/<%=@project.identifier%>" class="external">Dépot des sources (SVN)</a></li> <% end %> <% if scmType == "git" %> - <li><a href="https://git.<%=domain%>/<%=@project.identifier%>.git" class="external">Dépot des sources (GIT)</a></li> + <li><a href="https://git.<%=domain%>/<%=@project.identifier%>.git" class="external">Dépot des sources (GIT)</a></li> <% end %> + <% if scmType == "gitlab" %> + <li><a href="https://gitlab.nuiton.org/codelutin/<%=@project.identifier%>.git" class="external">Dépot des sources (GIT)</a></li> + <% end %> <li><a href="https://ci.<%=domain%>/jenkins/job/<%=@project.identifier%>-ci" class="external">Integration continue (Jenkins)</li> <li><a href="https://ci.<%=domain%>/jenkins/job/<%=@project.identifier%>-nightly" class="external">Nightly Build (Jenkins)</li> <% if scmType == "git" %> @@ -84,9 +87,9 @@ <li><a href="https://ci.<%=domain%>/jenkins/job/<%=@project.identifier%>-doc" class="external">Master Documentation Build (Jenkins)</li> <% end %> <li><a href="https://qa.<%=domain%>/project/index/<%=domainsonar%>:<%=@project.identifier%>" class="external">Analyses et metrics du code (Sonar)</li> - <li><a href="<%=mavenrepo%><%=domainmaven%>/<%=@project.identifier%>" class="external">Dépot des binaires (Maven)</a> + <li><a href="<%=mavenrepo%><%=domainmaven%>/<%=@project.identifier%>" class="external">Dépot des binaires (Maven)</a> <% if mavencentral == true %> - <a href="http://repo1.maven.org/maven2/<%=domainmaven%>/<%=@project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> + <a href="http://repo1.maven.org/maven2/<%=domainmaven%>/<%=@project.identifier%>" class="icon22 mavencentral">synchronized on Central</a> <% end %> </li> </ul> Modified: cl_overview_project/trunk/init.rb =================================================================== --- cl_overview_project/trunk/init.rb 2014-10-08 07:50:15 UTC (rev 62) +++ cl_overview_project/trunk/init.rb 2016-02-09 14:31:57 UTC (rev 63) @@ -6,8 +6,8 @@ name 'Custom Layout Overview Project' author 'Benjamin POUSSIN' description 'This plugin overwrite overview projet page to add list information' - version '0.0.3' + version '1.3' url 'http://www.nuiton.org' author_url 'http://www.nuiton.org/users/4' - + end