Externe Links

Externe Links korrekt öffnen, externe Links auch im Navi-Bereich, Links per CSS gestyled, T-Rex, kleinere Textanpassungen
FriendsOfREDAXO · Dec 5, 2017 · b7c37c1 · b7c37c1
1 parent 9e2b28f
commit b7c37c1
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 19 deletions.
diff --git a/plugins/documentation/assets/documentation.css b/plugins/documentation/assets/documentation.css
@@ -125,3 +125,13 @@ font-family: FontAwesome;
     content: '\f0a9';
     margin-right: 10px;
 }
+
+/* externe Links */
+.addon_documentation a.extern {
+    margin-right: 5px;
+}
+.addon_documentation a.extern:after {
+    font-family: FontAwesome;
+    content: '\f08e';
+    margin-left: 5px;
+}
diff --git a/plugins/documentation/assets/documentation.js b/plugins/documentation/assets/documentation.js
@@ -2,7 +2,7 @@
 function getUrlParameter(sParam, url)
 {
     var sPageURL = window.location.search.substring(1);
-	if (url) sPageURL = url;
+    if (url) sPageURL = url;
     var sURLVariables = sPageURL.split('&');
     for (var i = 0; i < sURLVariables.length; i++)
     {
@@ -12,7 +12,7 @@ function getUrlParameter(sParam, url)
             return sParameterName[1];
         }
     }
-	return '';
+    return '';
 } 
 
 // Dokument per Ajax laden
@@ -23,9 +23,9 @@ function load_doc(elem) {
 
     $url = $(elem).attr('href') + '&ajax=true';
     $target = $('div.addon_documentation-content').find('div.panel-body');
-	$doctitle = $('div.addon_documentation-content').find('#doc-file-name');
-	$document = getUrlParameter('document_file', $url);
-	$($doctitle).html($document);
+    $doctitle = $('div.addon_documentation-content').find('#doc-file-name');
+    $document = getUrlParameter('document_file', $url);
+    $($doctitle).html($document);
 
     $($target).html('<div style="text-align:center;"><i class="fa fa-cog fa-spin fa-2x fa-fw"></i></div>');
 
@@ -38,15 +38,22 @@ function load_doc(elem) {
         {
             $($target).html(response);
             // Externe Links in neuem Fenster
-            $('div.addon_documentation-content').find('a[href^="http"]').each(function(){
-                if ($(this).html() != '') {
-                    $html = $(this).html() + ' <sup><i class="fa fa-external-link"></i></sup>';
-                    $(this).html($html).attr('target','_blank');
+            $('section.addon_documentation').find('a').each(function() {
+                var a = new RegExp('/' + window.location.host + '/');
+                if (!a.test(this.href) && this.href) {
+                    $(this).addClass('extern');
+                    $(this).click(function(event) {
+                        event.preventDefault();
+                        event.stopPropagation();
+                        window.open(this.href, '_blank');
+                    });
                 }
             });
             // Bei internen Links Dokument laden
             $('div.addon_documentation-content a.doclink').on('click', function(event, container){
-                load_doc($(this));
+                if (!$(this).hasClass('extern')) {
+                    load_doc($(this));
+                }
                 event.preventDefault();
                 return false;
             });
@@ -66,19 +73,24 @@ function load_doc(elem) {
 };
 
 $(document).on('rex:ready', function (event, container) {
-
     // Externe Links in neuem Fenster
-    $('div.addon_documentation-content').find('a[href^="http"]').each(function(){
-        if ($(this).html() != '') {
-            $html = $(this).html() + ' <sup><i class="fa fa-external-link"></i></sup>';
-            $(this).html($html).attr('target','_blank');
+    $('section.addon_documentation').find('a').each(function() {
+        var a = new RegExp('/' + window.location.host + '/');
+        if (!a.test(this.href) && this.href) {
+            $(this).addClass('extern');
+            $(this).click(function(event) {
+                event.preventDefault();
+                event.stopPropagation();
+                window.open(this.href, '_blank');
+            });
         }
     });
 
     // Links in der Navigation, interne Links in Dokumenten
     $('div.addon_documentation-navi a, div.addon_documentation-content a.doclink').on('click', function(event, container){
-        load_doc($(this));
-
+        if (!$(this).hasClass('extern')) {
+            load_doc($(this));
+        }
         event.preventDefault();
         return false;
     });

diff --git a/plugins/documentation/docs/de_de/for_small.png b/plugins/documentation/docs/de_de/for_small.png
diff --git a/plugins/documentation/docs/de_de/help_where.md b/plugins/documentation/docs/de_de/help_where.md
@@ -9,8 +9,9 @@ oder im [REDAXO-Channel auf Slack](https://friendsofredaxo.slack.com/) gestellt
 
 ---
 
-`documentation` Plugin auf Github<br>
-[https://github.com/FriendsOfREDAXO/demo_addon](https://github.com/FriendsOfREDAXO/demo_addon)
+`documentation` Plugin auf Github
+
+[github.com/FriendsOfREDAXO/demo_addon](https://github.com/FriendsOfREDAXO/demo_addon)
 
 ---
 

diff --git a/plugins/documentation/docs/de_de/main_intro.md b/plugins/documentation/docs/de_de/main_intro.md
@@ -23,4 +23,6 @@ und erfunden hat's der @dergel (Jan Kristinus) für die [Dokumentation](https://
 
 &raquo; Weiter zur **[Ordner-Struktur](main_folder.md)**
 
+<p style="text-align:center">
 ![FriendsOfREDAXO](for.png)
+</p>
diff --git a/plugins/documentation/docs/de_de/main_navi.md b/plugins/documentation/docs/de_de/main_navi.md
@@ -21,3 +21,9 @@
 @alexplusde (Alexander Walther)
 @aeberhard (Andreas Eberhard)
 @FriendsOfREDAXO
+
+<p style="text-align:center">
+![demo_addon @FriendsOfREDAXO](for_small.png)
+</p>
+
+[demo_addon @FriendsOfREDAXO](https://github.com/FriendsOfREDAXO/demo_addon)