From 6c4c1ccb583835ec794468767bc645d7fcdb0db9 Mon Sep 17 00:00:00 2001 From: Abijeet Date: Sun, 10 Jun 2018 17:06:23 +0530 Subject: [PATCH] Changed the way we were displaying the edit icon. Signed-off-by: Abijeet --- .../assets/js/components/page-display.js | 16 ++++++- resources/assets/sass/_pages.scss | 44 +++++++++---------- resources/lang/de/entities.php | 1 + resources/lang/en/entities.php | 1 + resources/lang/es/entities.php | 1 + resources/lang/es_AR/entities.php | 3 +- resources/lang/fr/entities.php | 1 + resources/lang/it/entities.php | 1 + resources/lang/ja/entities.php | 1 + resources/lang/nl/entities.php | 13 +++--- resources/lang/pl/entities.php | 1 + resources/lang/pt_BR/entities.php | 1 + resources/lang/ru/entities.php | 1 + resources/lang/sk/entities.php | 1 + resources/lang/sv/entities.php | 1 + resources/lang/zh_CN/entities.php | 1 + resources/lang/zh_TW/entities.php | 1 + resources/views/pages/show.blade.php | 16 ++++--- 18 files changed, 65 insertions(+), 40 deletions(-) diff --git a/resources/assets/js/components/page-display.js b/resources/assets/js/components/page-display.js index ec5bcd67e..70933ae8c 100644 --- a/resources/assets/js/components/page-display.js +++ b/resources/assets/js/components/page-display.js @@ -75,11 +75,23 @@ class PageDisplay { pointerShowing = false; }); - let updatePointerContent = () => { + let updatePointerContent = ($elem) => { let inputText = pointerModeLink ? window.baseUrl(`/link/${this.pageId}#${pointerSectionId}`) : `{{@${this.pageId}#${pointerSectionId}}}`; if (pointerModeLink && inputText.indexOf('http') !== 0) inputText = window.location.protocol + "//" + window.location.host + inputText; $pointer.find('input').val(inputText); + + // update anchor if present + const $editAnchor = $pointer.find('#pointer-edit'); + if ($editAnchor.length !== 0 && $elem) { + const editHref = $editAnchor.data('editHref'); + const element = $elem[0]; + const elementId = element.id; + + // get the first 50 characters. + let queryContent = element.textContent && element.textContent.substring(0, 50); + $editAnchor[0].href = `${editHref}?content-id=${elementId}&content-text=${encodeURIComponent(queryContent)}`; + } }; // Show pointer when selecting a single block of tagged content @@ -91,7 +103,7 @@ class PageDisplay { // Show pointer and set link let $elem = $(this); pointerSectionId = $elem.attr('id'); - updatePointerContent(); + updatePointerContent($elem); $elem.before($pointer); $pointer.show(); diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index 834218145..1a4f33dae 100755 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -66,17 +66,6 @@ } h1, h2, h3, h4, h5, h6, pre { clear: left; - - .heading-edit-icon { - margin-left: 10px; - font-size: 0.7em; - display: none; - line-height: 1em; - - .svg-icon { - bottom: 0px; - } - } } hr { clear: both; @@ -100,16 +89,6 @@ del { background: #FFECEC; } - h1:hover, - h2:hover, - h3:hover, - h4:hover, - h5:hover, - h6:hover { - .heading-edit-icon { - display: inline; - } - } } // Page content pointers @@ -128,8 +107,13 @@ position: absolute; top: -60px; background-color:#FFF; - width: 272px; + width: 275px; z-index: 55; + + &.is-page-editable { + width: 328px; + } + &:before { position: absolute; left: 50%; @@ -153,12 +137,13 @@ width: 172px; z-index: 40; } - input, button { + input, button, a { position: relative; border-radius: 0; height: 28px; font-size: 12px; vertical-align: top; + padding: 5px 16px; } > i { color: #888; @@ -169,11 +154,22 @@ cursor: pointer; user-select: none; } - .button { + .input-group .button { line-height: 1; margin: 0 0 0 -4px; box-shadow: none; } + a.button { + margin: 0 0 0 0; + + &:hover { + fill: #fff; + } + } + .svg-icon { + width: 1.2em; + height: 1.2em; + } } // Attribute form diff --git a/resources/lang/de/entities.php b/resources/lang/de/entities.php index 250a86ea5..96aaa9b0e 100644 --- a/resources/lang/de/entities.php +++ b/resources/lang/de/entities.php @@ -179,6 +179,7 @@ return [ 'pages_revisions_restore' => 'Wiederherstellen', 'pages_revisions_none' => 'Diese Seite hat keine älteren Versionen.', 'pages_copy_link' => 'Link kopieren', + 'pages_edit_content_link' => 'Inhalt bearbeiten', 'pages_permissions_active' => 'Seiten-Berechtigungen aktiv', 'pages_initial_revision' => 'Erste Veröffentlichung', 'pages_initial_name' => 'Neue Seite', diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index 430655a87..93025ffd4 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -185,6 +185,7 @@ return [ 'pages_revisions_restore' => 'Restore', 'pages_revisions_none' => 'This page has no revisions', 'pages_copy_link' => 'Copy Link', + 'pages_edit_content_link' => 'Edit Content', 'pages_permissions_active' => 'Page Permissions Active', 'pages_initial_revision' => 'Initial publish', 'pages_initial_name' => 'New Page', diff --git a/resources/lang/es/entities.php b/resources/lang/es/entities.php index b02b98e1a..0e8ea95e5 100644 --- a/resources/lang/es/entities.php +++ b/resources/lang/es/entities.php @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => 'Restaurar', 'pages_revisions_none' => 'Esta página no tiene revisiones', 'pages_copy_link' => 'Copiar Enlace', + 'pages_edit_content_link' => 'Contenido editado', 'pages_permissions_active' => 'Permisos de página activos', 'pages_initial_revision' => 'Publicación inicial', 'pages_initial_name' => 'Página nueva', diff --git a/resources/lang/es_AR/entities.php b/resources/lang/es_AR/entities.php index b294f24f9..371f1b7aa 100644 --- a/resources/lang/es_AR/entities.php +++ b/resources/lang/es_AR/entities.php @@ -124,7 +124,7 @@ return [ 'chapters_permissions_active' => 'Permisos de capítulo activado', 'chapters_permissions_success' => 'Permisos de capítulo actualizados', 'chapters_search_this' => 'Buscar en este capítulo', - + /** * Pages */ @@ -185,6 +185,7 @@ return [ 'pages_revisions_restore' => 'Restaurar', 'pages_revisions_none' => 'Esta página no tiene revisiones', 'pages_copy_link' => 'Copiar enlace', + 'pages_edit_content_link' => 'Contenido editado', 'pages_permissions_active' => 'Permisos de página activos', 'pages_initial_revision' => 'Publicación inicial', 'pages_initial_name' => 'Página nueva', diff --git a/resources/lang/fr/entities.php b/resources/lang/fr/entities.php index 7d0696c2a..c8503241e 100644 --- a/resources/lang/fr/entities.php +++ b/resources/lang/fr/entities.php @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => 'Restaurer', 'pages_revisions_none' => 'Cette page n\'a aucune révision', 'pages_copy_link' => 'Copier le lien', + 'pages_edit_content_link' => 'Modifier le contenu', 'pages_permissions_active' => 'Permissions de page actives', 'pages_initial_revision' => 'Publication initiale', 'pages_initial_name' => 'Nouvelle page', diff --git a/resources/lang/it/entities.php b/resources/lang/it/entities.php index e3e44bfed..1941ffb1e 100755 --- a/resources/lang/it/entities.php +++ b/resources/lang/it/entities.php @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => 'Ripristina', 'pages_revisions_none' => 'Questa pagina non ha versioni', 'pages_copy_link' => 'Copia Link', + 'pages_edit_content_link' => 'Modifica contenuto', 'pages_permissions_active' => 'Permessi Pagina Attivi', 'pages_initial_revision' => 'Pubblicazione iniziale', 'pages_initial_name' => 'Nuova Pagina', diff --git a/resources/lang/ja/entities.php b/resources/lang/ja/entities.php index d3699a4c4..c08c4998b 100644 --- a/resources/lang/ja/entities.php +++ b/resources/lang/ja/entities.php @@ -179,6 +179,7 @@ return [ 'pages_revisions_restore' => '復元', 'pages_revisions_none' => 'このページにはリビジョンがありません', 'pages_copy_link' => 'リンクをコピー', + 'pages_edit_content_link' => 'コンテンツの編集', 'pages_permissions_active' => 'ページの権限は有効です', 'pages_initial_revision' => '初回の公開', 'pages_initial_name' => '新規ページ', diff --git a/resources/lang/nl/entities.php b/resources/lang/nl/entities.php index 3b6797975..a807c84ce 100644 --- a/resources/lang/nl/entities.php +++ b/resources/lang/nl/entities.php @@ -14,7 +14,7 @@ return [ 'recent_activity' => 'Recente Activiteit', 'create_now' => 'Maak er zelf één', 'revisions' => 'Revisies', - 'meta_revision' => 'Revisie #:revisionCount', + 'meta_revision' => 'Revisie #:revisionCount', 'meta_created' => 'Aangemaakt :timeLength', 'meta_created_name' => 'Aangemaakt: :timeLength door :user', 'meta_updated' => ':timeLength Aangepast', @@ -44,7 +44,7 @@ return [ * Search */ 'search_results' => 'Zoekresultaten', - 'search_total_results_found' => ':count resultaten gevonden|:count resultaten gevonden', + 'search_total_results_found' => ':count resultaten gevonden|:count resultaten gevonden', 'search_clear' => 'Zoekopdracht wissen', 'search_no_pages' => 'Er zijn geen pagina\'s gevonden', 'search_for_term' => 'Zoeken op :term', @@ -105,7 +105,7 @@ return [ */ 'chapter' => 'Hoofdstuk', 'chapters' => 'Hoofdstukken', - 'x_chapters' => ':count Hoofdstuk|:count Hoofdstukken', + 'x_chapters' => ':count Hoofdstuk|:count Hoofdstukken', 'chapters_popular' => 'Populaire Hoofdstukken', 'chapters_new' => 'Nieuw Hoofdstuk', 'chapters_create' => 'Hoofdstuk Toevoegen', @@ -124,14 +124,14 @@ return [ 'chapters_empty' => 'Er zijn geen pagina\'s in dit hoofdstuk aangemaakt.', 'chapters_permissions_active' => 'Hoofdstuk Permissies Actief', 'chapters_permissions_success' => 'Hoofdstuk Permissies Bijgewerkt', - 'chapters_search_this' => 'Doorzoek dit hoofdstuk', + 'chapters_search_this' => 'Doorzoek dit hoofdstuk', /** * Pages */ 'page' => 'Pagina', 'pages' => 'Pagina\'s', - 'x_pages' => ':count Pagina|:count Pagina\'s', + 'x_pages' => ':count Pagina|:count Pagina\'s', 'pages_popular' => 'Populaire Pagina\'s', 'pages_new' => 'Nieuwe Pagina', 'pages_attachments' => 'Bijlages', @@ -168,7 +168,7 @@ return [ 'pages_move_success' => 'Pagina verplaatst naar ":parentName"', 'pages_permissions' => 'Pagina Permissies', 'pages_permissions_success' => 'Pagina Permissies bijgwerkt', - 'pages_revision' => 'Revisie', + 'pages_revision' => 'Revisie', 'pages_revisions' => 'Pagina Revisies', 'pages_revisions_named' => 'Pagina Revisies voor :pageName', 'pages_revision_named' => 'Pagina Revisie voor :pageName', @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => 'Herstellen', 'pages_revisions_none' => 'Deze pagina heeft geen revisies', 'pages_copy_link' => 'Link Kopiëren', + 'pages_edit_content_link' => 'Bewerk inhoud', 'pages_permissions_active' => 'Pagina Permissies Actief', 'pages_initial_revision' => 'Eerste publicatie', 'pages_initial_name' => 'Nieuwe Pagina', diff --git a/resources/lang/pl/entities.php b/resources/lang/pl/entities.php index cc00c32ff..0407b1396 100644 --- a/resources/lang/pl/entities.php +++ b/resources/lang/pl/entities.php @@ -179,6 +179,7 @@ return [ 'pages_revisions_restore' => 'Przywróć', 'pages_revisions_none' => 'Ta strona nie posiada żadnych rewizji', 'pages_copy_link' => 'Kopiuj link', + 'pages_edit_content_link' => 'Edytuj zawartość', 'pages_permissions_active' => 'Uprawnienia strony aktywne', 'pages_initial_revision' => 'Wydanie pierwotne', 'pages_initial_name' => 'Nowa strona', diff --git a/resources/lang/pt_BR/entities.php b/resources/lang/pt_BR/entities.php index 20527b16d..4dbf9c935 100644 --- a/resources/lang/pt_BR/entities.php +++ b/resources/lang/pt_BR/entities.php @@ -181,6 +181,7 @@ return [ 'pages_revisions_restore' => 'Restaurar', 'pages_revisions_none' => 'Essa página não tem revisões', 'pages_copy_link' => 'Copia Link', + 'pages_edit_content_link' => 'Editar conteúdo', 'pages_permissions_active' => 'Permissões de Página Ativas', 'pages_initial_revision' => 'Publicação Inicial', 'pages_initial_name' => 'Nova Página', diff --git a/resources/lang/ru/entities.php b/resources/lang/ru/entities.php index 124726c1a..a0322d622 100644 --- a/resources/lang/ru/entities.php +++ b/resources/lang/ru/entities.php @@ -181,6 +181,7 @@ return [ 'pages_revisions_restore' => 'Восстановить', 'pages_revisions_none' => 'У этой страницы нет других версий', 'pages_copy_link' => 'Копировать ссылку', + 'pages_edit_content_link' => 'Изменить содержание', 'pages_permissions_active' => 'Действующие разрешения на страницу', 'pages_initial_revision' => 'Первоначальное издание', 'pages_initial_name' => 'Новая страница', diff --git a/resources/lang/sk/entities.php b/resources/lang/sk/entities.php index 25a1af140..8f9a57d1f 100644 --- a/resources/lang/sk/entities.php +++ b/resources/lang/sk/entities.php @@ -166,6 +166,7 @@ return [ 'pages_revisions_restore' => 'Obnoviť', 'pages_revisions_none' => 'Táto stránka nemá žiadne revízie', 'pages_copy_link' => 'Kopírovať odkaz', + 'pages_edit_content_link' => 'Upraviť obsah', 'pages_permissions_active' => 'Oprávnienia stránky aktívne', 'pages_initial_revision' => 'Prvé zverejnenie', 'pages_initial_name' => 'Nová stránka', diff --git a/resources/lang/sv/entities.php b/resources/lang/sv/entities.php index 6aa537b2d..e9d588a9f 100644 --- a/resources/lang/sv/entities.php +++ b/resources/lang/sv/entities.php @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => 'Återställ', 'pages_revisions_none' => 'Sidan har inga revisioner', 'pages_copy_link' => 'Kopiera länk', + 'pages_edit_content_link' => 'Redigera innehåll', 'pages_permissions_active' => 'Anpassade rättigheter är i bruk', 'pages_initial_revision' => 'Första publicering', 'pages_initial_name' => 'Ny sida', diff --git a/resources/lang/zh_CN/entities.php b/resources/lang/zh_CN/entities.php index 3c04c442d..eed6b9532 100644 --- a/resources/lang/zh_CN/entities.php +++ b/resources/lang/zh_CN/entities.php @@ -181,6 +181,7 @@ return [ 'pages_revisions_restore' => '恢复', 'pages_revisions_none' => '此页面没有修订', 'pages_copy_link' => '复制链接', + 'pages_edit_content_link' => '编辑内容', 'pages_permissions_active' => '有效的页面权限', 'pages_initial_revision' => '初始发布', 'pages_initial_name' => '新页面', diff --git a/resources/lang/zh_TW/entities.php b/resources/lang/zh_TW/entities.php index b354a2f2f..664917eaa 100644 --- a/resources/lang/zh_TW/entities.php +++ b/resources/lang/zh_TW/entities.php @@ -182,6 +182,7 @@ return [ 'pages_revisions_restore' => '恢複', 'pages_revisions_none' => '此頁面沒有修訂', 'pages_copy_link' => '複製連結', + 'pages_edit_content_link' => '编辑内容', 'pages_permissions_active' => '有效的頁面權限', 'pages_initial_revision' => '初次發布', 'pages_initial_name' => '新頁面', diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 8ccd2425b..0b6aa7d14 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -124,18 +124,20 @@
-
+
@icon('link') @icon('include', ['style' => 'display:none;']) - - + + + + + @if(userCan('page-update', $page)) + @icon('edit') + @endif
@include('pages/page-display') - - @if(userCan('page-update', $page)) - - @endif
@if ($commentsEnabled)