From 2ba8992e3d7c0b9d5f59e994968419c63a831ff5 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Thu, 4 Aug 2011 14:46:35 -0400
Subject: [PATCH] Added a toolbar icon to a dialog window that contains all
 link code (HTML, BBCode, URLs).

---
 .../controllers/admin_embedlinks.php          |  19 +++++--
 .../embedlinks/controllers/embedlinks.php     |  47 ++++++++++--------
 .../embedlinks/css/embedlinks_menu.css        |   3 ++
 .../embedlinks/helpers/embedlinks_block.php   |   2 +-
 .../embedlinks/helpers/embedlinks_event.php   |  39 +++++++++++++++
 .../helpers/embedlinks_installer.php          |  42 ++++++++++++++++
 .../embedlinks/helpers/embedlinks_theme.php   |   5 ++
 .../embedlinks/images/ico-view-embedlinks.png | Bin 0 -> 3571 bytes
 3.0/modules/embedlinks/module.info            |   8 +--
 .../views/embedlinks_alllinksdialog.html.php  |  14 ++++++
 .../views/embedlinks_photo_block.html.php     |   2 +-
 .../views/embedlinks_sidebar.html.php         |   2 +-
 .../controllers/admin_embedlinks.php          |  19 +++++--
 .../embedlinks/controllers/embedlinks.php     |  47 ++++++++++--------
 .../embedlinks/css/embedlinks_menu.css        |   3 ++
 .../embedlinks/helpers/embedlinks_block.php   |   2 +-
 .../embedlinks/helpers/embedlinks_event.php   |  39 +++++++++++++++
 .../helpers/embedlinks_installer.php          |  42 ++++++++++++++++
 .../embedlinks/helpers/embedlinks_theme.php   |   5 ++
 .../embedlinks/images/ico-view-embedlinks.png | Bin 0 -> 3571 bytes
 3.1/modules/embedlinks/module.info            |   8 +--
 .../views/embedlinks_alllinksdialog.html.php  |  14 ++++++
 .../views/embedlinks_photo_block.html.php     |   2 +-
 .../views/embedlinks_sidebar.html.php         |   2 +-
 24 files changed, 300 insertions(+), 66 deletions(-)
 create mode 100644 3.0/modules/embedlinks/css/embedlinks_menu.css
 create mode 100644 3.0/modules/embedlinks/helpers/embedlinks_installer.php
 create mode 100644 3.0/modules/embedlinks/images/ico-view-embedlinks.png
 create mode 100644 3.0/modules/embedlinks/views/embedlinks_alllinksdialog.html.php
 create mode 100644 3.1/modules/embedlinks/css/embedlinks_menu.css
 create mode 100644 3.1/modules/embedlinks/helpers/embedlinks_installer.php
 create mode 100644 3.1/modules/embedlinks/images/ico-view-embedlinks.png
 create mode 100644 3.1/modules/embedlinks/views/embedlinks_alllinksdialog.html.php

diff --git a/3.0/modules/embedlinks/controllers/admin_embedlinks.php b/3.0/modules/embedlinks/controllers/admin_embedlinks.php
index f25f97e8..89d98dcd 100644
--- a/3.0/modules/embedlinks/controllers/admin_embedlinks.php
+++ b/3.0/modules/embedlinks/controllers/admin_embedlinks.php
@@ -39,7 +39,8 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
     $BBCodeButton = false;
     $FullURLButton = false;
     $InPageLinks = false;
