3 files changed, 47 insertions, 33 deletions
diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl
index f1209ec58..732caf690 100644
--- a/view/theme/dispy-dark/photo_view.tpl
+++ b/view/theme/dispy-dark/photo_view.tpl
@@ -4,18 +4,15 @@
 <div id="photo-edit-link-wrap">
 {{ if $tools }}
 <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
+|
 <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
 {{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
 </div>
 
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">$desc</div>
 {{ if $tags }}
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index d1ec4efd7..b4aefbbf2 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -123,9 +123,6 @@ a {
     text-decoration: none;
     margin-bottom: 1px;
 }
-/*a:hover {                 */
-/*    text-decoration: none;*/
-/*}*/
 a:hover img {
     text-decoration: none;
 }
@@ -778,6 +775,15 @@ aside #viewcontacts {
 #profile-jot-text_ifr {
 	width:99.900002% !important;
 }
+[id$="jot-text_ifr"] {
+	width: 99.900002% !important;
+	color: #2e2f2e;
+	background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+	color: #2e2f2e;
+	background: #eec;
+}
 #profile-attach-wrapper,
 #profile-audio-wrapper,
 #profile-link-wrapper,
@@ -1527,7 +1533,6 @@ div[id$="wrapper"] br {
 }
 .mail-list-subject {
     font-size: 1.2em;
-	font-weight: bold;
 }
 .mail-list-delete-wrapper {
     float: right;
@@ -1751,23 +1756,23 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	/*background: #111;*/
-	/*border-radius: 5px 5px 0px 0px;*/
-	/*margin: 0px 0px 0px 0px;*/
-	/*width: 100px;*/
-	/*height: 25px;*/
-	/*position: absolute;*/
+	/*background: #111;
+	border-radius: 5px 5px 0px 0px;
+	margin: 0px 0px 0px 0px;
+	width: 100px;
+	height: 25px;
+	position: absolute;*/
 	display: none;
-	/*left: 35%;*/
-	/*top: 41%;*/
-	/*cursor: pointer;*/
-}
-/*.profile-edit-side-div:hover {*/
-	/*display: block;*/
-/*}*/
-/*.profile-edit-side-link {*/
-	/*margin: 3px 0px 0px 70px;*/
-/*}*/
+	/*left: 35%;
+	top: 41%;
+	cursor: pointer;*/
+}
+/*.profile-edit-side-div:hover {
+	display: block;
+}
+.profile-edit-side-link {
+	margin: 3px 0px 0px 70px;
+}*/
 #profiles-menu-trigger {
 	margin: 0px 0px 0px 25px;
 }
@@ -2123,12 +2128,12 @@ div[id$="wrapper"] br {
     border-bottom: 1px solid #000;
 }
 #adminpage dt {
-    width: 200px;
+    width: 250px;
     float: left;
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 200px;
+	margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
@@ -2590,8 +2595,8 @@ footer {
     margin-top: 30px;
     overflow: auto;
 }
-/*#acl-list-content {*/
-/*}*/
+/*#acl-list-content {
+}*/
 .acl-list-item {
 	border: 1px solid #eec;
     display: block;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index c0611ce83..700136173 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -64,7 +64,7 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
-	// notifications
+	// click outside notifications menu closes it
 	$('html').click(function() {
 		$('#nav-notifications-linkmenu').removeClass('selected');
 		document.getElementById("nav-notifications-menu").style.display = "none";
@@ -73,7 +73,17 @@ $(document).ready(function() {
 	$('#nav-notifications-linkmenu').click(function(event) {
 		event.stopPropagation();
 	});
+	// click outside profiles menu closes it
+	$('html').click(function() {
+		$('#profiles-menu-trigger').removeClass('selected');
+		document.getElementById("profiles-menu").style.display = "none";
+	});
+
+	$('#profiles-menu').click(function(event) {
+		event.stopPropagation();
+	});
 
+	// main function in toolbar functioning
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -87,11 +97,13 @@ $(document).ready(function() {
             });
         }
     };
+	// our trigger for the toolbar button
     $('.floaterflip').click(function() {
         toggleToolbar();
         return false;
     });
 
+	// (attempt) to change the text colour in a top post
 	$('#profile-jot-text').focusin(function() {
 		$(this).css({color: '#eec'});
 	});