Permalink
Browse files

Merge pull request #28 from Erftralle/remove-cooliris

Removal of Cooliris integration, fixes #14
  • Loading branch information...
2 parents 31b064a + 11c65d6 commit 19f4b0da08266d08b46cebc42df2953a268d3375 @Chraneco Chraneco committed Jun 10, 2015
@@ -73,8 +73,6 @@ class JoomConfig extends JObject
var $jg_msg_rejectimg_type;
var $jg_msg_global_from;
var $jg_realname;
- var $jg_cooliris;
- var $jg_coolirislink;
var $jg_contentpluginsenabled;
var $jg_itemid;
var $jg_ajaxcategoryselection;
@@ -269,6 +269,8 @@ public function update()
$delete_files[] = JPATH_ADMINISTRATOR.'/components/com_joomgallery/models/fields/ordering.php';
// Old motion gallery
$delete_files[] = JPATH_ROOT.'/media/joomgallery/js/motiongallery.js';
+ // Old raw view for Cooliris
+ $delete_files[] = JPATH_ROOT.'/components/com_joomgallery/views/category/view.raw.php';
foreach($delete_files as $delete_file)
{
@@ -129,8 +129,6 @@ CREATE TABLE IF NOT EXISTS `#__joomgallery_config` (
`jg_msg_rejectimg_type` int(1) NOT NULL,
`jg_msg_global_from` int(1) NOT NULL,
`jg_realname` int(1) NOT NULL,
- `jg_cooliris` int(1) NOT NULL,
- `jg_coolirislink` int(1) NOT NULL,
`jg_contentpluginsenabled` int(1) NOT NULL,
`jg_itemid` varchar(10) NOT NULL,
`jg_ajaxcategoryselection` int(1) NOT NULL,
@@ -519,8 +517,6 @@ INSERT IGNORE INTO `#__joomgallery_config`
/* ### General settings->Additional functions ####*/
/*jg_realname*/ 0,
- /*jg_cooliris*/ 0,
- /*jg_coolirislink*/ 0,
/*jg_contentpluginsenabled*/ 1,
/*jg_itemid*/ '',
/*jg_ajaxcategoryselection*/ 0,
@@ -1 +1,4 @@
ALTER TABLE `#__joomgallery_config` ADD `jg_motionminiLimit` int(2) NOT NULL DEFAULT 0 AFTER `jg_motionminiHeight`;
+
+ALTER TABLE `#__joomgallery_config` DROP `jg_cooliris`;
+ALTER TABLE `#__joomgallery_config` DROP `jg_coolirislink`;
@@ -73,8 +73,6 @@ class TableJoomgalleryConfig extends JTable
var $jg_msg_rejectimg_type;
var $jg_msg_global_from;
var $jg_realname;
- var $jg_cooliris;
- var $jg_coolirislink;
var $jg_contentpluginsenabled;
var $jg_itemid;
var $jg_ajaxcategoryselection;
@@ -167,8 +167,6 @@
JHTML::_('joomconfig.start', 'page6');
JHTML::_('joomconfig.row', 'jg_realname', 'yesno', 'COM_JOOMGALLERY_CONFIG_GS_AF_USERNAME_REALNAME', $this->_config->jg_realname);
- JHTML::_('joomconfig.row', 'jg_cooliris', 'yesno', 'COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_SUPPORT', $this->_config->jg_cooliris);
- JHTML::_('joomconfig.row', 'jg_coolirislink', 'yesno', 'COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_LINK', $this->_config->jg_coolirislink);
JHTML::_('joomconfig.row', 'jg_contentpluginsenabled', 'yesno', 'COM_JOOMGALLERY_CONFIG_GS_AF_CONTENTPLUGINS', $this->_config->get('jg_contentpluginsenabled'));
JHTML::_('joomconfig.row', 'jg_itemid', 'text', 'COM_JOOMGALLERY_CONFIG_GS_AF_ITEMID', $this->_config->get('jg_itemid'));
JHTML::_('joomconfig.row', 'jg_ajaxcategoryselection', 'yesno', 'COM_JOOMGALLERY_CONFIG_GS_AF_AJAXCATEGORYSELECTION', $this->_config->get('jg_ajaxcategoryselection'));
@@ -694,10 +694,6 @@ COM_JOOMGALLERY_CONFIG_GS_AF_AJAXCATEGORYSELECTION="Ajax Category Selection"
COM_JOOMGALLERY_CONFIG_GS_AF_AJAXCATEGORYSELECTION_LONG="If this option is enabled the default drop down boxes with all available categories for selection a category will be replaced by an input field in which a search via AJAX can be done for certain categories.<br />You should enable this option if you have very many categories in your gallery in order to speed up page loads (please also have a look at the following option then)."
COM_JOOMGALLERY_CONFIG_GS_AF_CONTENTPLUGINS="Content Plugins"
COM_JOOMGALLERY_CONFIG_GS_AF_CONTENTPLUGINS_LONG="If this option is enabled you are able to use content plugins in the descriptions of images and categories."
-COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_LINK="Link to start Cooliris"
-COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_LINK_LONG="Should a link to the cooliris gallery be shown in category view? You can alter the thext by modifying the language constant COM_JOOMGALLERY_CATEGORY_COOLIRISLINK_TEXT."
-COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_SUPPORT="Cooliris support"
-COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_SUPPORT_LONG="With the plug-in "_QQ_"Cooliris"_QQ_" (formerly PicLens) installed in the browser the images of a category can be displayed in a full screen gallery. Further information you will find <a href="_QQ_"http://.www.cooliris.com/"_QQ_">here</a>. If the function is set to "_QQ_"yes"_QQ_" a small symbol is shown at the lower left of the thumbnail when moving the cursor over it. A click on it opens the Cooliris Gallery. At page by page design in the JoomGallery in the Cooliris Gallery the images will be loaded page after page dynamically by moving sidewards."
COM_JOOMGALLERY_CONFIG_GS_AF_DISABLEUNREQUIREDCHECKS="Disable unrequired checks"
COM_JOOMGALLERY_CONFIG_GS_AF_DISABLEUNREQUIREDCHECKS_LONG="For being user-friendly e.g. the 'New' or 'Edit' buttons in backend and in user panel of the frontend are only displayed if the user has the permission to execute the specific tasks. If there are very many categories in your gallery these additional checks slow the system down significantly. So, with enabling this option you can deactivate these additional checks in order to improve the performance of JoomGallery. Please note that changing this option will <strong> in no way</strong> affect the security checks in your gallery (it will only reduce the user-friendliness a bit)."
COM_JOOMGALLERY_CONFIG_GS_AF_ITEMID="Default Itemid"
@@ -1563,6 +1559,12 @@ COM_JOOMGALLERY_AJAXUPLOAD_GENERICTITLE_MODE_DESC="If checked all images uploade
;------------------------------------------------------------------------------------
; Deleted, new or changed constants since JoomGallery 3.3
;------------------------------------------------------------------------------------
+; Deleted
+;--------
+;COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_LINK="Link to start Cooliris"
+;COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_LINK_LONG="Should a link to the cooliris gallery be shown in category view? You can alter the thext by modifying the language constant COM_JOOMGALLERY_CATEGORY_COOLIRISLINK_TEXT."
+;COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_SUPPORT="Cooliris support"
+;COM_JOOMGALLERY_CONFIG_GS_AF_COOLIRIS_SUPPORT_LONG="With the plug-in "_QQ_"Cooliris"_QQ_" (formerly PicLens) installed in the browser the images of a category can be displayed in a full screen gallery. Further information you will find <a href="_QQ_"http://.www.cooliris.com/"_QQ_">here</a>. If the function is set to "_QQ_"yes"_QQ_" a small symbol is shown at the lower left of the thumbnail when moving the cursor over it. A click on it opens the Cooliris Gallery. At page by page design in the JoomGallery in the Cooliris Gallery the images will be loaded page after page dynamically by moving sidewards."
;
; New
;--------
@@ -17,11 +17,7 @@
<?php echo $this->pagination->getPagesLinks(); ?>
</div>
<?php endif;
- if($this->_config->get('jg_coolirislink')): ?>
- <a id="jg_cooliris" href="javascript:PicLensLite.start({feedUrl:'<?php echo JRoute::_('index.php?view=category&amp;catid='.$this->category->cid.'&amp;page='.$this->page.'&amp;format=raw', true); ?>',maxScale:0});">
- <?php echo JText::_('COM_JOOMGALLERY_CATEGORY_COOLIRISLINK_TEXT'); ?></a>
-<?php endif; ?>
-<?php if($this->params->get('show_all_in_popup')):
+ if($this->params->get('show_all_in_popup')):
echo $this->popup['before'];
endif;
$count_pics = count($this->images);
@@ -873,18 +873,6 @@ public function display($tpl = null)
}
}
- if($this->_config->get('jg_cooliris') && count($images))
- {
- $href = JRoute::_('index.php?view=category&catid='.$cat->cid.'&page='.$page.'&format=raw');
- $attribs = array('id' => 'gallery', 'type' => 'application/rss+xml', 'title' => 'Cooliris');
- $this->_doc->addHeadLink($href, 'alternate', 'rel', $attribs);
-
- if($this->_config->get('jg_coolirislink'))
- {
- $this->_doc->addScript('http://lite.piclens.com/current/piclens.js');
- }
- }
-
if($this->_config->get('jg_usercatorder') && count($images))
{
$orderby = $this->_mainframe->getUserStateFromRequest('joom.category.images.orderby', 'orderby');
@@ -1,155 +0,0 @@
-<?php
-// $HeadURL: https://joomgallery.org/svn/joomgallery/JG-3/JG/trunk/components/com_joomgallery/views/category/view.raw.php $
-// $Id: view.raw.php 4139 2013-03-14 22:21:57Z chraneco $
-/****************************************************************************************\
-** JoomGallery 3 **
-** By: JoomGallery::ProjectTeam **
-** Copyright (C) 2008 - 2013 JoomGallery::ProjectTeam **
-** Based on: JoomGallery 1.0.0 by JoomGallery::ProjectTeam **
-** Released under GNU GPL Public License **
-** License: http://www.gnu.org/copyleft/gpl.html or have a look **
-** at administrator/components/com_joomgallery/LICENSE.TXT **
-\****************************************************************************************/
-
-defined('_JEXEC') or die('Direct Access to this location is not allowed.');
-
-/**
- * Raw View class for displaying images in Cooliris
- *
- * @package JoomGallery
- * @since 1.5.5
- */
-class JoomGalleryViewCategory extends JoomGalleryView
-{
- /**
- * Raw view display method
- *
- * @access public
- * @return void
- * @since 1.5.5
- */
- function display($tpl = null)
- {
- $catid = JRequest::getInt('catid');
-
- $this->_doc->setMimeEncoding('text/xml');
-
- // Images pagination
- $totalimages = $this->get('TotalImages');
-
- // Calculation of the number of total pages
- $perpage = $this->_config->get('jg_perpage');
- if(!$perpage)
- {
- $perpage = 10;
- }
- $totalpages = floor($totalimages / $perpage);
- $offcut = $totalimages % $perpage;
- if($offcut > 0)
- {
- $totalpages++;
- }
-
- $totalimages = number_format($totalimages, 0, ',', '.');
- // Get the current page
- $page = JRequest::getInt('page', 0);
- if($page > $totalpages)
- {
- $page = $totalpages;
- if($page <= 0)
- {
- $page = 1;
- }
- }
- else
- {
- if($page < 1)
- {
- $page = 1;
- }
- }
-
- $limitstart = ($page - 1) * $perpage;
- JRequest::setVar('limitstart', $limitstart);
- JRequest::setVar('limit', $perpage);
-
- $images = $this->get('Images');
-
- $rss = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/" xmlns:atom="http://www.w3.org/2005/Atom">
- <channel>
- <title>'.$this->_mainframe->getCfg('sitename').'</title>
- <link>'.JURI::root().'</link>
- <description><![CDATA['.JText::_('COM_JOOMGALLERY_COMMON_GALLERY').']]></description>';
-
- if($totalpages == 1)
- {
- $rss .= '
- <atom:link rel="self" href="'.JRoute::_('index.php?option=com_joomgallery&amp;view=category&amp;catid='.$catid.'&amp;format=raw').'" />';
- }
- else
- {
- $rss .= '
- <atom:link rel="self" href="'.JRoute::_('index.php?option=com_joomgallery&amp;view=category&amp;catid='.$catid.'&amp;page='.$page.'&amp;format=raw').'" />';
- }
-
- // Only if showing more than one site analyze prev-next links and output them
- if($totalpages > 1)
- {
- // Prev link only if currentpage > 1
- if($page > 1)
- {
- $prevpage = $page - 1;
- $rss .= '
- <atom:link rel="previous" href="'.JRoute::_('index.php?option=com_joomgallery&amp;view=category&amp;catid='.$catid.'&amp;page='.$prevpage.'&amp;format=raw').'" />';
- }
-
- // Next link only if last site hasn't already been reached
- if($page < $totalpages)
- {
- $nextpage = $page + 1;
- $rss .= '
- <atom:link rel="next" href="'.JRoute::_('index.php?option=com_joomgallery&amp;view=category&amp;catid='.$catid.'&amp;page='.$nextpage.'&amp;format=raw').'" />';
- }
- }
-
- JHtml::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR.'/helpers/html');
-
- foreach($images as $image)
- {
- $title = trim($this->escape($image->imgtitle));
- $text = trim($this->escape($image->imgtext));
- $link = JRoute::_('index.php?view=detail&id='.$image->id);
- $name = $image->imgauthor;
-
- $link_big = 1;
-
- // Check if original image exists, otherwise use detail image
- /*if(file_exists($this->_ambit->getImg('orig_path', $image)))
- {
- $func = 'detail';
- }*/
-
- $contenturl = JHTML::_('joomgallery.openimage', $link_big, $image);
- $contenturl = str_replace('" target="_blank', '', $contenturl);
-
- $rss .= '
- <item>
- <title>'.$title.'</title>
- <link>'.$link.'</link>
- <media:thumbnail url="'.$this->_ambit->getImg('thumb_url', $image).'" />
- <media:content url="'.$contenturl.'" />
- <media:description><![CDATA['.$text.']]></media:description>
- <guid isPermaLink="false">'.JURI::root().'gallery-'.$image->id.'</guid>
- </item>';
- }
-
- $rss .= '
- </channel>
-</rss>';
-
- echo $rss;
-
- #parent::display();
- }
-}
@@ -25,7 +25,6 @@ COM_JOOMGALLERY_AJAXUPLOAD_ERROR_CHUNKSDIR_NOTWRITABLE="Directory %s for saving
COM_JOOMGALLERY_AJAXUPLOAD_PROCESSING="Processing..."
COM_JOOMGALLERY_AJAXUPLOAD_SELECT_IMAGES="Select or drop images here for upload *"
COM_JOOMGALLERY_AJAXUPLOAD_UPLOAD_FAILED="Upload failed"
-COM_JOOMGALLERY_CATEGORY_COOLIRISLINK_TEXT="Start Cooliris!"
COM_JOOMGALLERY_CATEGORY_FEED_SUBCATEGORIES_TIPTEXT="Here you can subscribe to a news feed for the images in this category and all of its sub-categories."
COM_JOOMGALLERY_CATEGORY_FEED_TIPCAPTION="Subscribe"
COM_JOOMGALLERY_CATEGORY_FEED_TIPTEXT="Here you can subscribe to a news feed for the images in this category."
@@ -630,6 +629,9 @@ COM_JOOMGALLERY_UPLOAD_NEW_IMAGE_MAXCOUNT_TIMESPAN_MORE="in %d days"
;------------------------------------------------------------------------------------
; Deleted, new or changed constants since JoomGallery 3.2
;------------------------------------------------------------------------------------
+; Deleted
+;--------
+;COM_JOOMGALLERY_CATEGORY_COOLIRISLINK_TEXT="Start Cooliris!"
; New
;--------
COM_JOOMGALLERY_COMMON_ENTER_IMAGE_TITLE="Enter an image title!"
View
@@ -269,6 +269,8 @@ public function update()
$delete_files[] = JPATH_ADMINISTRATOR.'/components/com_joomgallery/models/fields/ordering.php';
// Old motion gallery
$delete_files[] = JPATH_ROOT.'/media/joomgallery/js/motiongallery.js';
+ // Old raw view for Cooliris
+ $delete_files[] = JPATH_ROOT.'/components/com_joomgallery/views/category/view.raw.php';
foreach($delete_files as $delete_file)
{

0 comments on commit 19f4b0d

Please sign in to comment.