소스 검색

Bridges: Integrate Action Bar, delete on edit.

Nate 6 년 전
부모
커밋
8715d4f078
4개의 변경된 파일189개의 추가작업 그리고 5개의 파일을 삭제
  1. 103 1
      resources/app_languages.php
  2. 42 1
      themes/default/app_config.php
  3. 12 2
      themes/default/config.php
  4. 32 1
      themes/default/css.php

+ 103 - 1
resources/app_languages.php

@@ -337,6 +337,27 @@ $text['confirm-copy']['sv-se'] = "Vill du verkligen kopiera detta?";
 $text['confirm-copy']['uk-ua'] = "";
 $text['confirm-copy']['tr-tr'] = "Bunu gerçekten kopyalamak istiyor musunuz?";
 
+$text['confirm-toggle']['en-us'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['ar-eg'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['de-at'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['de-ch'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['de-de'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['es-cl'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['es-mx'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['fr-ca'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['fr-fr'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['he-il'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['it-it'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['nl-nl'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['pl-pl'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['pt-br'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['pt-pt'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['ro-ro'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['ru-ru'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['sv-se'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['uk-ua'] = "Do you really want to toggle this?";
+$text['confirm-toggle']['tr-tr'] = "Do you really want to toggle this?";
+
 $text['button-apply']['en-us'] = "Apply";
 $text['button-apply']['ar-eg'] = "";
 $text['button-apply']['de-at'] = "Anwenden"; //copied from de-de
@@ -1154,6 +1175,66 @@ $text['button-qr_code']['ru-ru'] = "QR Код";
 $text['button-qr_code']['sv-se'] = "QR Kod";
 $text['button-qr_code']['uk-ua'] = "";
 
+$text['button-toggle']['en-us'] = "Toggle";
+$text['button-toggle']['ar-eg'] = "Toggle";
+$text['button-toggle']['de-at'] = "Toggle";
+$text['button-toggle']['de-ch'] = "Toggle";
+$text['button-toggle']['de-de'] = "Toggle";
+$text['button-toggle']['es-cl'] = "Toggle";
+$text['button-toggle']['es-mx'] = "Toggle";
+$text['button-toggle']['fr-ca'] = "Toggle";
+$text['button-toggle']['fr-fr'] = "Toggle";
+$text['button-toggle']['he-il'] = "Toggle";
+$text['button-toggle']['it-it'] = "Toggle";
+$text['button-toggle']['nl-nl'] = "Toggle";
+$text['button-toggle']['pl-pl'] = "Toggle";
+$text['button-toggle']['pt-br'] = "Toggle";
+$text['button-toggle']['pt-pt'] = "Toggle";
+$text['button-toggle']['ro-ro'] = "Toggle";
+$text['button-toggle']['ru-ru'] = "Toggle";
+$text['button-toggle']['sv-se'] = "Toggle";
+$text['button-toggle']['uk-ua'] = "Toggle";
+
+$text['button-check_all']['en-us'] = "Check All";
+$text['button-check_all']['ar-eg'] = "Check All";
+$text['button-check_all']['de-at'] = "Check All";
+$text['button-check_all']['de-ch'] = "Check All";
+$text['button-check_all']['de-de'] = "Check All";
+$text['button-check_all']['es-cl'] = "Check All";
+$text['button-check_all']['es-mx'] = "Check All";
+$text['button-check_all']['fr-ca'] = "Check All";
+$text['button-check_all']['fr-fr'] = "Check All";
+$text['button-check_all']['he-il'] = "Check All";
+$text['button-check_all']['it-it'] = "Check All";
+$text['button-check_all']['nl-nl'] = "Check All";
+$text['button-check_all']['pl-pl'] = "Check All";
+$text['button-check_all']['pt-br'] = "Check All";
+$text['button-check_all']['pt-pt'] = "Check All";
+$text['button-check_all']['ro-ro'] = "Check All";
+$text['button-check_all']['ru-ru'] = "Check All";
+$text['button-check_all']['sv-se'] = "Check All";
+$text['button-check_all']['uk-ua'] = "Check All";
+
+$text['button-check_none']['en-us'] = "Check None";
+$text['button-check_none']['ar-eg'] = "Check None";
+$text['button-check_none']['de-at'] = "Check None";
+$text['button-check_none']['de-ch'] = "Check None";
+$text['button-check_none']['de-de'] = "Check None";
+$text['button-check_none']['es-cl'] = "Check None";
+$text['button-check_none']['es-mx'] = "Check None";
+$text['button-check_none']['fr-ca'] = "Check None";
+$text['button-check_none']['fr-fr'] = "Check None";
+$text['button-check_none']['he-il'] = "Check None";
+$text['button-check_none']['it-it'] = "Check None";
+$text['button-check_none']['nl-nl'] = "Check None";
+$text['button-check_none']['pl-pl'] = "Check None";
+$text['button-check_none']['pt-br'] = "Check None";
+$text['button-check_none']['pt-pt'] = "Check None";
+$text['button-check_none']['ro-ro'] = "Check None";
+$text['button-check_none']['ru-ru'] = "Check None";
+$text['button-check_none']['sv-se'] = "Check None";
+$text['button-check_none']['uk-ua'] = "Check None";
+
 $text['label-total']['en-us'] = "Total";
 $text['label-total']['ar-eg'] = "";
 $text['label-total']['de-at'] = "Summe"; //copied from de-de
@@ -2450,7 +2531,28 @@ $text['label-context']['ro-ro'] = "";
 $text['label-context']['ru-ru'] = "Контекст";
 $text['label-context']['sv-se'] = "Context";
 $text['label-context']['uk-ua'] = "Контекст";
-  
+
+$text['label-copy']['en-us'] = "Copy";
+$text['label-copy']['ar-eg'] = "";
+$text['label-copy']['de-at'] = "Kopieren"; //copied from de-de
+$text['label-copy']['de-ch'] = "Kopieren"; //copied from de-de
+$text['label-copy']['de-de'] = "Kopieren";
+$text['label-copy']['es-cl'] = "Copiar";
+$text['label-copy']['es-mx'] = "Copiar"; //copied from es-cl
+$text['label-copy']['fr-ca'] = "Copier"; //copied from fr-fr
+$text['label-copy']['fr-fr'] = "Copier";
+$text['label-copy']['he-il'] = "העתק";
+$text['label-copy']['it-it'] = "Copia";
+$text['label-copy']['nl-nl'] = "";
+$text['label-copy']['pl-pl'] = "Kopiuj";
+$text['label-copy']['pt-br'] = "Copiar"; //copied from pt-pt
+$text['label-copy']['pt-pt'] = "Copiar";
+$text['label-copy']['ro-ro'] = "";
+$text['label-copy']['ru-ru'] = "Копировать";
+$text['label-copy']['sv-se'] = "Kopiera";
+$text['label-copy']['uk-ua'] = "Копіювати";
+$text['label-copy']['tr-tr'] = "Kopyala";
+
 $text['label-music_on_hold']['en-us'] = "Music on Hold";
 $text['label-music_on_hold']['ar-eg'] = "موسيقى المؤجلة";
 $text['label-music_on_hold']['de-at'] = "Wartemusik"; //copied from de-de

+ 42 - 1
themes/default/app_config.php

@@ -1645,4 +1645,45 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "/themes/default/images/logo_side_expanded.png";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the expanded brand image path for the Side menu.";
-?>
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "dde32589-2d0d-4d10-a42a-3948061c17fe";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_bottom_size";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0 0 1px 0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Sets the border size of the Action Bar.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8a2d3b59-a54a-4519-b049-4293e1f0dd4a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_bottom_style";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "solid";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Sets the border style of the Action Bar.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1f5f0f7b-e779-48d0-b1a6-afa1a2c9cf9e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_bottom_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#dddddd";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Sets the border color of the Action Bar.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "544cec97-3407-42f8-8627-32f92bcbc46b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_bottom_radius";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Sets the border radius of the Action Bar.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9de3beba-3b56-40e3-b312-111674a3b30f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_background";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "rgba(255,255,255,0.9)";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Sets the background color/opacity/image of the Action Bar.";
+
+?>

+ 12 - 2
themes/default/config.php

@@ -1,8 +1,8 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-pencil-alt'></span></button>";
 	$v_link_label_add = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-plus'></span></button>";
+	$v_link_label_edit = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-pencil-alt'></span></button>";
 	$v_link_label_delete = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-minus'></span></button>";
 	$v_link_label_view = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-eye'></span></button>";
 	$v_link_label_play = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-play'></span></button>";
@@ -10,4 +10,14 @@
 	$v_link_label_stop = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-stop'></span></button>";
 	$v_link_label_download = "<button type='button' class='btn btn-default list_control_icon'><span class='fas fa-cloud-download-alt'></span></button>";
 
-?>
+//icon buttons
+	$v_button_icon_add = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-plus'></span></button>";
+	$v_button_icon_edit = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-pencil-alt'></span></button>";
+	$v_button_icon_delete = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-minus'></span></button>";
+	$v_button_icon_view = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-eye'></span></button>";
+	$v_button_icon_play = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-play'></span></button>";
+	$v_button_icon_pause = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-pause'></span></button>";
+	$v_button_icon_stop = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-stop'></span></button>";
+	$v_button_icon_download = "<button type='button' class='btn btn-default btn-icon'><span class='fas fa-cloud-download-alt'></span></button>";
+
+?>

+ 32 - 1
themes/default/css.php

@@ -2035,4 +2035,35 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 	div.form_set > .field.nowrap {
 		white-space: nowrap;
-		}
+		}
+
+/*******************************************************************************/
+
+	div.action_bar {
+		position: -webkit-sticky;
+		position: sticky;
+		<?php
+		switch ($_SESSION['theme']['menu_style']['text']) {
+			case 'side':
+				$action_bar_top = '0';
+				break;
+			case 'inline':
+			case 'static':
+				$action_bar_top = '-1px';
+				break;
+			case 'fixed':
+			default:
+				$action_bar_top = '49px';
+		}
+		?>
+		top: <?php echo $action_bar_top; ?>;
+		text-align: right;
+		border-bottom-width: <?php echo ($_SESSION['theme']['action_bar_border_bottom_size']['text'] != '') ? $_SESSION['theme']['action_bar_border_bottom_size']['text'] : '1px'; ?>;
+		border-bottom-style: <?php echo ($_SESSION['theme']['action_bar_border_bottom_style']['text'] != '') ? $_SESSION['theme']['action_bar_border_bottom_style']['text'] : 'solid'; ?>;
+		border-bottom-color: <?php echo ($_SESSION['theme']['action_bar_border_bottom_color']['text'] != '') ? $_SESSION['theme']['action_bar_border_bottom_color']['text'] : '#ddd'; ?>;
+		border-bottom-left-radius: <?php echo ($_SESSION['theme']['action_bar_border_bottom_radius']['text'] != '') ? $_SESSION['theme']['action_bar_border_bottom_radius']['text'] : '0'; ?>;
+		border-bottom-right-radius: <?php echo ($_SESSION['theme']['action_bar_border_bottom_radius']['text'] != '') ? $_SESSION['theme']['action_bar_border_bottom_radius']['text'] : '0'; ?>;
+		padding: 10px;
+		background: <?php echo ($_SESSION['theme']['action_bar_background']['text'] != '') ? $_SESSION['theme']['action_bar_background']['text'] : 'rgba(255,255,255,0.9)'; ?>;
+		margin: -10px -10px 10px -10px;
+		}