Add new link directive with ability to deselect a link. closes #1211

luyadev · Mar 11, 2017 · b4747b8 · b4747b8
1 parent bcdf10d
commit b4747b8
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ The changelog contains informations about bug fixes, new features or bc breaking
 
 ### Added
 
+- [#1211](https://github.com/luyadev/luya/issues/1211) Add new link directive with ability to deselect a link.
 - [#903](https://github.com/luyadev/luya/issues/903) Added file manager details.
 - [#1216](https://github.com/luyadev/luya/issues/1216) Storage Item object integrated Arrayble Interface.
 - [#1224](https://github.com/luyadev/luya/issues/1224) Settings to define a 404 Error Page to render on HttpExceptions

diff --git a/modules/admin/src/Module.php b/modules/admin/src/Module.php
@@ -188,7 +188,7 @@ public function getJsTranslationMessages()
  return [
  'js_ngrest_rm_page', 'js_ngrest_rm_confirm', 'js_ngrest_error', 'js_ngrest_rm_update', 'js_ngrest_rm_success', 'js_tag_exists', 'js_tag_success', 'js_admin_reload', 'js_dir_till', 'js_dir_set_date', 'js_dir_table_add_row', 'js_dir_table_add_column', 'js_dir_image_description',
  'js_dir_no_selection', 'js_dir_image_upload_ok', 'js_dir_image_filter_error', 'js_dir_upload_wait', 'js_dir_manager_upload_image_ok', 'js_dir_manager_rm_file_confirm', 'js_dir_manager_rm_file_ok', 'js_zaa_server_proccess',
- 'ngrest_select_no_selection', 'js_ngrest_toggler_success', 'js_filemanager_count_files_overlay',
+ 'ngrest_select_no_selection', 'js_ngrest_toggler_success', 'js_filemanager_count_files_overlay', 'js_link_set_value', 'js_link_change_value',
  ];
  }
 

diff --git a/modules/admin/src/messages/de/admin.php b/modules/admin/src/messages/de/admin.php
@@ -231,4 +231,6 @@
  'lock_cms_edit_page' => 'Bearbeitet Seite "{title}".',
  'layout_filemanager_col_size' => 'Dateigrösse',
  'js_filemanager_count_files_overlay' => '%count% Dateien',
+ 'js_link_change_value' => 'Link ändern',
+ 'js_link_set_value' => 'Link setzen',
 ];
diff --git a/modules/admin/src/messages/el/admin.php b/modules/admin/src/messages/el/admin.php
@@ -214,4 +214,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/en/admin.php b/modules/admin/src/messages/en/admin.php
@@ -231,4 +231,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/es/admin.php b/modules/admin/src/messages/es/admin.php
@@ -232,4 +232,6 @@
  'lock_cms_edit_page' => 'Edición de página "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/fr/admin.php b/modules/admin/src/messages/fr/admin.php
@@ -228,4 +228,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/it/admin.php b/modules/admin/src/messages/it/admin.php
@@ -214,4 +214,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/ru/admin.php b/modules/admin/src/messages/ru/admin.php
@@ -233,4 +233,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/ua/admin.php b/modules/admin/src/messages/ua/admin.php
@@ -231,4 +231,6 @@
  'lock_cms_edit_page' => 'Editing page "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/messages/vi/admin.php b/modules/admin/src/messages/vi/admin.php
@@ -231,4 +231,6 @@
  'lock_cms_edit_page' => 'Chỉnh trang "{title}".',
  'layout_filemanager_col_size' => 'File size',
  'js_filemanager_count_files_overlay' => '%count% files',
+ 'js_link_change_value' => 'Change Link',
+ 'js_link_set_value' => 'Set Link',
 ];
diff --git a/modules/admin/src/resources/js/directives.js b/modules/admin/src/resources/js/directives.js
@@ -272,7 +272,7 @@
  '<div class="link-selector">' +
  '<div class="link-selector__btn btn-flat [ grey lighten-4 ]" ng-click="data.modalState=0">' +
  '<i class="material-icons left">insert_link</i>' +
- '<span>Link ändern</span>' +
+ '<span>'+i18n['js_link_change_value']+'</span>' +
  '</div>' +
  '<span class="link-selector__reset" ng-click="unset()"><i class="material-icons">remove_circle</i></span>' +
  '<span class="link-selector__path"><link-object-to-string link="model"></link-object-to-string></span>' +
@@ -282,15 +282,15 @@
  '<div class="link-selector">' +
  '<div class="link-selector__btn btn-flat [ grey lighten-4 ]" ng-click="data.modalState=0">' +
  '<i class="material-icons left">insert_link</i>' +
- '<span>Link setzen</span>' +
+ '<span>'+i18n['js_link_set_value']+'</span>' +
  '</div>' +
  '<span class="link-selector__path">Kein Link gesetzt</span>' +
  '</div>' +
  '</div>' +
  '<modal is-modal-hidden="data.modalState">'+
  '<update-form-redirect data="data.model"></update-form-redirect>'+
  '<button ng-click="unset(); data.modalState=1" type="button" class="btn red"><i class="material-icons">cancel</i></button> '+
- '<button ng-click="data.modalState=1" class="btn" type="button"><i class="material-icons">check</i> Link setzen</button>'+
+ '<button ng-click="data.modalState=1" class="btn" type="button"><i class="material-icons">check</i> '+i18n['js_link_set_value']+'</button>'+
  '</modal>'+
  '</div></div>';
  }

diff --git a/modules/cms/src/admin/messages/en/cmsadmin.php b/modules/cms/src/admin/messages/en/cmsadmin.php
@@ -174,8 +174,8 @@
  'page_update_actions_modal_title' => 'Page Settings',
  'js_page_update_layout_save_success' => 'The layout file has been updated',
  'js_page_create_copy_success' => 'The page copy has been created.',
- 'view_update_offline_info' => 'Change offline/online mode for this page, if a page is only its not accessable by url.',
- 'view_update_hidden_info' => 'Change the visbility of the page, page is acceessable by url but hidden in navigations.',
+ 'view_update_offline_info' => 'Change offline/online state. If a page is offline its not accessible by URL.',
+ 'view_update_hidden_info' => 'Change visibility state. If hidden, its accessible by URL but hidden in navigations.',
  'view_update_homepage_info' => 'Set this page as Homepage.',
  'view_update_block_tooltip_copy' => 'Add to Clipboard',
  'view_update_block_tooltip_visible' => 'Toggle invisible',