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>
 

view/theme/frio/php/schema.php

@@ -32,7 +32,7 @@ function get_schema_info($schema){
 		'description' => "",
 		'author' => [],
 		'version' => "",
-		'overwrites' => ""
+		'overwrites' => []
 	];
 
 	if (!is_file($themepath . "schema/" . $schema . ".php")) return $info;

view/theme/frio/templates/settings/connectors.tpl

@@ -28,7 +28,7 @@
 						<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
 
 						<div class="form-group pull-right settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+							<button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
 						</div>
 						<div class="clear"></div>
 					</div>
@@ -67,4 +67,4 @@
 {{/if}}
 
 	</form>
-</div>
+</div>

view/theme/vier/style.php

@@ -18,32 +18,22 @@ if (empty($style)) {
 	$style = "plus";
 }
 
-if ($style == "flat") {
-	$stylecssfile = 'view/theme/vier/flat.css';
-} else if ($style == "netcolour") {
-	$stylecssfile = 'view/theme/vier/netcolour.css';
-} else if ($style == "breathe") {
-	$stylecssfile = 'view/theme/vier/breathe.css';
-} else if ($style == "plus") {
-	$stylecssfile = 'view/theme/vier/plus.css';
-} else if ($style == "dark") {
-	$stylecssfile = 'view/theme/vier/dark.css';
-} else if ($style == "plusminus") {
-	$stylecssfile = 'view/theme/vier/plusminus.css';
+$stylecss = '';
+$modified = '';
+
+foreach (['style', $style] as $file) {
+	$stylecssfile = $THEMEPATH . DIRECTORY_SEPARATOR . $file .'.css';
+	if (file_exists($stylecssfile)) {
+		$stylecss .= file_get_contents($stylecssfile);
+		$stylemodified = filemtime($stylecssfile);
+		if ($stylemodified > $modified) {
+			$modified = $stylemodified;
+		}
+	} else {
+		//TODO: use LOGGER_ERROR?
+		logger('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+	}
 }
-
-if (file_exists($THEMEPATH."//style.css")) {
-	$stylecss = file_get_contents($THEMEPATH."//style.css")."\n";
-	$modified = filemtime($THEMEPATH."//style.css");
-}
-
-$stylemodified = filemtime($stylecssfile);
-$stylecss .= file_get_contents($stylecssfile);
-
-if ($stylemodified > $modified) {
-	$modified = $stylemodified;
-}
-
 $modified = gmdate('r', $modified);
 
 $etag = md5($stylecss);
@@ -54,7 +44,6 @@ header('ETag: "'.$etag.'"');
 header('Last-Modified: '.$modified);
 
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
-
 	$cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
 	$cached_etag = str_replace(['"', "-gzip"], ['', ''],
 				stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));