Merge branch 'master' into develop

view/templates/delegate.tpl

@@ -7,6 +7,7 @@
 <form action="{{$baseurl}}/delegate" method="post">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 {{include file="field_select.tpl" field=$parent_user}}
+{{include file="field_password.tpl" field=$parent_password}}
 <div class="submit"><input type="submit" name="delegate" value="{{$submit|escape:'html'}}" /></div>
 </form>
 </div>
@@ -16,23 +17,6 @@
 
 <div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
 
-{{if $managers}}
-<h4>{{$head_managers}}</h4>
-
-{{foreach $managers as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-<hr />
-{{/if}}
-
-
 <h4>{{$head_delegates}}</h4>
 
 {{if $delegates}}

view/templates/field_datetime.tpl

@@ -1,4 +1,6 @@
-{{include file='field_input.tpl' field=$field}}<script type="text/javascript">
+{{include file='field_input.tpl' field=$field}}
+
+<script type="text/javascript">
 	$(function () {
 		$('#id_{{$field.0}}').datetimepicker({
 			step: 5,
@@ -17,6 +19,10 @@
 			dayOfWeekStart: {{$datetimepicker.firstDay}},
 			lang: '{{$datetimepicker.lang}}'
 		});
+{{if $datetimepicker.lang}}
+		jQuery.datetimepicker.setLocale('{{$datetimepicker.lang}}');
+{{/if}}
+
 {{if $datetimepicker.minfrom }}
 		$('#id_{{$datetimepicker.minfrom}}').data('xdsoft_datetimepicker').setOptions({
 			onChangeDateTime: function (currentDateTime) {

view/templates/htconfig.tpl

@@ -85,7 +85,7 @@ $a->config['system']['rino_encrypt'] = {{$rino}};
 // default system theme
 
 $a->config['system']['theme'] = 'vier';
-$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly';
+$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly,frio';
 
 // By default allow pseudonyms
 

view/templates/settings/connectors.tpl

@@ -22,7 +22,7 @@
 
 	<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
 
-	<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="{{$submit}}" /></div>
+	<div class="settings-submit-wrapper" ><input type="submit" id="general-submit" name="general-submit" class="settings-submit" value="{{$submit}}" /></div>
 </div>
 <div class="clear"></div>