Bläddra i källkod

Misc CDR/other adjustments.

Nate 5 år sedan
förälder
incheckning
ee0e101f47
4 ändrade filer med 49 tillägg och 9 borttagningar
  1. 20 0
      resources/app_languages.php
  2. 7 7
      resources/paging.php
  3. 16 0
      themes/default/app_config.php
  4. 6 2
      themes/default/css.php

+ 20 - 0
resources/app_languages.php

@@ -1987,6 +1987,26 @@ $text['label-end_date_time']['sv-se'] = "Slut Datum/Tid";
 $text['label-end_date_time']['uk-ua'] = "";
 $text['label-end_date_time']['tr-tr'] = "Bitiş Tarihi/Zamanı";
 
+$text['label-date']['en-us'] = "Date";
+$text['label-date']['ar-eg'] = "وقت";
+$text['label-date']['de-at'] = "Datum"; //copied from de-de
+$text['label-date']['de-ch'] = "Datum"; //copied from de-de
+$text['label-date']['de-de'] = "Datum";
+$text['label-date']['es-cl'] = "Fecha";
+$text['label-date']['es-mx'] = "Fecha"; //copied from es-cl
+$text['label-date']['fr-ca'] = "Date"; //copied from fr-fr
+$text['label-date']['fr-fr'] = "Date";
+$text['label-date']['he-il'] = "תאריך שעה";
+$text['label-date']['it-it'] = "Data";
+$text['label-date']['nl-nl'] = "";
+$text['label-date']['pl-pl'] = "Data";
+$text['label-date']['pt-br'] = "Data";
+$text['label-date']['pt-pt'] = "Data";
+$text['label-date']['ro-ro'] = "Data";
+$text['label-date']['ru-ru'] = "Дата";
+$text['label-date']['sv-se'] = "Datum";
+$text['label-date']['uk-ua'] = "Дата";
+
 $text['label-time']['en-us'] = "Time";
 $text['label-time']['ar-eg'] = "";
 $text['label-time']['de-at'] = "Zeit"; //copied from de-de

+ 7 - 7
resources/paging.php

@@ -96,21 +96,21 @@ function paging($num_rows, $param, $rows_per_page, $mini = false, $result_count
 
 	if ($page_number > 0) {
 		$page = $page_number - 1;
-		$prev = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]);
-		$first = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=1".$sanitized_parameters]);
+		$prev = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]);
+		$first = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-left' : null),'link'=>$self."?page=1".$sanitized_parameters]);
 	}
 	else {
-		$prev = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-left' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']);
+		$prev = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-left' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']);
 	}
 
 	if (($page_number + 1) < $max_page) {
 		$page = $page_number + 1;
-		$next = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]);
-		$last = button::create(['type'=>'button','label'=>(!$mini ? $text['button-back'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]);
+		$next = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$page.$sanitized_parameters,'title'=>$text['label-page'].' '.($page+1)]);
+		$last = button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]);
 	}
 	else {
-		$last = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]);
-		$next = button::create(['type'=>'button','label'=>(!$mini ? $text['button-next'] : null),'icon'=>($mini ? 'chevron-right' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']);
+		$last = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'link'=>$self."?page=".$max_page.$sanitized_parameters]);
+		$next = button::create(['type'=>'button','label'=>$text['button-next'],'icon'=>($mini ? 'chevron-right' : null),'onclick'=>"return false;",'title'=>'','style'=>'opacity: 0.4; -moz-opacity: 0.4; cursor: default;']);
 	}
 
 	//if the result count is less than the rows per page then this is the last page of results

+ 16 - 0
themes/default/app_config.php

@@ -590,6 +590,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) of text links outside tables.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4e01bde9-7fa3-4a60-a1ff-113b1d2b9e0a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_heading_padding";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "4px 7px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the padding of table column headings.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fdb84692-190e-4e54-83e4-5d7c8e288d43";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_heading_text_font";
@@ -630,6 +638,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the bottom border color (and opacity) of table header rows.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "515cda7e-01f5-4fb6-9838-a6fb1396647d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_padding";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "4px 7px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the padding of table row cells.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8d756015-05b1-43fb-9de6-85b901b44f3e";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_text_font";

+ 6 - 2
themes/default/css.php

@@ -2215,7 +2215,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		}
 
 	.list-header > th {
-		padding: 4px 7px;
+		padding: <?php echo ($_SESSION['theme']['table_heading_padding']['text'] != '') ? $_SESSION['theme']['table_heading_padding']['text'] : '4px 7px'; ?>;
 		text-align: left;
 		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
 		font-size: <?php echo ($_SESSION['theme']['table_heading_text_size']['text'] != '') ? $_SESSION['theme']['table_heading_text_size']['text'] : '12px'; ?>;
@@ -2224,6 +2224,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_heading_border_color']['text'] != '') ? $_SESSION['theme']['table_heading_border_color']['text'] : '#a4aebf'; ?>;
 		}
 
+	.list-header > th.shrink {
+		width: 1px;
+		}
+
 	.list-row:nth-child(odd) > :not(.action-button) {
 		background: <?php echo ($_SESSION['theme']['table_row_background_color_light']['text'] != '') ? $_SESSION['theme']['table_row_background_color_light']['text'] : '#ffffff'; ?>;
 		}
@@ -2242,7 +2246,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		}
 
 	.list-row > :not(.checkbox) {
-		padding: <?php echo ($_SESSION['theme']['table_row_padding']['text'] != '') ? $_SESSION['theme']['table_row_padding']['text'] : '4px 7px 4px 7px'; ?>;
+		padding: <?php echo ($_SESSION['theme']['table_row_padding']['text'] != '') ? $_SESSION['theme']['table_row_padding']['text'] : '4px 7px'; ?>;
 		}
 
 	.list-row > td.description {