From e4e68298c2f55c93dc2464e26a24b119a649e642 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 11 Jan 2013 23:53:32 -0500
Subject: [PATCH] Show indicators for Sparkleshared repositories

---
 build.xml                                     |   3 +++
 resources/folder_star_16x16.png               | Bin 0 -> 830 bytes
 resources/folder_star_32x32.png               | Bin 0 -> 1529 bytes
 resources/star_16x16.png                      | Bin 0 -> 611 bytes
 resources/star_32x32.png                      | Bin 0 -> 1548 bytes
 src/com/gitblit/GitBlit.java                  |   1 +
 src/com/gitblit/PagesServlet.java             |   2 +-
 .../gitblit/client/IndicatorsRenderer.java    |   8 ++++++
 src/com/gitblit/models/RepositoryModel.java   |   6 +++++
 src/com/gitblit/utils/IssueUtils.java         |   2 +-
 src/com/gitblit/utils/JGitUtils.java          |  24 +++++++++++++++---
 .../gitblit/wicket/GitBlitWebApp.properties   |   3 ++-
 src/com/gitblit/wicket/pages/RawPage.java     |   4 +--
 .../gitblit/wicket/pages/RepositoryPage.html  |   2 +-
 .../gitblit/wicket/pages/RepositoryPage.java  |   8 ++++++
 .../wicket/panels/ProjectRepositoryPanel.html |   1 +
 .../wicket/panels/ProjectRepositoryPanel.java |   6 +++++
 .../wicket/panels/RepositoriesPanel.html      |   2 +-
 .../wicket/panels/RepositoriesPanel.java      |   7 +++++
 19 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 resources/folder_star_16x16.png
 create mode 100644 resources/folder_star_32x32.png
 create mode 100644 resources/star_16x16.png
 create mode 100644 resources/star_32x32.png

diff --git a/build.xml b/build.xml
index 00885979..200fc91c 100644
--- a/build.xml
+++ b/build.xml
@@ -717,12 +717,15 @@
 			<resource file="${basedir}/resources/commit_changes_16x16.png" />
 			<resource file="${basedir}/resources/commit_merge_16x16.png" />
 			<resource file="${basedir}/resources/commit_divide_16x16.png" />
+			<resource file="${basedir}/resources/star_16x16.png" />
 			<resource file="${basedir}/resources/blank.png" />
 			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />
 			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />
 			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />
 			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ko.properties" />
+			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_nl.properties" />
 			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pl.properties" />
+			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties" />
 
 			<class name="com.gitblit.client.GitblitManagerLauncher" />
 			<classfilter>
