NEW - # 116: Added Private Folder s

http://bugs.koc.se/view.php?id=116

WebContent/css/zallery.css

@@ -96,4 +96,15 @@ padding-top: 0px;
 
 .modmedia_edit{
 	display: none;
+}
+
+.not-singular .entry-content .private{
+  display: block;
+	position: absolute;
+	top: -6px;
+	right: 10px;
+	width: 74px;
+	height: 22px;
+	background: url("../img/private.png") no-repeat top left;
+	z-index: 200
 }

WebContent/gallery.jsp

@@ -15,9 +15,15 @@
 					<button type="button" onClick="window.location='gallery?folder=<%=folder.getParent().getId()%>'"><img src="img/arrow_undo.png" style="width: 10px; padding-right: 5px;">...Back</button>
 				<%} %>
 				</TD><TD>
-				<%if( user.canEdit( folder ) && folder.getParent() != null ){ %>					
+				<%if( user.canEdit( folder ) && folder.getParent() != null ){ %>
 					<form action="gallery?folder=<%=folder.getParent().getId() %>" method="post" align="right">                         
 						<input type="hidden" name="id" value="<%=folder.getId() %>">
+						
+						<%if( !folder.isPrivate() ){ %>
+							<button type="submit" name="action" value="mkprivate" ><img src="img/user-silhouette.png" style="width: 10px; padding-right: 5px;">Private</button>
+						<%}else{ %>
+							<button type="submit" name="action" value="mkprivate" ><img src="img/user-share.png" style="width: 10px; padding-right: 5px;">Public</button>	
+						<%} %>
 						<button type="submit" name="action" value="rmdir" onClick="return confirm ('Are you sure you want to delete this folder?')"><img src="img/delete.png" style="width: 10px; padding-right: 5px;">Delete</button>
 					</form>
 				<%} %>
@@ -27,9 +33,16 @@
 			   for( Folder subfolder : ((List<Folder>)request.getAttribute("subfolders")) ){ %>			
 			<DIV class="entry-content">			
 				<DIV class="entry-content">
-                    <%if( subfolder.getDate().after(new Timestamp(System.currentTimeMillis()-10*24*60*60*1000) )){ %><SPAN class="new"></SPAN><%} %>
-					<A href="gallery?folder=<%=subfolder.getId()%>"><SPAN class="slide-title" style="opacity: 0; "><%=subfolder.getName()%></SPAN>
-                    <IMG class="thumbnail" src="img/folder.png" width="125" height="125" alt="<%=subfolder.getName()%>"><SPAN class="cover-up"></SPAN></A>
+                    <%if( subfolder.isPrivate() ){ %>
+                    <SPAN class="private"></SPAN>
+                    <%} else if( subfolder.getDate().after(new Timestamp(System.currentTimeMillis()-10*24*60*60*1000) )){ %>
+                    <SPAN class="new"></SPAN>
+                    <%} %>
+					<A href="gallery?folder=<%=subfolder.getId()%>">
+						<SPAN class="slide-title" style="opacity: 0; "><%=subfolder.getName()%></SPAN>
+                    	<IMG class="thumbnail" src="img/folder.png" width="125" height="125" alt="<%=subfolder.getName()%>">
+                    	<SPAN class="cover-up"></SPAN
+                    ></A>
 				</DIV>
 			</DIV><!-- .post -->
             <% } %>