-    
+    $ToolbarLinks = false;
+
     for ($i = 0; $i < count($linkOpts_array); $i++) {
       if ($linkOpts_array[$i] == "HTMLCode") {
         $HTMLButton = true;
@@ -55,15 +56,19 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
       if ($displayType_array[$i] == "InPageLinks") {
         $InPageLinks = true;
       }
+      if ($displayType_array[$i] == "ToolbarLinks") {
+        $ToolbarLinks = true;
+      }
     }
-    
+
     // Save Settings.
     module::set_var("embedlinks", "HTMLCode", $HTMLButton);
     module::set_var("embedlinks", "BBCode", $BBCodeButton);
     module::set_var("embedlinks", "FullURL", $FullURLButton);
     module::set_var("embedlinks", "InPageLinks", $InPageLinks);
+    module::set_var("embedlinks", "ToolbarLinks", $ToolbarLinks);
     message::success(t("Your Selection Has Been Saved."));
-    
+
     // Load Admin page.
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_embedlinks.html");
@@ -83,7 +88,11 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
 
     // Make an array for the different methods of displaying the links.
     $linkDisplays["InPageLinks"] = array(t("Show Links In The Actual Page"), module::get_var("embedlinks", "InPageLinks"));
-    
+
+    // Make an array for the different methods of displaying the links.
+    $linkDisplays["InPageLinks"] = array(t("Show Links In The Actual Page"), module::get_var("embedlinks", "InPageLinks"));
+    $linkDisplays["ToolbarLinks"] = array(t("Display toolbar image for HTML/BBCode/URLs links"), module::get_var("embedlinks", "ToolbarLinks"));
+
     // Setup a few checkboxes on the form.
     $add_links = $form->group("EmbedLinks");
     $add_links->checklist("LinkCodeTypeOptions")
@@ -97,4 +106,4 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
     // Return the newly generated form.
     return $form;
   }
