Merge remote branch 'upstream/master'

2 files changed, 82 insertions, 12 deletions

diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index f1209ec58..732caf690 100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/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/style.css b/view/theme/dispy/style.css
index 812c5ee2e..6547cf986 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -48,7 +48,7 @@ body {
 body, button, input, select, textarea {
     font-family: sans-serif;
     color: #222;
-    background-color: rgb(254,254,254);
+    background-color: #efefef;
 }
 select {
 	border: 1px #555 dotted;
@@ -152,10 +152,11 @@ a:hover {
     color: #729fcf;
 }
 input[type=submit] {
+    background-color: #555753;
+	color: #eeeeec;
+	font-weight: bold;
     margin-top: 10px;
     height: 22px;
-    background-color: #555753;
-    color: #eeeeec;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1494,6 +1495,8 @@ div[id$="wrapper"] br {
 }
 #prvmail-subject {
     width: 100%;
+	color: #eec;
+	background: #444;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1859,6 +1862,71 @@ div[id$="wrapper"] br {
     clear:both;
 }
 
+
+/**
+ * intros
+ */
+.intro-wrapper {
+    margin-top: 20px;
+}
+
+.intro-fullname {
+    font-size: 1.1em;
+    font-weight: bold;
+
+}
+.intro-desc {
+    margin-bottom: 20px;
+    font-weight: bold;
+}
+
+.intro-note {
+    padding: 10px;
+}
+
+.intro-end {
+    padding: 30px;
+}
+
+.intro-form {
+    float: left;
+}
+.intro-approve-form {
+    clear: both;
+}
+.intro-approve-as-friend-end {
+    clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+    margin-right: 20px;
+}
+.intro-submit-approve {
+    margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+    float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+    float: left;
+}
+.intro-form-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+    margin-top: 10px;
+}
+.intro-approve-as-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+
+.intro-end {
+    clear: both;
+}
+
+
 /**
  * events
  **/
@@ -2162,11 +2230,16 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-    background-color:#bbc7d7;
+/*	color: ;*/
+    background-color: #bbc7d7;
 }
 #adminpage .selectall {
     text-align: right;
 }
+#adminpage #users a {
+/*	color: #;*/
+	text-decoration: underline;
+}
 
 /**
  * Form fields