Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy

5 files changed, 185 insertions, 60 deletions

diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index c92529f26..3459e7409 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -7,7 +7,7 @@ a:hover {text-decoration: underline; }
 
 input, select, textarea {
 	background-color: #222222;
-	color: #FFFFFF;
+	color: #FFFFFF !important;
 	border: 1px solid #444444;
 }
 .openid { background-color: #222222;}
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index aa9e0bfaf..eb88f00c1 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,5 +1,5 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 var editor;
@@ -110,6 +110,24 @@ tinyMCE.init({
 
 	});
 
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
 	function jotGetLink() {
 		reply = prompt("$linkurl");
 		if(reply && reply.length) {
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 555b0af4f..49586e307 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -692,6 +692,15 @@ div[id$="wrapper"] br { clear: left; }
 .mail-list-delete-wrapper { float: right; }
 .mail-list-outside-wrapper-end { clear: both;}
 
+.mail-conv-sender {float: left; margin: 0px 5px 5px 0px }
+.mail-conv-sender-photo { width: 32px; height: 32px }
+.mail-conv-sender-name { float: left }
+.mail-conv-date { float: right }
+.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
+.mail-conv-body { clear: both; }
+.mail-conv-delete-wrapper { margin-top: 5px; }
+
+
 /**
  * 	contacts
  */
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6ce8ea2c..4df36b4a9 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -249,6 +249,17 @@ div.wall-item-content-wrapper.shiny {
 	cursor: pointer;
 }
 
+#group-sidebar {
+	margin-bottom: 10px;
+}
+
+.group-selected {
+	padding: 3px;
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
 .fakelink:hover {
 	color: #3465a4;
 	text-decoration: underline;
@@ -881,6 +892,19 @@ input#dfrn-url {
 	clear: both;
 }
 
+#fsuggest-desc, #fsuggest-submit-wrapper {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#network-star-link{
+	margin-top: 10px;
+}
+.network-star {
+	float: left;
+	margin-right: 5px;
+}
+
 .wall-item-content-wrapper {
 	margin-top: 10px;
 	border: 1px solid #CCC;
@@ -998,8 +1022,12 @@ input#dfrn-url {
 .wall-item-like-buttons {
 	float: left;
 	margin-right: 10px;
-	padding-right: 10px;
-	border-right: 2px solid #fff;
+/*	padding-right: 10px; */
+/*	border-right: 2px solid #fff; */
+}
+
+.like-rotator {
+	margin-left: 5px;
 }
 
 .wall-item-like-buttons > a,
@@ -1013,10 +1041,16 @@ input#dfrn-url {
 
 .wall-item-share-buttons {
 	margin-left: 10px;
+	margin-right: 10px;
 }
 
 .editpost {
-	margin-left: 15px;
+	margin-left: 10px;
+	float: left;
+}
+.star-item {
+	margin-left: 10px;
+	float: left;	
 }
 
 .wall-item-links-wrapper {
@@ -2346,6 +2380,9 @@ a.mail-list-link {
 .profile-match-wrapper {
 	float: left;
 	padding: 10px;
+	width: 120px;
+	height: 120px;
+	scroll: auto;
 }
 #profile-match-wrapper-end {
 	clear: both;
@@ -2532,6 +2569,43 @@ a.mail-list-link {
 }
 
 /**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+	border-bottom: 1px solid #babdb6;
+}
+ 
+
+/**
+ * Form fields
+ */
+.field {
+	clear: left;
+	margin-bottom: 5px;
+	padding-bottom: 5px;
+}
+
+.field label {
+	float: left;
+	width: 200px;
+}
+
+.field input,
+.field textarea {
+	width: 400px;
+}
+.field textarea { height: 100px; }
+.field_help {
+	display: block;
+	margin-left: 200px;
+	color: #666666;
+	
+}
+ 
+
+/**
  * ADMIN
  */
 #pending-update {
@@ -2557,34 +2631,12 @@ a.mail-list-link {
 	margin-left: 200px;
 }
 
-#adminpage .field {
-	clear: left;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
+#adminpage h3 {
+	border-bottom: 1px solid #cccccc;
 }
-
 #adminpage .field label {
-	float: left;
-	width: 200px;
 	font-weight: bold;
 }
-
-#adminpage .field input,
-#adminpage .field textarea {
-	width: 400px;
-}
-#adminpage .field textarea { height: 100px; }
-#adminpage .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
-}
-
-#adminpage h3 {
-	border-bottom: 1px solid #cccccc;
-}
-
 #adminpage .submit {
 	clear:left;
 	text-align: right;