-}
\ No newline at end of file
+}
diff --git a/3.0/modules/embedlinks/controllers/embedlinks.php b/3.0/modules/embedlinks/controllers/embedlinks.php
index 53db22a1..2ff53b1a 100644
--- a/3.0/modules/embedlinks/controllers/embedlinks.php
+++ b/3.0/modules/embedlinks/controllers/embedlinks.php
@@ -18,9 +18,15 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class EmbedLinks_Controller extends Controller {
-  /**
-   * Display the EXIF data for an item.
-   */
+  public function showlinks($item_id) {
+    // Generate the Dialog Box for all HTML/BBCode/URLs available for $item.
+    $item = ORM::factory("item", $item_id);
+    access::required("view", $item);
+    $view = new View("embedlinks_alllinksdialog.html");
+    $view->item_id = $item_id;
+    print $view;
+  }
+
   public function showhtml($item_id) {
     // Generate the Dialog Box for HTML links.
     $item = ORM::factory("item", $item_id);
@@ -31,14 +37,14 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[0] = array("Text:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;>Click Here</a>");
       $linkArray[1] = array("Thumbnail:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkTitles[0] = array("Link To This Album:", 2);
-        
+
     // If the item is a movie, don't display resize links, do display an embed link.
     } elseif ($item->is_movie()) {
       // Link to the current page.
       $linkArray[0] = array("Text:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;>Click Here</a>");
       $linkArray[1] = array("Thumbnail:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkTitles[0] = array("Link To This Page:", 2);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -61,7 +67,7 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[4] = array("Thumbnail:", "<a href=&quot;" . $item->resize_url(true) . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkArray[5] = array("Image:", "<img src=&quot;" . $item->resize_url(true) . "&quot;>");
       $linkTitles[1] = array("Link To The Resized Image:", 3);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -71,7 +77,7 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[2] = array("Link To The Full Size Image:", 3);        
       }
     }
-    
+
     $view = new View("embedlinks_htmldialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
@@ -80,22 +86,22 @@ class EmbedLinks_Controller extends Controller {
 
   public function showbbcode($item_id) {
     // Generate the Dialog Box for BBCode links.
-  $item = ORM::factory("item", $item_id);
+    $item = ORM::factory("item", $item_id);
     access::required("view", $item);
-    
+
     // If the current page is an album, only display two links.
     if ($item->is_album()) {
       $linkArray[0] = array("Text:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "]Click Here[/url]");
       $linkArray[1] = array("Thumbnail:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkTitles[0] = array("Link To This Album:", 2);  
-    
+
     // If the item is a movie, don't display resize links.
     } elseif ($item->is_movie()) {
       // Link to the current page.
       $linkArray[0] = array("Text:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "]Click Here[/url]");
       $linkArray[1] = array("Thumbnail:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkTitles[0] = array("Link To This Page:", 2);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -103,7 +109,7 @@ class EmbedLinks_Controller extends Controller {
         $linkArray[3] = array("Thumbnail:", "[url=" . $item->file_url(true) . "][img]" . $item->thumb_url(true) . "[/img][/url]");
         $linkTitles[1] = array("Link To The Video File:", 2);        
       }
-    
+
     // Or else assume the item is a photo.
     } else {
       // Link to the current page.
@@ -117,7 +123,7 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[4] = array("Thumbnail:", "[url=" . $item->resize_url(true) . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkArray[5] = array("Image:", "[img]" . $item->resize_url(true) . "[/img]");
       $linkTitles[1] = array("Link To The Resized Image:", 3);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -127,7 +133,7 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[2] = array("Link To The Full Size Image:", 3);        
       }
     }
-    
+
     $view = new View("embedlinks_bbcodedialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
@@ -136,9 +142,9 @@ class EmbedLinks_Controller extends Controller {
 
   public function showfullurl($item_id) {
     // Generate the Dialog Box for the URLs to the items thumb, resize and fullsize image.
-  $item = ORM::factory("item", $item_id);
+    $item = ORM::factory("item", $item_id);
     access::required("view", $item);
-    
+
     // If the current page is an album, only display a URL and thumnail fields.
     if ($item->is_album()) {
       $linkArray[0] = array("Album URL:", url::abs_site("{$item->type}s/{$item->id}"));
@@ -150,7 +156,7 @@ class EmbedLinks_Controller extends Controller {
       // Link to the current page.    
       $linkArray[0] = array("This Page:", url::abs_site("{$item->type}s/{$item->id}"));
       $linkArray[1] = array("Thumbnail:", $item->thumb_url(true));
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display its URL.
       if (access::can("view_full", $item)) {
@@ -159,14 +165,14 @@ class EmbedLinks_Controller extends Controller {
       } else {
         $linkTitles[0] = array("URLs:", 2);  
       }
-    
+
     // Or else assume the item is a photo.
     } else {
       // Link to the current page.    
       $linkArray[0] = array("This Page:", url::abs_site("{$item->type}s/{$item->id}"));
       $linkArray[1] = array("Thumbnail:", $item->thumb_url(true));
       $linkArray[2] = array("Resized:", $item->resize_url(true));
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display its URL.
       if (access::can("view_full", $item)) {
@@ -176,11 +182,10 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[0] = array("URLs:", 3);  
       }
     }
-    
+
     $view = new View("embedlinks_fullurldialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
     print $view;
   }
-  
 }
diff --git a/3.0/modules/embedlinks/css/embedlinks_menu.css b/3.0/modules/embedlinks/css/embedlinks_menu.css
new file mode 100644
index 00000000..6a4af408
--- /dev/null
+++ b/3.0/modules/embedlinks/css/embedlinks_menu.css
@@ -0,0 +1,3 @@
+#g-view-menu #g-embedlinks-link {
+  background-image: url('../images/ico-view-embedlinks.png');
+}
diff --git a/3.0/modules/embedlinks/helpers/embedlinks_block.php b/3.0/modules/embedlinks/helpers/embedlinks_block.php
index 0985007e..4f35280d 100644
--- a/3.0/modules/embedlinks/helpers/embedlinks_block.php
+++ b/3.0/modules/embedlinks/helpers/embedlinks_block.php
@@ -47,7 +47,7 @@ class embedlinks_block_Core {
         $block->title = t("Links");
         $block->content = new View("embedlinks_album_block.html");
       }
-	  break;
+      break;
     }
 
     return $block;
diff --git a/3.0/modules/embedlinks/helpers/embedlinks_event.php b/3.0/modules/embedlinks/helpers/embedlinks_event.php
index 69699a09..bafe383d 100644
--- a/3.0/modules/embedlinks/helpers/embedlinks_event.php
+++ b/3.0/modules/embedlinks/helpers/embedlinks_event.php
@@ -25,4 +25,43 @@ class embedlinks_event_Core {
                ->label(t("EmbedLinks"))
                ->url(url::site("admin/embedlinks")));
   }
+
+  static function album_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
+
+  static function photo_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
+
+  static function movie_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
 }
diff --git a/3.0/modules/embedlinks/helpers/embedlinks_installer.php b/3.0/modules/embedlinks/helpers/embedlinks_installer.php
new file mode 100644
index 00000000..3e98d59a
--- /dev/null
+++ b/3.0/modules/embedlinks/helpers/embedlinks_installer.php
@@ -0,0 +1,42 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class embedlinks_installer {
+  static function install() {
+    // Set some default values.
+    module::set_var("embedlinks", "HTMLCode", true);
+    module::set_var("embedlinks", "BBCode", true);
+    module::set_var("embedlinks", "FullURL", true);
+    module::set_var("embedlinks", "InPageLinks", false);
+    module::set_var("embedlinks", "ToolbarLinks", true);
+
+    // Set the module version number.
+    module::set_version("embedlinks", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+    // Set some default values.
+    module::set_var("embedlinks", "ToolbarLinks", true);
+
+    // Set the module version number.
+    module::set_version("embedlinks", 2);
+    }
+  }
+}
diff --git a/3.0/modules/embedlinks/helpers/embedlinks_theme.php b/3.0/modules/embedlinks/helpers/embedlinks_theme.php
index 86338b31..6d548597 100644
--- a/3.0/modules/embedlinks/helpers/embedlinks_theme.php
+++ b/3.0/modules/embedlinks/helpers/embedlinks_theme.php
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class embedlinks_theme_Core {
+  static function head($theme) {
+    // Load css code for the toolbar icon.
+    return $theme->css("embedlinks_menu.css");
+  }
+
   static function photo_bottom($theme) {
     // If the current item is a photo and displaying "In Page" links
     //   is enabled, then insert HTML/BBCode links into the bottom
diff --git a/3.0/modules/embedlinks/images/ico-view-embedlinks.png b/3.0/modules/embedlinks/images/ico-view-embedlinks.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a66dd8dfc4de227c191ade9c3438569458b1c3
GIT binary patch
literal 3571
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

literal 0
HcmV?d00001

diff --git a/3.0/modules/embedlinks/module.info b/3.0/modules/embedlinks/module.info
index c5eeb06b..e6b7f8bf 100644
--- a/3.0/modules/embedlinks/module.info
+++ b/3.0/modules/embedlinks/module.info
@@ -1,7 +1,7 @@
 name = "EmbedLinks"
 description = "Display BBCode and HTML code to embed links to albums/images into other web pages."
-version = 1
-author_name = ""
-author_url = ""
+version = 2
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:embedlinks"
-discuss_url = "http://gallery.menalto.com/forum_module_embedlinks"
+discuss_url = "http://gallery.menalto.com/node/88322"
diff --git a/3.0/modules/embedlinks/views/embedlinks_alllinksdialog.html.php b/3.0/modules/embedlinks/views/embedlinks_alllinksdialog.html.php
new file mode 100644
index 00000000..a1cd4035
--- /dev/null
+++ b/3.0/modules/embedlinks/views/embedlinks_alllinksdialog.html.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script> 
+  $(function() {
+    $( "#tabs" ).tabs();
+  });
+</script> 
+<h1 style="display: none;"><?= t("Link to this page") ?></h1>
+<div id="tabs" style="height: 300px"> 
+  <ul>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showhtml/{$item_id}") ?>" title="<?= t("HTML Links") ?>"><?= t("HTML Links") ?></a></li>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showbbcode/{$item_id}") ?>" title="<?= t("BBCode Links") ?>"><?= t("BBCode Links") ?></a></li>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showfullurl/{$item_id}") ?>" title="<?= t("URLs") ?>"><?= t("URLs") ?></a></li>
+  </ul> 
+</div>
diff --git a/3.0/modules/embedlinks/views/embedlinks_photo_block.html.php b/3.0/modules/embedlinks/views/embedlinks_photo_block.html.php
index 97bb51c0..ab26eb93 100644
--- a/3.0/modules/embedlinks/views/embedlinks_photo_block.html.php
+++ b/3.0/modules/embedlinks/views/embedlinks_photo_block.html.php
@@ -198,4 +198,4 @@ input[type="text"] {
 
   </tbody>
 </table>
-<? } ?>
\ No newline at end of file
+<? } ?>
diff --git a/3.0/modules/embedlinks/views/embedlinks_sidebar.html.php b/3.0/modules/embedlinks/views/embedlinks_sidebar.html.php
index 21d8b7f3..0991382a 100644
--- a/3.0/modules/embedlinks/views/embedlinks_sidebar.html.php
+++ b/3.0/modules/embedlinks/views/embedlinks_sidebar.html.php
@@ -21,4 +21,4 @@
   <span class="ui-icon ui-icon-info"></span>
   <?= t("Show URLs") ?>
 </a>
-<? } ?>
\ No newline at end of file
+<? } ?>
diff --git a/3.1/modules/embedlinks/controllers/admin_embedlinks.php b/3.1/modules/embedlinks/controllers/admin_embedlinks.php
index f25f97e8..89d98dcd 100644
--- a/3.1/modules/embedlinks/controllers/admin_embedlinks.php
+++ b/3.1/modules/embedlinks/controllers/admin_embedlinks.php
@@ -39,7 +39,8 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
     $BBCodeButton = false;
     $FullURLButton = false;
     $InPageLinks = false;
-    
+    $ToolbarLinks = false;
+
     for ($i = 0; $i < count($linkOpts_array); $i++) {
       if ($linkOpts_array[$i] == "HTMLCode") {
         $HTMLButton = true;
@@ -55,15 +56,19 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
       if ($displayType_array[$i] == "InPageLinks") {
         $InPageLinks = true;
       }
+      if ($displayType_array[$i] == "ToolbarLinks") {
+        $ToolbarLinks = true;
+      }
     }
-    
+
     // Save Settings.
     module::set_var("embedlinks", "HTMLCode", $HTMLButton);
     module::set_var("embedlinks", "BBCode", $BBCodeButton);
     module::set_var("embedlinks", "FullURL", $FullURLButton);
     module::set_var("embedlinks", "InPageLinks", $InPageLinks);
+    module::set_var("embedlinks", "ToolbarLinks", $ToolbarLinks);
     message::success(t("Your Selection Has Been Saved."));
-    
+
     // Load Admin page.
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_embedlinks.html");
@@ -83,7 +88,11 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
 
     // Make an array for the different methods of displaying the links.
     $linkDisplays["InPageLinks"] = array(t("Show Links In The Actual Page"), module::get_var("embedlinks", "InPageLinks"));
-    
+
+    // Make an array for the different methods of displaying the links.
+    $linkDisplays["InPageLinks"] = array(t("Show Links In The Actual Page"), module::get_var("embedlinks", "InPageLinks"));
+    $linkDisplays["ToolbarLinks"] = array(t("Display toolbar image for HTML/BBCode/URLs links"), module::get_var("embedlinks", "ToolbarLinks"));
+
     // Setup a few checkboxes on the form.
     $add_links = $form->group("EmbedLinks");
     $add_links->checklist("LinkCodeTypeOptions")
@@ -97,4 +106,4 @@ class Admin_EmbedLinks_Controller extends Admin_Controller {
     // Return the newly generated form.
     return $form;
   }
-}
\ No newline at end of file
+}
diff --git a/3.1/modules/embedlinks/controllers/embedlinks.php b/3.1/modules/embedlinks/controllers/embedlinks.php
index 53db22a1..2ff53b1a 100644
--- a/3.1/modules/embedlinks/controllers/embedlinks.php
+++ b/3.1/modules/embedlinks/controllers/embedlinks.php
@@ -18,9 +18,15 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class EmbedLinks_Controller extends Controller {
-  /**
-   * Display the EXIF data for an item.
-   */
+  public function showlinks($item_id) {
+    // Generate the Dialog Box for all HTML/BBCode/URLs available for $item.
+    $item = ORM::factory("item", $item_id);
+    access::required("view", $item);
+    $view = new View("embedlinks_alllinksdialog.html");
+    $view->item_id = $item_id;
+    print $view;
+  }
+
   public function showhtml($item_id) {
     // Generate the Dialog Box for HTML links.
     $item = ORM::factory("item", $item_id);
@@ -31,14 +37,14 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[0] = array("Text:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;>Click Here</a>");
       $linkArray[1] = array("Thumbnail:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkTitles[0] = array("Link To This Album:", 2);
-        
+
     // If the item is a movie, don't display resize links, do display an embed link.
     } elseif ($item->is_movie()) {
       // Link to the current page.
       $linkArray[0] = array("Text:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;>Click Here</a>");
       $linkArray[1] = array("Thumbnail:", "<a href=&quot;" . url::abs_site("{$item->type}s/{$item->id}") . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkTitles[0] = array("Link To This Page:", 2);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -61,7 +67,7 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[4] = array("Thumbnail:", "<a href=&quot;" . $item->resize_url(true) . "&quot;><img src=&quot;" . $item->thumb_url(true) . "&quot;></a>");
       $linkArray[5] = array("Image:", "<img src=&quot;" . $item->resize_url(true) . "&quot;>");
       $linkTitles[1] = array("Link To The Resized Image:", 3);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -71,7 +77,7 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[2] = array("Link To The Full Size Image:", 3);        
       }
     }
-    
+
     $view = new View("embedlinks_htmldialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
@@ -80,22 +86,22 @@ class EmbedLinks_Controller extends Controller {
 
   public function showbbcode($item_id) {
     // Generate the Dialog Box for BBCode links.
-  $item = ORM::factory("item", $item_id);
+    $item = ORM::factory("item", $item_id);
     access::required("view", $item);
-    
+
     // If the current page is an album, only display two links.
     if ($item->is_album()) {
       $linkArray[0] = array("Text:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "]Click Here[/url]");
       $linkArray[1] = array("Thumbnail:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkTitles[0] = array("Link To This Album:", 2);  
-    
+
     // If the item is a movie, don't display resize links.
     } elseif ($item->is_movie()) {
       // Link to the current page.
       $linkArray[0] = array("Text:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "]Click Here[/url]");
       $linkArray[1] = array("Thumbnail:", "[url=" . url::abs_site("{$item->type}s/{$item->id}") . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkTitles[0] = array("Link To This Page:", 2);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -103,7 +109,7 @@ class EmbedLinks_Controller extends Controller {
         $linkArray[3] = array("Thumbnail:", "[url=" . $item->file_url(true) . "][img]" . $item->thumb_url(true) . "[/img][/url]");
         $linkTitles[1] = array("Link To The Video File:", 2);        
       }
-    
+
     // Or else assume the item is a photo.
     } else {
       // Link to the current page.
@@ -117,7 +123,7 @@ class EmbedLinks_Controller extends Controller {
       $linkArray[4] = array("Thumbnail:", "[url=" . $item->resize_url(true) . "][img]" . $item->thumb_url(true) . "[/img][/url]");
       $linkArray[5] = array("Image:", "[img]" . $item->resize_url(true) . "[/img]");
       $linkTitles[1] = array("Link To The Resized Image:", 3);  
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display links to it.
       if (access::can("view_full", $item)) {
@@ -127,7 +133,7 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[2] = array("Link To The Full Size Image:", 3);        
       }
     }
-    
+
     $view = new View("embedlinks_bbcodedialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
@@ -136,9 +142,9 @@ class EmbedLinks_Controller extends Controller {
 
   public function showfullurl($item_id) {
     // Generate the Dialog Box for the URLs to the items thumb, resize and fullsize image.
-  $item = ORM::factory("item", $item_id);
+    $item = ORM::factory("item", $item_id);
     access::required("view", $item);
-    
+
     // If the current page is an album, only display a URL and thumnail fields.
     if ($item->is_album()) {
       $linkArray[0] = array("Album URL:", url::abs_site("{$item->type}s/{$item->id}"));
@@ -150,7 +156,7 @@ class EmbedLinks_Controller extends Controller {
       // Link to the current page.    
       $linkArray[0] = array("This Page:", url::abs_site("{$item->type}s/{$item->id}"));
       $linkArray[1] = array("Thumbnail:", $item->thumb_url(true));
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display its URL.
       if (access::can("view_full", $item)) {
@@ -159,14 +165,14 @@ class EmbedLinks_Controller extends Controller {
       } else {
         $linkTitles[0] = array("URLs:", 2);  
       }
-    
+
     // Or else assume the item is a photo.
     } else {
       // Link to the current page.    
       $linkArray[0] = array("This Page:", url::abs_site("{$item->type}s/{$item->id}"));
       $linkArray[1] = array("Thumbnail:", $item->thumb_url(true));
       $linkArray[2] = array("Resized:", $item->resize_url(true));
-      
+
       // If the visitor has suficient privlidges to see the fullsized
       //    version of the current image, then display its URL.
       if (access::can("view_full", $item)) {
@@ -176,11 +182,10 @@ class EmbedLinks_Controller extends Controller {
         $linkTitles[0] = array("URLs:", 3);  
       }
     }
-    
+
     $view = new View("embedlinks_fullurldialog.html");
     $view->titles = $linkTitles;
     $view->details = $linkArray;
     print $view;
   }
-  
 }
diff --git a/3.1/modules/embedlinks/css/embedlinks_menu.css b/3.1/modules/embedlinks/css/embedlinks_menu.css
new file mode 100644
index 00000000..6a4af408
--- /dev/null
+++ b/3.1/modules/embedlinks/css/embedlinks_menu.css
@@ -0,0 +1,3 @@
+#g-view-menu #g-embedlinks-link {
+  background-image: url('../images/ico-view-embedlinks.png');
+}
diff --git a/3.1/modules/embedlinks/helpers/embedlinks_block.php b/3.1/modules/embedlinks/helpers/embedlinks_block.php
index 0985007e..4f35280d 100644
--- a/3.1/modules/embedlinks/helpers/embedlinks_block.php
+++ b/3.1/modules/embedlinks/helpers/embedlinks_block.php
@@ -47,7 +47,7 @@ class embedlinks_block_Core {
         $block->title = t("Links");
         $block->content = new View("embedlinks_album_block.html");
       }
-	  break;
+      break;
     }
 
     return $block;
diff --git a/3.1/modules/embedlinks/helpers/embedlinks_event.php b/3.1/modules/embedlinks/helpers/embedlinks_event.php
index 69699a09..bafe383d 100644
--- a/3.1/modules/embedlinks/helpers/embedlinks_event.php
+++ b/3.1/modules/embedlinks/helpers/embedlinks_event.php
@@ -25,4 +25,43 @@ class embedlinks_event_Core {
                ->label(t("EmbedLinks"))
                ->url(url::site("admin/embedlinks")));
   }
+
+  static function album_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
+
+  static function photo_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
+
+  static function movie_menu($menu, $theme) {
+    // Display embedlinks toolbar icon, if the corresponding setting is enabled.
+    if (module::get_var("embedlinks", "ToolbarLinks") == true) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("embedlinks")
+                 ->label(t("Link to this page"))
+                 ->url(url::site("embedlinks/showlinks/" . $theme->item()->id))
+                 ->css_class("g-dialog-link")
+                 ->css_id("g-embedlinks-link"));
+    }
+  }
 }
diff --git a/3.1/modules/embedlinks/helpers/embedlinks_installer.php b/3.1/modules/embedlinks/helpers/embedlinks_installer.php
new file mode 100644
index 00000000..3e98d59a
--- /dev/null
+++ b/3.1/modules/embedlinks/helpers/embedlinks_installer.php
@@ -0,0 +1,42 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class embedlinks_installer {
+  static function install() {
+    // Set some default values.
+    module::set_var("embedlinks", "HTMLCode", true);
+    module::set_var("embedlinks", "BBCode", true);
+    module::set_var("embedlinks", "FullURL", true);
+    module::set_var("embedlinks", "InPageLinks", false);
+    module::set_var("embedlinks", "ToolbarLinks", true);
+
+    // Set the module version number.
+    module::set_version("embedlinks", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+    // Set some default values.
+    module::set_var("embedlinks", "ToolbarLinks", true);
+
+    // Set the module version number.
+    module::set_version("embedlinks", 2);
+    }
+  }
+}
diff --git a/3.1/modules/embedlinks/helpers/embedlinks_theme.php b/3.1/modules/embedlinks/helpers/embedlinks_theme.php
index 86338b31..6d548597 100644
--- a/3.1/modules/embedlinks/helpers/embedlinks_theme.php
+++ b/3.1/modules/embedlinks/helpers/embedlinks_theme.php
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class embedlinks_theme_Core {
+  static function head($theme) {
+    // Load css code for the toolbar icon.
+    return $theme->css("embedlinks_menu.css");
+  }
+
   static function photo_bottom($theme) {
     // If the current item is a photo and displaying "In Page" links
     //   is enabled, then insert HTML/BBCode links into the bottom
diff --git a/3.1/modules/embedlinks/images/ico-view-embedlinks.png b/3.1/modules/embedlinks/images/ico-view-embedlinks.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a66dd8dfc4de227c191ade9c3438569458b1c3
GIT binary patch
literal 3571
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

literal 0
HcmV?d00001

diff --git a/3.1/modules/embedlinks/module.info b/3.1/modules/embedlinks/module.info
index c5eeb06b..e6b7f8bf 100644
--- a/3.1/modules/embedlinks/module.info
+++ b/3.1/modules/embedlinks/module.info
@@ -1,7 +1,7 @@
 name = "EmbedLinks"
 description = "Display BBCode and HTML code to embed links to albums/images into other web pages."
-version = 1
-author_name = ""
-author_url = ""
+version = 2
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:embedlinks"
-discuss_url = "http://gallery.menalto.com/forum_module_embedlinks"
+discuss_url = "http://gallery.menalto.com/node/88322"
diff --git a/3.1/modules/embedlinks/views/embedlinks_alllinksdialog.html.php b/3.1/modules/embedlinks/views/embedlinks_alllinksdialog.html.php
new file mode 100644
index 00000000..a1cd4035
--- /dev/null
+++ b/3.1/modules/embedlinks/views/embedlinks_alllinksdialog.html.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script> 
+  $(function() {
+    $( "#tabs" ).tabs();
+  });
+</script> 
+<h1 style="display: none;"><?= t("Link to this page") ?></h1>
+<div id="tabs" style="height: 300px"> 
+  <ul>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showhtml/{$item_id}") ?>" title="<?= t("HTML Links") ?>"><?= t("HTML Links") ?></a></li>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showbbcode/{$item_id}") ?>" title="<?= t("BBCode Links") ?>"><?= t("BBCode Links") ?></a></li>
+    <li><a class="g-menu-link" href="<?= url::site("embedlinks/showfullurl/{$item_id}") ?>" title="<?= t("URLs") ?>"><?= t("URLs") ?></a></li>
+  </ul> 
+</div>
diff --git a/3.1/modules/embedlinks/views/embedlinks_photo_block.html.php b/3.1/modules/embedlinks/views/embedlinks_photo_block.html.php
index 97bb51c0..ab26eb93 100644
--- a/3.1/modules/embedlinks/views/embedlinks_photo_block.html.php
+++ b/3.1/modules/embedlinks/views/embedlinks_photo_block.html.php
@@ -198,4 +198,4 @@ input[type="text"] {
 
   </tbody>
 </table>
-<? } ?>
\ No newline at end of file
+<? } ?>
diff --git a/3.1/modules/embedlinks/views/embedlinks_sidebar.html.php b/3.1/modules/embedlinks/views/embedlinks_sidebar.html.php
index 21d8b7f3..0991382a 100644
--- a/3.1/modules/embedlinks/views/embedlinks_sidebar.html.php
+++ b/3.1/modules/embedlinks/views/embedlinks_sidebar.html.php
@@ -21,4 +21,4 @@
   <span class="ui-icon ui-icon-info"></span>
   <?= t("Show URLs") ?>
 </a>
-<? } ?>
\ No newline at end of file
+<? } ?>