Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge

6 files changed, 17 insertions, 48 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index b68517e25..cea911440 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -60,8 +60,7 @@ aside .nav-pills > li > a,
 	padding: 6px 10px;
 }
 
-.wall-item-tools .dropdown-menu,
-.section-title-wrapper .dropdown-menu {
+.wall-item-tools .dropdown-menu {
 	min-width: auto;
 }
 
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index 83f17c820..49eb89ecc 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -38,13 +38,13 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#wikis-index th:nth-child(3),
-#wikis-index td:nth-child(3){
+#wikis-index th:nth-child(4),
+#wikis-index td:nth-child(4){
 	padding: 7px 10px 7px 7px;
 }
 
-#wikis-index th:nth-child(4),
-#wikis-index td:nth-child(4){
+#wikis-index th:nth-child(5),
+#wikis-index td:nth-child(5){
 	padding: 7px 10px 7px 7px;
 }
 
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 2b47270c9..bc1f421bd 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -53,7 +53,7 @@
 				}
 			}
 		}
-		if($('#cover-photo').length) {
+		if($('#cover-photo').length && $('main').css('opacity') < 1) {
 			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
 		}
 	});
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index db5ffe3f5..967abea71 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -7,7 +7,7 @@
 				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
 					<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
 				</button>
-				<ul class="dropdown-menu">
+				<ul class="dropdown-menu dropdown-menu-right">
 					{{if $tools}}
 					<li class="nav-item">
 						<a class="nav-link" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
@@ -32,7 +32,7 @@
 			{{if $lock}}
 			<div class="btn-group">
 				<button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
-				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+				<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
 			</div>
 			{{/if}}
 			{{if $prevlink || $nextlink}}
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 1fb7dbec1..eeaf7cd7e 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -27,9 +27,10 @@
 	<div class="section-content-wrapper-np">
 		<table id="wikis-index">
 			<tr>
-				<th width="97%">{{$name}}</th>
+				<th width="96%">{{$name}}</th>
 				<th width="1%">{{$type}}</th>
 				<th width="1%" class="wikis-index-tool"></th>
+				<th width="1%" class="wikis-index-tool"></th>
 				{{if $owner}}
 				<th width="1%"></th>
 				{{/if}}
@@ -38,6 +39,12 @@
 			<tr class="wikis-index-row">
 				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
 				<td>{{$wiki.mimeType}}</td>
+				<td class="wiki-index-tool dropdown">
+					{{if $wiki.lock}}
+					<i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
+					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+					{{/if}}
+				</td>
 				<td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
 				{{if $owner}}
 				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl
index 51eccad90..1f92b5807 100644
--- a/view/tpl/wikilist_widget.tpl
+++ b/view/tpl/wikilist_widget.tpl
@@ -1,45 +1,8 @@
 <div id="wiki_list" class="widget">
 	<h3>{{$header}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		{{if $wikis}}		
 		{{foreach $wikis as $wiki}}
-		<li>{{if $owner}}<a href="#" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('div[id^=\'new-wiki-form-wrapper\']').hide(); openClose('edit-wiki-form-wrapper-{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}}
-			<a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a>
-			<a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a>
-			{{if $owner}}
-			<div id="edit-wiki-form-wrapper-{{$wiki.resource_id}}" class="section-content-tools-wrapper" style="display:none;">
-				<form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
-					<div class="clear"></div>
-					<div class="btn-group pull-right">
-						<button class="btn btn-xs btn-danger" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"><i class="fa fa-trash-o"></i>&nbsp;Delete Wiki</button>
-					</div>
-				</form>
-				<div class="clear"></div>
-			</div>
-			{{/if}}
-		</li> 
+		<li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
 		{{/foreach}}
-		{{/if}}
-		{{if $owner}}
-		<li><a href="#" class="fakelink" onclick="wiki_show_new_wiki_form(); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
-		{{/if}}
 	</ul>
-	{{if $owner}}
-	<div id="new-wiki-form-wrapper" class="sub-menu" style="display:none;">
-		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			{{include file="field_input.tpl" field=$wikiName}}
-			{{include file="field_checkbox.tpl" field=$notify}}
-			<div>
-				<div id="profile-jot-submit-right" class="btn-group">
-					<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}}
-					</button>
-					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$create}}</button>
-				</div>
-			</div>
-		</form>
-		<div class="clear"></div>
-	</div>
-	{{/if}}
 </div>
-{{$acl}}