Changeset 1505579

Timestamp:

09/30/2016 04:50:17 AM (9 years ago)

Author:

joje47

Message:

Changed vocabulary (webpage to website) and hide the headlines for category external links and event-page if empty.

Location:

ngo-list

Files:

• tags/1.3.3 (added)
• tags/1.3.3/images (added)
• tags/1.3.3/images/ico_extern.png (added)
• tags/1.3.3/languages (added)
• tags/1.3.3/languages/ngo-list-ar_AR.mo (added)
• tags/1.3.3/languages/ngo-list-ar_AR.po (added)
• tags/1.3.3/languages/ngo-list-en_US.mo (added)
• tags/1.3.3/languages/ngo-list-en_US.po (added)
• tags/1.3.3/languages/ngo-list.pot (added)
• tags/1.3.3/livesearch.php (added)
• tags/1.3.3/ngo-list.php (added)
• tags/1.3.3/readme.txt (added)
• trunk/ngo-list.php (modified) (5 diffs)
• trunk/readme.txt (modified) (2 diffs)

ngo-list/trunk/ngo-list.php

@@ -4 +4 @@
  * Plugin URI: https://ngo-portal.org
  * Description: Detta tillägg visar en föreningslista på Föreningsportalen, inklusive externa sidor och event-sidor. Ska vara aktiverad på portalen, ej på föreningssidorna.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Author: George Bredberg
  * Author URI: https://datagaraget.se
@@ -56 +56 @@
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-// Check to see if mandatory link-categories exists. If not, warn the user.        //
+//////////////////////////////////////////////////////////////////////////////
+// Check to see if mandatory link-categories exists. If not, warn the user.            //
 // Link-categories are created at plugin activation, but could be deleted by user. //
-/////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 add_action( 'admin_init', 'ngol_check_link_cat' );
 function ngol_check_link_cat() {
@@ -122 +122 @@
         }
       }
-
       xmlhttp.open("GET",pluginUrl+"livesearch.php?q="+str,true);
       xmlhttp.send();
@@ -147 +146 @@
 
     echo '<div><ul>';
-    ?><h2><?php _e('Hemsidor', 'ngo-list');?>:</h2><?php
+    ?><h2><?php _e('Webbplatser', 'ngo-list');?>:</h2><?php
     echo '</ul></div>';
     
@@ -208 +207 @@
     ));
     echo '<div><ul class="sitelist">';
+
+    if( !empty( $external_links ) ) {
+        ?><h2><?php _e('Externa webbplatser', 'ngo-list');?>:</h2><?php
+
+        foreach ( $external_links as $external_link ) {
+            echo '<li><a class="sitelist" target="_blank" href="'.$external_link->link_url.'">'.$external_link->link_name.'&nbsp;<img style="display: inline; !important" src="'.$ico_extern.'"/></a></li>';
+        }
+    }
+
+    if( !empty( $event_links ) ) {
+        ?><h2><?php _e('Evenemangssidor', 'ngo-list')?>:</h2><?php
     
-    ?><h2><?php _e('Externa hemsidor', 'ngo-list');?>:</h2><?php
-
-
-    foreach ( $external_links as $external_link ) {
-        echo '<li><a class="sitelist" target="_blank" href="'.$external_link->link_url.'">'.$external_link->link_name.'&nbsp;<img style="display: inline; !important" src="'.$ico_extern.'"/></a></li>';
-    }
-
-    ?><h2><?php _e('Evenemangssidor', 'ngo-list')?>:</h2><?php
-
-    foreach ( $event_links as $event_link ) {
-        printf( '<li><a class="sitelist" href="%s">%s</a></li>', $event_link->link_url, $event_link->link_name );
-    }
-
+        foreach ( $event_links as $event_link ) {
+            printf( '<li><a class="sitelist" href="%s">%s</a></li>', $event_link->link_url, $event_link->link_name );
+        }
+    }
     echo '</ul></div>';
 }

ngo-list/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.6
-Stable tag: 1.3.2
+Stable tag: 1.3.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -42 +42 @@
 
 == Changelog ==
+= 1.3.3 =
+* Latest stable release
+Changed vocabulary (webpage to website) and hide the headlines for category external links and event-page if empty.
+
 = 1.3.2 =
-* Latest stable release
 Changed donation link (important stuff ;) )