Merge remote-tracking branch 'mike/master' into dev

5 files changed, 121 insertions, 2 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 882f50e8a..c3873d823 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -32,7 +32,12 @@ function handle_comment_form(e) {
 	var fields_empty = true;
 
 	if(form.find('.comment-edit-text').length) {
-		form.find('.comment-edit-text').addClass('expanded').removeAttr('placeholder');
+		var commentElm = form.find('.comment-edit-text').attr('id');
+		var submitElm = commentElm.replace(/text/,'submit');
+
+		$('#' + commentElm).addClass('expanded').removeAttr('placeholder');
+		$('#' + commentElm).attr('tabindex','9');
+		$('#' + submitElm).attr('tabindex','10');
 		form.find(':not(:visible)').show();
 	}
 
@@ -43,7 +48,12 @@ function handle_comment_form(e) {
 				fields_empty = false;
 		});
 		if(fields_empty) {
-			form.find('.comment-edit-text').removeClass('expanded').attr('placeholder', aStr.comment);
+			var emptyCommentElm = form.find('.comment-edit-text').attr('id');
+        	var emptySubmitElm = commentElm.replace(/text/,'submit');
+
+			$('#' + emptyCommentElm).removeClass('expanded').attr('placeholder', aStr.comment);
+			$('#' + emptyCommentElm).removeAttr('tabindex');
+			$('#' + emptySubmitElm).removeAttr('tabindex');
 			form.find(':not(.comment-edit-text)').hide();
 		}
 	});
diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js
new file mode 100644
index 000000000..c89142579
--- /dev/null
+++ b/view/js/mod_defperms.js
@@ -0,0 +1,32 @@
+$(document).ready(function() {
+
+	$('#id_permcat').change(function() {
+		$('.loading-role-rotator').show();
+		var permName = $('#id_permcat').val();
+		loadConnectionRole(permName);
+	});
+
+
+});
+
+
+function loadConnectionRole(name) {
+
+	if(! name)
+		name = 'default';
+
+	$('.defperms-edit input').each(function() {
+		if(! $(this).is(':disabled'))
+			$(this).removeAttr('checked');
+	});
+
+	$.get('permcat/' + name, function(data) {
+		$(data.perms).each(function() {
+			if(this.value)
+				$('#id_perms_' + this.name).attr('checked','checked');
+		});
+		$('.loading-role-rotator').hide();
+	});
+}
+
+
diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl
new file mode 100644
index 000000000..53a3ac9e5
--- /dev/null
+++ b/view/pdl/mod_defperms.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[/region]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1b991ce17..0fe823b7e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -973,6 +973,11 @@ a .drop-icons:hover {
 	color: #FF0000;
 }
 
+.perm-inherited {
+	color: #FF0000;
+}
+
+
 #menulist {
 	list-style-type: none;
 }
@@ -1641,6 +1646,17 @@ dl.bb-dl > dd > li {
     background-color: #0275d8;
 }
 
+
+.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
+    background-color: red;
+	border-radius: 3px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+
+}
+
+
+
 .help-searchlist {
 	list-style-type: none;
 }
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
new file mode 100755
index 000000000..f4a711957
--- /dev/null
+++ b/view/tpl/defperms.tpl
@@ -0,0 +1,55 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<form id="abook-edit-form" action="defperms/{{$contact_id}}" method="post" >
+
+		<input type="hidden" name="contact_id" value="{{$contact_id}}">
+		<input type="hidden" name="section" value="{{$section}}">
+
+		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
+			<div class="panel">
+				<div id="perms-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="perms-tool">
+					<div class="section-content-tools-wrapper">
+						<div class="section-content-warning-wrapper">
+						<p>{{$autolbl}}</p>
+						<p>{{$permnote_self}}</p>
+						</div>
+						{{if $permcat_enable}}
+						<div class="loading-role-rotator spinner-wrapper"></div>
+						<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						{{include file="field_select.tpl" field=$permcat}}
+						{{/if}}
+
+						<div class="defperms-edit">
+						{{foreach $perms as $prm}}
+						{{include file="field_checkbox.tpl" field=$prm}}
+						{{/foreach}}
+						</div>
+
+						{{if $hidden_perms}}
+						{{foreach $hidden_perms as $prm}}
+						<input type="hidden" name="{{$prm.0}}" value="{{$prm.1}}" >
+						{{/foreach}}
+						{{/if}}
+
+
+
+						<div>
+							<div class="section-content-info-wrapper">
+							{{$autoapprove}}
+							</div>
+							{{include file="field_checkbox.tpl" field=$autoperms}}
+						</div>
+
+						<div class="settings-submit-wrapper" >
+							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		</form>
+	</div>
+</div>