Merge branch 'master' of https://github.com/friendica/red

12 files changed, 109 insertions, 77 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index fc3131642..7e439137e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -58,12 +58,14 @@
 
 .thread-wrapper.toplevel_item {
 	width: 90%;
+	margin-bottom: 10px;
 }
 
 /* conv_item */
 
 .hide-comments-outer {
-	margin-left: 10px;
+	margin-left: 60px;
+	padding: 15px 10px 15px 10px;
 }
 
 .wall-item-content-wrapper {
@@ -213,6 +215,11 @@
 .wall-item-tools {
 	clear: both;
 	padding: 5px 10px;
+	margin-left: 60px;
+}
+
+.comment .wall-item-tools {
+	margin-left: 0;
 }
 
 .item-tool {
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 6fd666845..097027179 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,4 +1,9 @@
 
+.search-input {
+	padding: 4px 12px;
+	margin: 3px;
+}
+
 .field_abook_help {
 	color: #000;
 }
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 5b0105204..651167b47 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,3 +1,13 @@
+
+ul#settings-privacy-macros {
+	list-style-type: none;
+	margin: 0 0 10px 0;
+	padding: 0;
+}
+#settings-privacy-macros li {
+	margin-top: 5px;
+}
+
 #settings-permissions-wrapper {
 	margin-top: 15px;
 }
@@ -29,6 +39,7 @@
 
 #settings-notifications label {
 	margin-left: 20px;
+	width: 330px;
 }
 #settings-notify-desc, #settings-activity-desc {
 	font-weight: bold;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7c2a03c3b..326dfa0a1 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -33,6 +33,15 @@
 
 /* saved searches */
 
+
+#netsearch-box #search-submit {
+	margin: 10px 0 7px 0;
+}
+
+#search-save {
+	margin: 10px 0 7px 5px;
+}
+
 .saved-search-li {
 	margin-top: 3px;
 }
@@ -45,24 +54,34 @@
 	opacity: 1;
 }
 
+.saved-search-icon {
+	float: right;
+}
+
 .savedsearchterm {
-	margin-left: 10px;
+	display: block;
+	width: 150px;
+	overflow: hidden;
 }
 
-/* fileas */
+/* peoplefind */
 
-.fileas-ul li {
-	margin-top: 10px;
+#peoplefind-sidebar .btn {
+	margin: 10px 0 10px 0;
 }
 
-.fileas-link {
-	margin-left: 24px;
+#side-peoplefind-url {
+	margin-top: 5px;
 }
 
-.fileas-all {
-	margin-left: 0px;
+#side-peoplefind-url {
+	font-size: 1em;
 }
 
+
+/* fileas */
+
+
 /* posted date */
 
 #datebrowse-sidebar select {
@@ -73,17 +92,6 @@
 
 /* categories */
 
-.categories-ul li {
-	margin-top: 10px;
-}
-
-.categories-link {
-	margin-left: 24px;
-}
-
-.categories-all {
-	margin-left: 0px;
-}
 
 /* group */
 
@@ -91,18 +99,36 @@
 	margin-bottom: 10px;
 }
 
+#sidebar-new-group {
+	margin-bottom: 10px;
+}
+
 #sidebar-group-list .icon, #sidebar-group-list .iconspacer {
 	display: inline-block;
 	height: 12px;
 	width: 12px;
 }
 
+.sidebar-group-name {
+	display: block;
+	width: 170px;
+	overflow: hidden;
+}
+
+#sidebar-group-ul {
+	margin-bottom: 10px;
+}
+
 #sidebar-group-list li {
 	margin-top: 3px;
 }
 
+.sidebar-group-li input {
+	float: right;
+}
+
 .groupsideedit {
-	margin-right: 10px;
+	float: right;
 }
 
 .group-edit-icon {
@@ -124,3 +150,9 @@ li:hover .group-edit-icon {
 	margin-top: 10px;
 	margin-bottom: 45px;
 }
+
+/* photo albums */
+
+#photo-albums-upload-link {
+	margin-top: 10px;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 60d0f4bc6..da3849925 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -228,6 +228,16 @@ footer {
 	margin-bottom: 15px;
 }
 
+aside ul {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+
+aside li {
+	margin-top: 5px;
+}
+
 /*TODO: we should use one class for all this. */
 .group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
 	color: $selected_active_colour !important;
@@ -470,18 +480,6 @@ footer {
 }
 
 
-.settings-widget ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-.settings-widget li {
-	margin-left: 24px;
-	margin-bottom: 8px;
-}
-
-
-
 #fsuggest-desc, #fsuggest-submit-wrapper {
 	margin-top: 15px;
 	margin-bottom: 15px;
@@ -631,35 +629,19 @@ footer {
 	color: #0080FF;
 }
 
-#netsearch-box { margin-bottom: 5px; }
-
-#search-save {
-	margin: 5px 0 0 5px;
-}
 
 #side-follow-wrapper {
 	margin-top: 20px;
 }
 
-#side-peoplefind-url {
-	margin-top: 5px;
-}
-
-#side-peoplefind-url {
-	font-size: 1em;
-}
-
-#side-peoplefind-url::-webkit-input-placeholder {
+#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder {
 	font-family: FontAwesome;
 }
 
-#side-peoplefind-url::-moz-placeholder {
+#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder {
 	font-family: FontAwesome;
 }
 
-#side-peoplefind-submit {
-	margin-top: 15px;
-}
 
 #side-match-link {
 	margin-top: 10px;
@@ -1121,14 +1103,6 @@ footer {
 }
 
 
-#netsearch-box {
-	margin-top: 20px;	
-}
-
-#netsearch-box #search-submit {
-	margin: 5px 0px 0px 0px;
-}
-
 .required {
 	color: #FF0000;
 }
@@ -1236,6 +1210,10 @@ brain is weird like that */
 	
 }
 
+.field input[type="checkbox"] {
+	width: 16px;
+}
+
 .field .onoff {
 	float: left;
 	width: 80px;
@@ -1768,10 +1746,6 @@ margin-right: 50px;
 	list-style-type: none;
 }
 
-.pmenu li {
-	margin-left: -20px;
-}
-
 .admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
@@ -2103,7 +2077,7 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-
+/*
 .categories-ul {
 	list-style-type: none;
 }
@@ -2111,6 +2085,7 @@ img.mail-list-sender-photo {
 #sidebar-group-list ul, #posted-date-selector {
 	list-style-type: none;
 }
+*/
 
 .profile-thing-list img, .thing-show img, .thing-edit-links a {
 	margin-top: 8px;
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index f254ce8c2..c69dcde50 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -6,7 +6,7 @@
 <form id="contacts-search-form" action="{{$cmd}}" method="get" >
 <span class="contacts-search-desc">{{$desc}}</span>
 <input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" />
 </form>
 </div>
 <div id="contacts-search-end"></div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index b0597e9b6..f643a3597 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,8 @@
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
 	<form action="follow" method="post" />
-		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+		<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
 	</form>
 	{{if $abook_usage_message}}
 	<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index a0ed7a82d..dd3c7e737 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -1,6 +1,10 @@
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
 		{{foreach $groups as $group}}
@@ -15,14 +19,11 @@
 				{{if $group.edit}}
 					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a>
 				{{/if}}
-				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+				<span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span>
 			</li>
 		{{/foreach}}
 	</ul>
 	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
 </div>
 
 
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index c1462a9e9..55bf1575f 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,15 +1,15 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
-	{{$desc}}
+	<div class="descriptive-text">{{$desc}}</div>
 	<form action="directory" method="post" />
 		<input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder="&#xf002;"/>
-		<input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
+		<input id="side-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$findthem}}" />
 		<br />
 		{{if $advanced_search}}
 		<a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a>
 		<div id="advanced-people-search-div" style="display: none;">
-		<input class="icon-search" id="side-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder="&#xf002;"/>
-		<input id="side-peoplefind-submit" type="submit" name="submit" value="{{$find_advanced}}" />
+		<input class="icon-search" id="side-advanced-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder="&#xf002;"/>
+		<input id="side-advanced-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$find_advanced}}" />
 		</div>
 		<br />
 		{{/if}}
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
index d0f9e2b0e..1a9f51af9 100644
--- a/view/tpl/saved_searches.tpl
+++ b/view/tpl/saved_searches.tpl
@@ -5,7 +5,7 @@
 	<ul id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a>
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a>
 			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index 615eca39d..0258a7632 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -5,7 +5,7 @@
 	<ul id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a>
 			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index accd8f106..1fef255f0 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -26,7 +26,7 @@
 
 
 <h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
-<ul>
+<ul id="settings-privacy-macros">
 <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>