Merge pull request #1 from friendica/master

get changes

6 files changed, 146 insertions, 31 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 21704e21c..fc5f41752 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1,17 +1,22 @@
 /**
- * duepuntozero Frindika style
- * Fabio Comuni <fabrix.xm@gmail.com>
+ * Redbasic
+ *
+ * Based on duepuntozero Friendica style
+ * by Fabio Comuni <fabrix.xm@gmail.com>
  */
 
 
 /* generals */
 body {
-	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-family: arial,freesans,clean,sans-serif;
 	font-size: 12px;
 	background-color: #ffffff;
 	color: #000000;
 	margin: 0px;
 }
+.jslider {
+	font-family: arial,freesans,clean,sans-serif;
+}
 
 abbr {
 	border-bottom: none;
@@ -19,7 +24,7 @@ abbr {
 
 aside {
 border: none;
-color: #d00;
+color: #0080FF;
 }
 
 /* icons */
@@ -64,7 +69,7 @@ color: #d00;
   background-image: url("../img/network.png");
   min-width: 22px;
   height: 22px; 
-  margin-top: -4px; 
+  margin-top: -3px; 
   background-position: left center;
   padding: 1px;
 }
@@ -96,8 +101,13 @@ color: #d00;
   padding: 1px;
 }
 
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { color: #dd0000; text-decoration: none; }
-a:hover, .fakelink:hover { color: #dd0000; text-decoration: underline; }
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+	color: #0080FF; 
+	text-decoration: none; 
+}
+
+a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 
 .fakelink {
 	cursor: pointer;
@@ -336,11 +346,6 @@ footer {
 	font-weight: bold;
 }
 
-div.wall-item-content-wrapper.shiny {
-	background: #f4f4f4;
-	border: none;
-}
-
 .preview {
 	background: lightyellow;
 }
@@ -660,12 +665,11 @@ input#dfrn-url {
 	padding: 0px 0px 5px 0px;
 	font-size: 120%;
 	font-weight: bold;
-	color: #dd0000;
+	color: #0080FF;
 }
 
 .vcard .title {
 	margin-bottom: 5px;
-	margin-left: 12px;
 }
 
 .vcard dl {
@@ -1063,9 +1067,9 @@ input#dfrn-url {
 	margin-top: 10px;
 	position: relative;
 	background: #fff;
-	border-radius: 5px;
+/*	border-radius: 5px; */
 /*	box-shadow: 12px 12px 12px #111; */
-	border: 1px solid #eec;
+	border-left: 1px solid #eec;
 
 }
 .wall-item-content-wrapper.comment {
@@ -1266,7 +1270,6 @@ input#dfrn-url {
 
 .wall-item-tools {
 	clear: both;
-    background: #eee;
     padding: 5px 10px;
 }    
 
@@ -1409,7 +1412,7 @@ input#dfrn-url {
 	font-size: 1.2em;
 	height: auto;
 	width: auto;
-	background-color: #dd0000;
+	background-color: #0080FF;
 	border-radius: 5px;
 	border: 2px outset;
 	box-shadow: 5px 5px 5px #666;
@@ -1876,7 +1879,7 @@ tr.mceLast {
 
 #profile-jot-submit {
     height: auto;
-    background-color: #dd0000;
+    background-color: #0080FF;
     color: #eeeeec;
     font-weight: bold;
     -webkit-border-radius: 5px;
@@ -2569,6 +2572,13 @@ aside input[type='text'] {
 	margin-top: 4px;
 }
 
+#nav-search-spinner {
+	float: right;
+	margin-top: 8px;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+
 #nav-search-text:hover {
 	background-color: #FFF;
 	color: #000; 
@@ -3584,8 +3594,9 @@ nav .nav-menu {
 nav .nav-menu.selected {
   border-bottom: 4px solid #CCCCCC;
 }
+
 nav .nav-notify {
-  background-color: #0d0;
+  background-color: #0080FF;
   color: #fff;
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
@@ -3622,7 +3633,7 @@ ul.menu-popup {
   position: absolute;
   display: none;
   width: 10em;
-  background: #dd0000;
+  background: #0080FF;
   color: #eec;
   padding: 0px;
   list-style: none;
@@ -3634,13 +3645,15 @@ ul.menu-popup {
 }
 ul.menu-popup a {
   display: block;
-  color: #eec;
+  color: #;
   padding: 5px 10px;
   text-decoration: none;
 }
+
+
 ul.menu-popup a:hover {
-  background-color: #eec;
-  color: #d00;
+  background-color: #888888;
+  color: #000000;
 }
 ul.menu-popup .menu-sep {
   border-top: 1px solid #9eabb0;
@@ -3771,4 +3784,102 @@ ul.menu-popup {
 
 .tabs-end {
 	clear: both;
+}
+
+
+
+
+#acl-wrapper {
+	width: 690px;
+	float:left;
+}
+#acl-search {
+	float:right;
+	background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+	padding-right:20px;
+}
+#acl-showall {
+	float: left;
+	display: block;
+	width: auto;
+	height: 18px;
+	background-color: #cccccc;
+	background-image: url("../../../../images/show_all_off.png");
+	background-position: 7px 7px;
+	background-repeat: no-repeat;
+	padding: 7px 5px 0px 30px;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	color: #999999;
+}
+#acl-showall.selected {
+	color: #000000;
+	background-color: #ff9900;
+	background-image: url("../../../../images/show_all_on.png");
+}
+
+#acl-list {
+	height: 210px;
+	border: 1px solid #cccccc;
+	clear: both;
+	margin-top: 30px;
+	overflow: auto;
+}
+#acl-list-content {
+	
+}
+.acl-list-item {
+	display: block;
+	width: 150px;
+	height: 30px;
+	border: 1px solid #cccccc;
+	margin: 5px;
+	float: left;
+}
+.acl-list-item img{
+	width:22px;
+	height: 22px;
+	float: left;
+	margin: 4px;
+}
+.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
+.acl-list-item a { 
+	font-size: 8px;
+	display: block;
+	width: 40px;
+	height: 10px;
+	float: left;
+	color: #999999;
+	background-color: #cccccc;
+	background-position: 3px 3px;
+	background-repeat: no-repeat;
+	margin-right: 5px;
+	-webkit-border-radius: 2px ;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	padding-left: 15px;
+}
+#acl-wrapper a:hover {
+	text-decoration: none;
+	color:#000000;
+}
+.acl-button-show { background-image: url("../../../../images/show_off.png"); }
+.acl-button-hide { background-image: url("../../../../images/hide_off.png"); }
+
+.acl-button-show.selected {
+	color: #000000;
+	background-color: #9ade00;
+	background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+	color: #000000;
+	background-color: #ff4141;
+	background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow { border-color: #9ade00; }
+.acl-list-item.grouphide { border-color: #ff4141; }
+
+.contact-block-content {
+	margin-top: 8px;
 }
\ No newline at end of file
diff --git a/view/theme/redbasic/img/introductions.png b/view/theme/redbasic/img/introductions.png
index 18ba5dc81..9e0498227 100644
--- a/view/theme/redbasic/img/introductions.png
+++ b/view/theme/redbasic/img/introductions.png
diff --git a/view/theme/redbasic/img/network.png b/view/theme/redbasic/img/network.png
index c213cee04..f3e45c3ec 100644
--- a/view/theme/redbasic/img/network.png
+++ b/view/theme/redbasic/img/network.png
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f777e997f..e4fb00b7a 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -134,7 +134,7 @@ function enableOnUser(){
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
+			{ action: '$baseurl/wall_upload/$nickname',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -145,7 +145,7 @@ function enableOnUser(){
 		);
 		var file_uploader = new window.AjaxUpload(
 			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
+			{ action: '$baseurl/wall_attach/$nickname',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -181,7 +181,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
@@ -214,7 +214,7 @@ function enableOnUser(){
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
 		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
+		$.get('$baseurl/share/' + id, function(data) {
 			if (!editor) $("#profile-jot-text").val("");
 			initEditor(function(){
 				addeditortext(data);
@@ -238,7 +238,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
@@ -257,7 +257,7 @@ function enableOnUser(){
 				commentBusy = true;
 				$('body').css('cursor', 'wait');
 
-				$.get('tagger/' + id + '?term=' + reply);
+				$.get('$baseurl/tagger/' + id + '?term=' + reply);
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
@@ -284,7 +284,7 @@ function enableOnUser(){
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+					$.get('$baseurl/filer/' + id + '?term=' + reply, NavUpdate);
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index b0eb098aa..3b997e215 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -86,6 +86,7 @@
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">$nav.settings.1</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.directory }}<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3">$nav.directory.1</a></li>{{ endif }}
 
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
@@ -133,6 +134,7 @@
 				<input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" />
 			</form>
 		</li>
+		<img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="$pleasewait" />
 
 	</ul>
 </nav>
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
index da50bc7bb..6e441e915 100644
--- a/view/tpl/smarty3/nav.tpl
+++ b/view/tpl/smarty3/nav.tpl
@@ -86,6 +86,7 @@
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">{{$nav.settings.1}}</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+				{{if $nav.directory}}<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a></li>{{/if}}
 
 				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
 
@@ -133,6 +134,7 @@
 				<input id="nav-search-text" type="text" value="" placeholder="{{$nav.search.1}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
 			</form>
 		</li>
+		<img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="{{$pleasewait}}" />
 
 	</ul>
 </nav>