Merge pull request #382 from devhub-tud/private-project-breadcrumb

Private project breadcrumb
devhub-tud · May 19, 2016 · d8f95ce · d8f95ce
2 parents f6f5732 + caa8f24
commit d8f95ce
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 47 deletions.
diff --git a/src/main/resources/templates/components/project-frameset.ftl b/src/main/resources/templates/components/project-frameset.ftl
@@ -1,10 +1,15 @@
-[#macro renderBreadcrumb i18n group]
-    <ol class="breadcrumb hidden-xs">
-        <li><a href="/courses">${ i18n.translate("section.courses") }</a></li>
-        <li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
-        <li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
-        <li class="active">Group ${group.getGroupNumber()}</li>
-    </ol>
+[#macro renderBreadcrumb i18n group repositoryEntity]
+	<ol class="breadcrumb hidden-xs">
+		[#if group?? && group?has_content]
+			<li><a href="/courses">${ i18n.translate("section.courses") }</a></li>
+			<li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
+			<li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
+			<li class="active">Group ${group.getGroupNumber()}</li>
+		[#elseif repositoryEntity?? && repositoryEntity?has_content]
+			<li><a href="/projects">${ i18n.translate("section.projects") }</a></li>
+			<li><a href="${repositoryEntity.getURI()}">${repositoryEntity.getTitle()}</a></li>
+		[/#if]
+	</ol>
 [/#macro]
 
 [#macro renderSidemenu currentTab i18n group repository]

diff --git a/src/main/resources/templates/courses/assignments/group-assignment-view.ftl b/src/main/resources/templates/courses/assignments/group-assignment-view.ftl
@@ -6,7 +6,7 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-    [@projectFrameset.renderBreadcrumb i18n group/]
+    [@projectFrameset.renderBreadcrumb i18n group repositoryEntity/]
 
     <div class="row">
         <div class="col-md-10 col-md-offset-2">

diff --git a/src/main/resources/templates/courses/assignments/group-assignments.ftl b/src/main/resources/templates/courses/assignments/group-assignments.ftl
@@ -5,7 +5,7 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-    [@projectFrameset.renderBreadcrumb i18n group/]
+    [@projectFrameset.renderBreadcrumb i18n group repositoryEntity/]
 
     <div class="row">
         <div class="col-md-10 col-md-offset-2">

diff --git a/src/main/resources/templates/courses/assignments/group-delivery-review.ftl b/src/main/resources/templates/courses/assignments/group-delivery-review.ftl
@@ -6,7 +6,7 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-    [@projectFrameset.renderBreadcrumb i18n group/]
+    [@projectFrameset.renderBreadcrumb i18n group repositoryEntity/]
 
     <div class="row">
         <div class="col-md-10 col-md-offset-2">

diff --git a/src/main/resources/templates/courses/assignments/group-pulls.ftl b/src/main/resources/templates/courses/assignments/group-pulls.ftl
@@ -6,8 +6,8 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-  [#if group?? && group?has_content]
-      [@projectFrameset.renderBreadcrumb i18n group/]
+  [#if repositoryEntity?? && repositoryEntity?has_content]
+      [@projectFrameset.renderBreadcrumb i18n group![] repositoryEntity/]
   [/#if]
 
     <div class="row">

diff --git a/src/main/resources/templates/macros.ftl b/src/main/resources/templates/macros.ftl
@@ -103,14 +103,18 @@
 	[/#list]
 [/#macro]
 
-[#macro renderCommitHeader i18n group commit currentView]
-	[#if group?? && group?has_content]
+[#macro renderCommitHeader i18n group repositoryEntity commit currentView]
+	[#if repositoryEntity?? && repositoryEntity?has_content]
 			<ol class="breadcrumb hidden-xs">
-
-                <li><a href="/courses">${ i18n.translate("section.courses") }</a></li>
-				<li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
-				<li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
-				<li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
+				[#if group?? && group?has_content]
+					<li><a href="/courses">${ i18n.translate("section.courses") }</a></li>
+					<li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
+					<li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
+					<li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
+				[#else]
+					<li><a href="/projects">${ i18n.translate("section.projects") }</a></li>
+					<li><a href="${repositoryEntity.getURI()}">${repositoryEntity.getTitle()}</a></li>
+				[/#if]
 	[#if commit.getMessage()?length > 30 ]		
 				<li class="active">${commit.getMessage()?substring(0,30)}...</li>
 	[#else]

diff --git a/src/main/resources/templates/project-commit-view.ftl b/src/main/resources/templates/project-commit-view.ftl
@@ -2,7 +2,7 @@
 [@macros.renderHeader i18n.translate("section.projects") /]
 [@macros.renderMenu i18n user /]
 		<div class="container">
-[@macros.renderCommitHeader i18n group![] commit i18n.translate("commit.view-build-log")/]
+[@macros.renderCommitHeader i18n group![] repositoryEntity commit i18n.translate("commit.view-build-log")/]
 [#if buildResult?? && buildResult?has_content]
 			<h4>${i18n.translate("commit.build-log.title")}</h4>
 			<div class="well">

diff --git a/src/main/resources/templates/project-contributors.ftl b/src/main/resources/templates/project-contributors.ftl
@@ -14,8 +14,8 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-[#if group?? && group?has_content]
-[@projectFrameset.renderBreadcrumb i18n group/]
+[#if repositoryEntity?? && repositoryEntity?has_content]
+[@projectFrameset.renderBreadcrumb i18n group![] repositoryEntity/]
 [/#if]
 
     <div class="row">

diff --git a/src/main/resources/templates/project-diff-view.ftl b/src/main/resources/templates/project-diff-view.ftl
@@ -9,7 +9,7 @@
         <div class="container">
 
 
-    [@macros.renderCommitHeader i18n group![] commit i18n.translate("commit.view-diff")/]
+    [@macros.renderCommitHeader i18n group![] repositoryEntity commit i18n.translate("commit.view-diff")/]
 
     [#if diffViewModel?? && diffViewModel?has_content]
         [#list diffViewModel.diffs as diffModel]

diff --git a/src/main/resources/templates/project-file-view.ftl b/src/main/resources/templates/project-file-view.ftl
@@ -6,7 +6,7 @@
 [@macros.renderHeader i18n.translate("section.projects") /]
 [@macros.renderMenu i18n user /]
 		<div class="container">
-[@macros.renderCommitHeader i18n group![] commit i18n.translate("commit.view-files") /]
+[@macros.renderCommitHeader i18n group![] repositoryEntity commit i18n.translate("commit.view-files") /]
 			<div class="diff box">
 				<div class="header">
 				  	<span class="pull-right hidden-xs buttons">

diff --git a/src/main/resources/templates/project-folder-view.ftl b/src/main/resources/templates/project-folder-view.ftl
@@ -2,7 +2,7 @@
 [@macros.renderHeader i18n.translate("section.projects") /]
 [@macros.renderMenu i18n user /]
 		<div class="container">
-[@macros.renderCommitHeader i18n group![] commit i18n.translate("commit.view-files")/]
+[@macros.renderCommitHeader i18n group![] repositoryEntity commit i18n.translate("commit.view-files")/]
 [@macros.renderFileTreeExplorer group![] commit repository path entries /]
 [@macros.renderScripts /]
 [@macros.renderFooter /]
diff --git a/src/main/resources/templates/project-pull-diff-view.ftl b/src/main/resources/templates/project-pull-diff-view.ftl
@@ -8,15 +8,20 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-[#if group?? && group?has_content]
-    <ol class="breadcrumb">
-        <li><a href="/courses">${i18n.translate("section.projects")}</a></li>
-    [#-- <li><a href="/courses/${group.course.code}/groups/${group.groupNumber}">${group.getGroupName()}</a></li> --]
-	    <li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
-	    <li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
-	    <li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
-	    <li><a href="${group.getURI()}pulls">${i18n.translate("section.pull-requests")}</a></li>
-      <li class="active">Pull Request ${pullRequest.getIssueId()}</li>
+[#if repositoryEntity?? && repositoryEntity?has_content]
+    <ol class="breadcrumb">	
+		[#if group?? && group?has_content]
+			<li><a href="/courses">${i18n.translate("section.projects")}</a></li>
+			[#-- <li><a href="/courses/${group.course.code}/groups/${group.groupNumber}">${group.getGroupName()}</a></li> --]
+			<li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
+			<li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
+			<li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
+			<li><a href="${group.getURI()}pulls">${i18n.translate("section.pull-requests")}</a></li>
+		[#else]		
+			<li><a href="/projects">${ i18n.translate("section.projects") }</a></li>
+			<li><a href="${repositoryEntity.getURI()}">${repositoryEntity.getTitle()}</a></li>
+		[/#if]
+		<li class="active">Pull Request ${pullRequest.getIssueId()}</li>
     </ol>
 [/#if]
 

diff --git a/src/main/resources/templates/project-pull.ftl b/src/main/resources/templates/project-pull.ftl
@@ -9,16 +9,21 @@
 <div class="container">
 
 
-[#if group?? && group?has_content]
-    <ol class="breadcrumb">
-        <li><a href="/courses">${i18n.translate("section.projects")}</a></li>
-        [#-- <li><a href="/courses/${group.course.code}/groups/${group.groupNumber}">${group.getGroupName()}</a></li> --]
-	    <li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
-	    <li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
-	    <li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
-        <li><a href="${group.getURI()}pulls">${i18n.translate("section.pull-requests")}</a></li>
-        <li class="active">Pull Request ${pullRequest.getIssueId()}</li>
-    </ol>
+[#if repositoryEntity?? && repositoryEntity?has_content]
+	<ol class="breadcrumb">
+		[#if group?? && group?has_content]
+			<li><a href="/courses">${i18n.translate("section.projects")}</a></li>
+			[#-- <li><a href="/courses/${group.course.code}/groups/${group.groupNumber}">${group.getGroupName()}</a></li> --]
+			<li><a href="${group.course.course.getURI()}">${group.course.course.code} - ${group.course.course.name}</a></li>
+			<li><a href="${group.course.getURI()}">${group.course.timeSpan.start?string["yyyy"]}[#if group.course.timeSpan.end??] - ${group.course.timeSpan.end?string["yyyy"]}[/#if]</a></li>
+			<li><a href="${group.getURI()}">Group ${group.getGroupNumber()}</a></li>
+			<li><a href="${group.getURI()}pulls">${i18n.translate("section.pull-requests")}</a></li>
+		[#else]	
+			<li><a href="/projects">${ i18n.translate("section.projects") }</a></li>
+			<li><a href="${repositoryEntity.getURI()}">${repositoryEntity.getTitle()}</a></li>
+		[/#if]
+		<li class="active">Pull Request ${pullRequest.getIssueId()}</li>
+	</ol>
 [/#if]
 
 [#assign buildResult = builds[pullRequest.destination.commitId]![]]

diff --git a/src/main/resources/templates/project-view.ftl b/src/main/resources/templates/project-view.ftl
@@ -15,7 +15,9 @@
 <div class="container">
 
 [#if group?? && group?has_content]
-[@projectFrameset.renderBreadcrumb i18n group/]
+[@projectFrameset.renderBreadcrumb i18n group repositoryEntity/]
+[#elseif repositoryEntity?? && repositoryEntity?has_content]
+[@projectFrameset.renderBreadcrumb i18n group![] repositoryEntity/]
 [/#if]
 
 [#if branch?? && branch.isAhead() ]

diff --git a/src/main/resources/templates/project/settings.ftl b/src/main/resources/templates/project/settings.ftl
@@ -14,8 +14,8 @@
 [@macros.renderMenu i18n user /]
 <div class="container">
 
-[#if group?? && group?has_content]
-	[@projectFrameset.renderBreadcrumb i18n group/]
+[#if repositoryEntity?? && repositoryEntity?has_content]
+	[@projectFrameset.renderBreadcrumb i18n group![] repositoryEntity/]
 [/#if]
 
     <div class="row">