@@ -2607,7 +2659,7 @@ a.mail-list-link {
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
 #adminpage table th { text-align: left;}
 #adminpage td .icon { float: left;}
 #adminpage table#users img { width: 16px; height: 16px; }
@@ -2654,6 +2706,9 @@ a.mail-list-link {
 .on { background-position: -144px -32px; }
 
 .off { background-position: 0px -48px; }
+.starred { background-position: -16px -48px; }
+.unstarred { background-position: -32px -48px; }
+
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 
@@ -2667,9 +2722,9 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-.type-video { background-position: 0px; 0px; }
-.type-image { background-position: -20px; 0px; }
-.type-audio { background-position: -40px; 0px; }
-.type-text  { background-position: -60px; 0px; }
-.type-unkn  { background-position: -80px; 0px; }
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
 
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 98ab96d2b..df14a29db 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -137,6 +137,18 @@ blockquote:before {
 	cursor: pointer;
 }
 
+
+#group-sidebar {
+    margin-bottom: 10px;
+}
+
+.group-selected {
+    padding: 3px;
+    border: 1px solid #CCCCCC;
+    background: #F8F8F8;
+    font-weight: bold;
+}
+
 .fakelink:hover {
 	color: #0CBEFE;
 	text-decoration: none;
@@ -997,6 +1009,13 @@ input#dfrn-url {
 	clear: both;
 }
 
+
+#fsuggest-desc, #fsuggest-submit-wrapper {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+
 .wall-item-content-wrapper {
 	margin-top: 10px;
 	border: 1px solid #CCC;
@@ -1077,9 +1096,24 @@ input#dfrn-url {
 }
 
 .editpost {
-	margin-left: 15px;
+	margin-left: 10px;
+	float: left;
+}
+.star-item {
+	margin-left: 10px;
+	float: left;	
 }
 
+
+#network-star-link{
+	margin-top: 10px;
+}
+.network-star {
+	float: left;
+	margin-right: 5px;
+}
+
+
 .wall-item-info.wallwall {
 	width: 285px;
 }
@@ -2307,6 +2341,10 @@ a.mail-list-link {
 .profile-match-wrapper {
 	float: left;
 	padding: 10px;
+    width: 120px;
+    height: 120px;
+    scroll: auto;
+
 }
 #profile-match-wrapper-end {
 	clear: both;
@@ -2552,6 +2590,33 @@ a.mail-list-link {
 	left: 0px;
 	top: 0px;
 }
+/**
+ * Form fields
+ */
+.field {
+	clear: left;
+	margin-bottom: 5px;
+	padding-bottom: 5px;
+}
+
+.field label {
+	float: left;
+	width: 200px;
+	font-weight: bold;
+}
+
+.field input,
+.field textarea {
+	width: 400px;
+}
+.field textarea { height: 100px; }
+.field_help {
+	display: block;
+	margin-left: 200px;
+	color: #666666;
+	
+}
+
 
 /**
  * ADMIN
@@ -2579,30 +2644,6 @@ a.mail-list-link {
 	margin-left: 200px;
 }
 
-#adminpage .field {
-	clear: left;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-}
-
-#adminpage .field label {
-	float: left;
-	width: 200px;
-	font-weight: bold;
-}
-
-#adminpage .field input,
-#adminpage .field textarea {
-	width: 400px;
-}
-#adminpage .field textarea { height: 100px; }
-#adminpage .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
-}
-
 #adminpage h3 {
 	border-bottom: 1px solid #cccccc;
 }
@@ -2674,6 +2715,8 @@ a.mail-list-link {
 .on { background-position: -144px -32px; }
 
 .off { background-position: 0px -48px; }
+.starred { background-position: -16px -48px; }
+.unstarred { background-position: -32px -48px; }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }