Merge https://github.com/friendica/red into zpull

mod/settings.php

@@ -977,6 +977,8 @@ function settings_content(&$a) {
 			'$h_advn' => t('Advanced Account/Page Type Settings'),
 			'$h_descadvn' => t('Change the behaviour of this account for special situations'),
 			'$pagetype' => $pagetype,
+			'$expert' => feature_enabled(local_user(),'expert'),
+			'$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'),
 		
 		));
 

view/css/mod_settings.css

@@ -1,20 +1,19 @@
-#settings-permissions-wrapper, #settings-perm-advanced {
+#settings-permissions-wrapper {
-	opacity: 0.3;
+	margin-top: 15px;
-	filter:alpha(opacity=30);
-}
-
-#settings-permissions-wrapper:hover, #settings-perm-advanced:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
 }
 
 #settings-perm-advanced {
 	margin-top: 15px;
 }
 
+.settings-common-perms {
+	margin-top: 15px;
+}
+
 #settings-permissions-wrapper .field {
 	margin-bottom: 10px;
 }
+
 #settings-permissions-wrapper .field label{
 	width: 350px;
 }
@@ -28,8 +27,6 @@
 	margin-bottom: 45px;
 }
 
-
-
 #settings-notifications label {
 	margin-left: 20px;
 }

view/tpl/field_select_disabled.tpl

@@ -0,0 +1,7 @@
+	<div class='field select'>
+		<label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>

view/tpl/settings.tpl

@@ -16,7 +16,7 @@
 {{include file="field_checkbox.tpl" field=$adult}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
 </div>
 
 
@@ -34,20 +34,31 @@
 </ul>
 
 
-<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3>
+<button type="button" class="btn btn-xs btn-warning" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
+
+
+
+<div class="collapse well" id="settings-permissions-wrapper">
+{{if !$expert}}
+	<div class="alert alert-info">{{$hint}}</div>
+{{/if}}
 
-<div id="settings-permissions-wrapper">
 {{foreach $permiss_arr as $permit}}
-{{include file="field_select.tpl" field=$permit}}
+	{{if $expert}}
+		{{include file="field_select.tpl" field=$permit}}
+	{{else}}
+		{{include file="field_select_disabled.tpl" field=$permit}}
+	{{/if}}
 {{/foreach}}
+
+{{if $expert}}
+	<div class="settings-submit-wrapper" >
+	<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+{{/if}}
+
 </div>
-
+<div class="settings-common-perms">
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
 {{$profile_in_dir}}
 
 {{$suggestme}}
@@ -55,6 +66,7 @@
 {{include file="field_input.tpl" field=$maxreq}}
 
 {{include file="field_input.tpl" field=$cntunkmail}}
+</div>
 
 <div id="settings-default-perms" class="settings-default-perms" >
 	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
@@ -77,7 +89,7 @@
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
 </div>
 
 
@@ -108,7 +120,7 @@
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
 </div>
 
 </div>