diff --git a/resources/folder_star_16x16.png b/resources/folder_star_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae8fdeda0d20115532c96297d9544ef4064f198d
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!;7LS5RCwBiQ{PJzQ562}y)(18uDZFd
zBw9;a+DfG)mJ!&4l=M(i(SwpbRD?c7MFm0sKvEEtN(hxj`BJ?Z_}GhxDE>%Au~nC3
zvt2gVpX==G+|JD64=Cs`XYS10bH4MP^W9-1?KQtmLw8Fv3CkE4U_zN^jMvhe!}^3x
zWA>$hvA)gEij`c}^a@BAsURUR_`D&XK)x}yox6oW1-PPy8CP;`0BM?(ya9cx1yVAo
z`Im6C=^en?R@Kx^rWQrTaO+jCP(>v%=~wI^xk?*pv@c*RbZ-S)3>X11``HRK!HaIw
zw!}m*ru%(v>c@&qt`RM2mx=9`Y2kunrhgLAV2EC&4a`_Q#VRPya}3ekKBoW>htMnl
z#V(a%%@F7tgUjteQ604;sa1Ui(446PDz(yn{eoh16FO!GrVt7I*f}ovDh?pKz=Ooh
zGe{b8tgjbY$B#i|_@MI=#MX>Hg>jCJP=LUfQF*6}+9Ww8v)f4qTZuHusxYk2jU(s$
z4J`F{6UZqnj*TK1j&~`fH<m(k$SgPrtOa03dMJq#F-p|Z!AZ76EDGi<0L#4skvR?{
z7Di-x2#qa+oou+RM!LKn>^@QjrzZz8K5L0>>%BZOK$Qc;Dgp21$29yE0(K$t@jk_<
zrckvG#gb|H=K>1r_RuUBiLQH70tkl&&$&ksE;ka<USM?+%vB6;V+V}I5D$H6DP%+K
zr(+yurfDQ$9V)qXW|_Tu(&EVR=R?gag-I=PXCXF%gZSPb>@L4Ia?6S;dsy!;PZ-Ih
z+@S%T6}c8S^!>S-x4G%;3+`5tj0GTel^_v`BBQEpU%2z+tTOuY%<$oxJ=3Y<_m|1}
zx3y1sx`x%EUIgcsKkfDXy68MqjqvLe4~StiBLMu%OoH=eQ&m$+eI**Z`(~#8{nv%@
zhU(nXC)fNRREL%&jdcgZ|E+@D`c)^$b#jf|Z~a!}gMS1V07WMfXqlcD+yDRo07*qo
IM6N<$f<%>mk^lez

literal 0
HcmV?d00001

diff --git a/resources/folder_star_32x32.png b/resources/folder_star_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2a076a9973c08ebf3b1932932d7051398d56fae
GIT binary patch
literal 1529
zcmV<V1qS+wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%n@L1LRCwCNS6gfpRT%!x%<QE%d)qFT
zVlQY#NfVF)2|`R1NJNl8d@)8b8XqudeDF=8@kL*JASNdGf{8>-FwsB)2_a~SpaCls
zC|67A_O`I>c6Yn&Zuc^C#{Zm|?xk*N7n*RAKRa{g%=y3b{onupv&=M2JkG($v<u(9
zbVP-|)#RLR&7#YgqQHQ5tmDJZoiw4(7XXc{OgLY$`+M4!_BGiIFjZXM|L!)io@{(R
z0l4MK$$9$5S9E^W_Lx5mxSDrCPbG2jn{_e9SZOpXs$lOpvA1J7ds@~T*I_D7x^s}_
zIS>&s4e(S59eaNIKek!D(*~M@*n4MdG4`~aBLb$-Ez=4ake3QFq0>O{_Y%FE^tu6O
z+b6K}1^3JVkfwtxg0CVW5c6stC0S&%5Mo-4^Vrl%R!jrdJkO9Hbp`;%;!2spnEZV(
z1GFbk6o$1p1G-E#dD>Y32&amwz<041;eoqCKr<5{K(Ie4x+)3yg@6TG$%-;h1BS(b
zq??J%FPe_>2{|9Qa0|$!u==BeQowjnL1WWUIY^Y>y)Q+X3xS!Dac06))ncqj*u)8Z
zf8Qj{8faS4g7mGgF>?W%J~-5hW}t2hqT}f<ns93Qxvmfcit2#xpX&(qkC5wPn<}Vl
zT7c%2t>E00tV!9-2Eep3O{rXpP+u3W4#kfOr-d4zIF0#3(35ej`CuObHl{JaBmmui
z7~Eu1VvxGQoK7!5DCJ8K8#;^wCx?#FWKzp%g&0sZMEpV2wzN}363_!j3Pm{;5|NUO
z&8;S}DF?LPwGc+yKzO+Ke)sLMkjVWU1Bx!`j0HkiylN9+8=-rro&W4Xs+z$ulV)Zz
zl396rx0mSe#x-B$M_Mr{XwhtJvSdz<#YvzlT-A%9PxO*+r_I1av{?#Ga%2cbB94l-
zXJrHwR|Cd}&*F5?=m|l8VI5EmM27>YX;~)0Fj2h}4W$=<>-5~v!PBC$S5TH1P~9HN
z)(m3){?x%!LpNpV%^pwE1w;n@sB3MbN269nR2&wFQjD^QX-*{jd*Nz*O`5o7Wp#)S
z-o!vKaoj$=k!3*SwwZ`hyUoDuSxDCb@?Xm7SyrH;O7dg^se7ZS+VG@&8vAn;mCQu|
z`tZlK$YC3RnF|2{n7Hdl^^#^;(M+KaMVo7|trBkc29cH%m(HQ=xgFq<-=v@N<vTHU
z{x~8-0lx3o-ma<m=NO=uMtuXQ7xW`ezUO*+T0>QHy!#yVXc(!0UluRsdIA;CH&PEe
zC098YZ9@E#4^3qW<^F-ycXX&%O{VrVzW3ML*$_m1gJ^k$%5#duN5Yx&pxR+XLMU(F
ziQ4UJsho(OQV)Lb5DC$0QcC&?Ja7F#nGhy`DJ1(k+hbiPTSYGr$MkmZ-+WtTW)-K;
zGR}Ev-?RjtNPyRoK=tw^&^$F(Z!q(|Aw;8NTsE<EFotl?K)7jl7Zn@y2>>-@OZRMl
zYJD<oJk&S3kj?m{ZhXAC_Vtx7KeNfz*a0JcE3bx76RKQ>q^}EC&fe)<zxVQ9nj9bt
z3ILRAs3NO)=&F;`Q+=%Sjq_zsZ-5>-UkIRPH72j0foJP4Ycqy9NRwf*jChIqFd}4Q
zj{rb0r=9w|eVfzU20eB|79VEsCPKm|{)N`ih7+H)uiN-V&t=<hwi23lVK5$n0d<kL
zY!xeagGYnl@idZy5&6K~R7?D3pjLUXpxV)qpJI<f`SjszXldTUCwxc^M=)~9-@ka*
znOB90YcXf)Q8Y9z+#=S_`+vL^uiG0wy4?&OT+hFJv-MM&T0_=s+Zr(!JoF+T{duEc
zyS{|JI_Dv>sn!1TA$om~Y{Gt4N!CE-vD<JzS#-VuIPFXld(w9}Rh+^<5iYWFdoDiJ
f4IlgXPk;dc-JvM_k_R2J00000NkvXXu0mjfm*v<S

literal 0
HcmV?d00001

diff --git a/resources/star_16x16.png b/resources/star_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..883e4decc0d4d3ac2e6e2179c2763c6cf67caef1
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!1xZ9fRCwB?Q_o9OQ562}ebaLs84YY~
zu&D@|AzfrKX@f!_Nwg4&mMw+|hJHYQfE%Gdp<O0YS+r=?#*Hmn6bvMRV^UNap^{85
zwT79dvHQ;L+~*9a%@d*v-+SM^_dDM`_nh~jwT9pLdcXH7<F?<v7rUE5DSO>5zRc*|
z45Z&?emr^0j-8hchX+0Gr<3(lPlaS->quaKI}8l}Cj(chJE6`CptWZn49}0BdQeXr
zFb`*<Z$i83xF*#Fa(OifI~oQ3eB+7i=rO<wrt@Pb(~uT~4CI7m&GJ^-Ga#aiEqzy-
z8jd8vMx0kGXyp+|(Po;J93q$Qv2Yav75rLw-c^{MI%*7rsiY9%#PV48)ZWfR5qn<?
zG;yHj+X<^$Zq7;&PbD^-0)D(*bPi-*o#WV<S`B7mndyP~?59a1kc|m$k;_JE6U=2O
zfy&A{=Cccv96VrRb{28=^l<Jb{pMR)&3q_rhiC$oEf|f_*6qU5Xm@H)TO6wJj!$+?
zbvzhO#SaKX;#j)dlk#n2Nughcg3ucd2b58oTl8Q!RUBAh8^yBf_caK&$A+l*8I|RA
zICEd#AH4jc$G~v2rqy?ZBW*)}{}9!&_H<A?4}0CwYl#~??bssgFl*l)pK({8oYh-n
xYi+EpC9Cg`jKYqOu9*?9^4Hr8{%8CVU;r`y0=aK}j;#Oy002ovPDHLkV1iHU6+{34

literal 0
HcmV?d00001

diff --git a/resources/star_32x32.png b/resources/star_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..92865b19fb2379e88f4d6d00e91984e099f325a9
GIT binary patch
literal 1548
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

literal 0
HcmV?d00001

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 489ba63c..f417b3eb 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1715,6 +1715,7 @@ public class GitBlit implements ServletContextListener {
 		}
 		model.HEAD = JGitUtils.getHEADRef(r);
 		model.availableRefs = JGitUtils.getAvailableHeadTargets(r);
+		model.sparkleshareId = JGitUtils.getSparkleshareId(r);
 		r.close();
 		
 		if (model.origin != null && model.origin.startsWith("file://")) {
diff --git a/src/com/gitblit/PagesServlet.java b/src/com/gitblit/PagesServlet.java
index ad9276b4..91f25b70 100644
--- a/src/com/gitblit/PagesServlet.java
+++ b/src/com/gitblit/PagesServlet.java
@@ -170,7 +170,7 @@ public class PagesServlet extends HttpServlet {
 						content = JGitUtils.getStringContent(r, tree, resource, encodings).getBytes(
 								Constants.ENCODING);
 					} else {
-						content = JGitUtils.getByteContent(r, tree, resource);
+						content = JGitUtils.getByteContent(r, tree, resource, false);
 					}
 					response.setContentType(contentType);
 				} catch (Exception e) {
diff --git a/src/com/gitblit/client/IndicatorsRenderer.java b/src/com/gitblit/client/IndicatorsRenderer.java
index 59ce6dd1..44b39d01 100644
--- a/src/com/gitblit/client/IndicatorsRenderer.java
+++ b/src/com/gitblit/client/IndicatorsRenderer.java
@@ -55,6 +55,8 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
 	private final ImageIcon federatedIcon;
 	
 	private final ImageIcon forkIcon;
+	
+	private final ImageIcon sparkleshareIcon;
 
 	public IndicatorsRenderer() {
 		super(new FlowLayout(FlowLayout.RIGHT, 1, 0));
@@ -67,6 +69,7 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
 		frozenIcon = new ImageIcon(getClass().getResource("/cold_16x16.png"));
 		federatedIcon = new ImageIcon(getClass().getResource("/federated_16x16.png"));
 		forkIcon = new ImageIcon(getClass().getResource("/commit_divide_16x16.png"));
+		sparkleshareIcon = new ImageIcon(getClass().getResource("/star_16x16.png"));
 	}
 
 	@Override
@@ -80,6 +83,11 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
 		if (value instanceof RepositoryModel) {
 			StringBuilder tooltip = new StringBuilder();
 			RepositoryModel model = (RepositoryModel) value;
+			if (model.isSparkleshared()) {
+				JLabel icon = new JLabel(sparkleshareIcon);
+				tooltip.append(Translation.get("gb.isSparkleshared")).append("<br/>");
+				add(icon);
+			}
 			if (model.isFork()) {
 				JLabel icon = new JLabel(forkIcon);
 				tooltip.append(Translation.get("gb.isFork")).append("<br/>");
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 5be33a2d..022fd200 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -82,6 +82,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 	
 	public transient boolean isCollectingGarbage;
 	public Date lastGC;
+	public String sparkleshareId;
 	
 	public RepositoryModel() {
 		this("", "", "", new Date(0));
@@ -176,6 +177,10 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 		return !accessRestriction.atLeast(AccessRestrictionType.VIEW);
 	}
 	
+	public boolean isSparkleshared() {
+		return !StringUtils.isEmpty(sparkleshareId);
+	}
+	
 	public RepositoryModel cloneAs(String cloneName) {
 		RepositoryModel clone = new RepositoryModel();
 		clone.originRepository = name;
@@ -193,6 +198,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 		clone.useTickets = useTickets;
 		clone.skipSizeCalculation = skipSizeCalculation;
 		clone.skipSummaryMetrics = skipSummaryMetrics;
+		clone.sparkleshareId = sparkleshareId; 
 		return clone;
 	}
 }
\ No newline at end of file
diff --git a/src/com/gitblit/utils/IssueUtils.java b/src/com/gitblit/utils/IssueUtils.java
index 1b90c7d6..dd09235b 100644
--- a/src/com/gitblit/utils/IssueUtils.java
+++ b/src/com/gitblit/utils/IssueUtils.java
@@ -380,7 +380,7 @@ public class IssueUtils {
 		String issuePath = getIssuePath(issueId);
 		RevTree tree = JGitUtils.getCommit(repository, GB_ISSUES).getTree();
 		byte[] content = JGitUtils
-				.getByteContent(repository, tree, issuePath + "/" + attachment.id);
+				.getByteContent(repository, tree, issuePath + "/" + attachment.id, false);
 		attachment.content = content;
 		attachment.size = content.length;
 		return attachment;
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 099036e5..e1127708 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -537,7 +537,7 @@ public class JGitUtils {
 	 * @param path
 	 * @return content as a byte []
 	 */
-	public static byte[] getByteContent(Repository repository, RevTree tree, final String path) {
+	public static byte[] getByteContent(Repository repository, RevTree tree, final String path, boolean throwError) {
 		RevWalk rw = new RevWalk(repository);
 		TreeWalk tw = new TreeWalk(repository);
 		tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));
@@ -572,7 +572,9 @@ public class JGitUtils {
 				}
 			}
 		} catch (Throwable t) {
-			error(t, repository, "{0} can't find {1} in tree {2}", path, tree.name());
+			if (throwError) {
+				error(t, repository, "{0} can't find {1} in tree {2}", path, tree.name());
+			}
 		} finally {
 			rw.dispose();
 			tw.release();
@@ -591,7 +593,7 @@ public class JGitUtils {
 	 * @return UTF-8 string content
 	 */
 	public static String getStringContent(Repository repository, RevTree tree, String blobPath, String... charsets) {
-		byte[] content = getByteContent(repository, tree, blobPath);
+		byte[] content = getByteContent(repository, tree, blobPath, true);
 		if (content == null) {
 			return null;
 		}
@@ -1584,7 +1586,7 @@ public class JGitUtils {
 	 */
 	public static List<SubmoduleModel> getSubmodules(Repository repository, RevTree tree) {
 		List<SubmoduleModel> list = new ArrayList<SubmoduleModel>();
-		byte [] blob = getByteContent(repository, tree, ".gitmodules");
+		byte [] blob = getByteContent(repository, tree, ".gitmodules", false);
 		if (blob == null) {
 			return list;
 		}
@@ -1734,4 +1736,18 @@ public class JGitUtils {
 		}
 		return success;
 	}
+	
+	/**
+	 * Reads the sparkleshare id, if present, from the repository.
+	 * 
+	 * @param repository
+	 * @return an id or null
+	 */
+	public static String getSparkleshareId(Repository repository) {
+		byte[] content = getByteContent(repository, null, ".sparkleshare", false);
+		if (content == null) {
+			return null;
+		}
+		return StringUtils.decodeString(content);
+	}
 }
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 16f76411..dfdf70c2 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -440,4 +440,5 @@ gb.sslCertificateGeneratedRestart = Successfully generated new server SSL certif
 gb.validity = validity
 gb.siteName = site name
 gb.siteNameDescription = short, descriptive name of your server 
-gb.excludeFromActivity = exclude from activity page
\ No newline at end of file
+gb.excludeFromActivity = exclude from activity page
+gb.isSparkleshared = repository is Sparkleshared
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/pages/RawPage.java b/src/com/gitblit/wicket/pages/RawPage.java
index 7f6ed139..28e8bae2 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/com/gitblit/wicket/pages/RawPage.java
@@ -109,7 +109,7 @@ public class RawPage extends WebPage {
 						switch (type) {
 						case 2:
 							// image blobs
-							byte[] image = JGitUtils.getByteContent(r, commit.getTree(), blobPath);
+							byte[] image = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
 							response.setContentType("image/" + extension.toLowerCase());
 							response.setContentLength(image.length);
 							try {
@@ -120,7 +120,7 @@ public class RawPage extends WebPage {
 							break;
 						case 3:
 							// binary blobs (download)
-							byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath);
+							byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
 							response.setContentLength(binary.length);
 							response.setContentType("application/octet-stream");
 							response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html
index 63a894da..d49f0188 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.html
@@ -52,7 +52,7 @@
 						</div>
 					</div>
 					<div class="span7">
-						<div><span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div>
+						<div><span class="project" wicket:id="projectTitle">[project title]</span>/<img wicket:id="repositoryIcon" style="padding-left: 10px;"></img><span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div>
 						<span wicket:id="originRepository">[origin repository]</span>
 					</div>
 				</div>
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index aac527d7..16087fa6 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -246,6 +246,14 @@ public abstract class RepositoryPage extends BasePage {
 			}
 		}
 		
+		// show sparkleshare folder icon
+		if (model.isSparkleshared()) {
+			add(WicketUtils.newImage("repositoryIcon", "folder_star_32x32.png",
+					getString("gb.isSparkleshared")));
+		} else {
+			add(WicketUtils.newClearPixel("repositoryIcon").setVisible(false));
+		}
+		
 		if (getRepositoryModel().isBare) {
 			add(new Label("workingCopyIndicator").setVisible(false));
 		} else {
diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
index 46781536..9b621d5a 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
+++ b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
@@ -38,6 +38,7 @@
 			<div class="pull-right" style="text-align:right;padding-right:15px;">
 				<span wicket:id="repositoryLinks"></span>
 				<div>
+					<img class="inlineIcon" wicket:id="sparkleshareIcon" />
 					<img class="inlineIcon" wicket:id="frozenIcon" />
 					<img class="inlineIcon" wicket:id="federatedIcon" />
         						
diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 50f0d52d..3c9bf7f0 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -87,6 +87,12 @@ public class ProjectRepositoryPanel extends BasePanel {
 			add(forkFrag);
 		}
 
+		if (entry.isSparkleshared()) {
+			add(WicketUtils.newImage("sparkleshareIcon", "star_16x16.png", localizer.getString("gb.isSparkleshared", parent)));
+		} else {
+			add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));
+		}
+
 		add(new BookmarkablePageLink<Void>("tickets", TicketsPage.class, pp).setVisible(entry.useTickets));
 		add(new BookmarkablePageLink<Void>("docs", DocsPage.class, pp).setVisible(entry.useDocs));
 
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
index 42f9f1f2..81a4c6eb 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -89,7 +89,7 @@
         <td class="left" style="padding-left:3px;" ><b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>
         <td class="hidden-phone"><span class="list" wicket:id="repositoryDescription">[repository description]</span></td>
         <td class="hidden-tablet hidden-phone author"><span wicket:id="repositoryOwner">[repository owner]</span></td>
-        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>
+        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>
         <td><span wicket:id="repositoryLastChange">[last change]</span></td>
         <td class="hidden-phone" style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>
         <td class="rightAlign">
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index 976c517f..ee5edfce 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -233,6 +233,13 @@ public class RepositoriesPanel extends BasePanel {
 							.setEscapeModelStrings(false));
 				}
 
+				if (entry.isSparkleshared()) {
+					row.add(WicketUtils.newImage("sparkleshareIcon", "star_16x16.png",
+							getString("gb.isSparkleshared")));
+				} else {
+					row.add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));
+				}
+				
 				if (entry.isFork()) {
 					row.add(WicketUtils.newImage("forkIcon", "commit_divide_16x16.png",
 							getString("gb.isFork")));
-- 
2.39.5