Commit 6a14a6e3 authored by profix898's avatar profix898

- task: make advanced_help notice more present

- task: rename "Your album" to "My Album"
parent bc51cc30
......@@ -71,7 +71,7 @@ function _gallery_init($full = FALSE, $vars = NULL, $report_error = TRUE) {
$embed_uri = isset($vars['gallery_embed_uri']) ? $vars['gallery_embed_uri'] : variable_get('gallery_embed_uri', '?q=gallery');
$gallery_valid = isset($vars) ? (isset($vars['gallery_valid']) ? $vars['gallery_valid'] : TRUE) : variable_get('gallery_valid', 0);
$uid = isset($vars) ? (isset($vars['uid']) ? $vars['uid'] : '') : (($user->uid > 0) ? $user->uid : '');
$uid = isset($vars) ? (isset($vars['uid']) ? $vars['uid'] : NULL) : (($user->uid > 0) ? $user->uid : NULL);
// Language-prefix url rewrite
if (function_exists('language_url_rewrite') && $language->prefix) {
......
g2image
\ No newline at end of file
; $Id$
name = "Gallery G2Image"
description = "Integrates G2Image with Gallery module"
description = "Integrates G2Image with Gallery module."
package = "Gallery2"
dependencies[] = gallery
......
......@@ -208,6 +208,16 @@ function _gallery_install($form_state) {
'#description' => t(''),
);
// Check for advanced_help module
if (!module_exists('advanced_help')) {
drupal_set_message(t('If you install the <a href="@url">advanced help</a> module, Gallery module will provide more
and better help.', array('@url' => 'http://drupal.org/project/advanced_help')));
}
else {
$install_help = theme('advanced_help_topic', 'gallery', 'install', t('Install Tutorial'));
drupal_set_message(t('Dont know where to start? Try the "!install-help" page.', array('!install-help' => $install_help)));
}
if (!isset($form_state['storage'])) {
$install_status = _gallery_install_status_init();
$install_status['step'] = GALLERY_INSTALL_STEP_PHPMEMORY;
......
; $Id$
name = "Gallery Menu"
description = "Gallery2 albums => Drupal menu items"
description = "Adds Drupal menu items for Gallery2 albums."
package = "Gallery2"
dependencies[] = gallery
......
......@@ -41,7 +41,7 @@ function gallery_menu_menu() {
$useralbum_exists = (gallery_single_plugin_status('useralbum') == GALLERY_PLUGIN_ENABLED);
if (variable_get('gallery_valid', 0) && $useralbum_exists) {
$items['useralbum'] = array(
'title' => 'Your Album',
'title' => 'My Album',
'description' => 'Go to your Gallery2 useralbum.',
'access callback' => 'gallery_menu_useralbum_access',
'page callback' => 'gallery_menu_useralbum'
......
<p>Configuration "Filter"</p>
\ No newline at end of file
<p>Configuration "General"</p>
\ No newline at end of file
<p>Configuration</p>
\ No newline at end of file
[filter]
title = Gallery2 Filter
file = filter-gallery
[install]
title = Installation: Tutorial
file = install
weight = 0
[install-urlrewrite]
title = Installation: URLRewrite
file = install-urlrewrite
parent = install
[install-directory]
title = Installation: Directory Settings
file = install-directory
parent = install
[config]
title = Configuration / Options
file = config
weight = 1
[config-general]
title = Configuration: General
file = config-general
parent = config
[config-filter]
title = Configuration: Filter
file = config-filter
parent = config
[filter]
title = Gallery2 Filter
file = filter-gallery
weight = 2
<p>Installation: URLRewrite</p>
\ No newline at end of file
<p>
<h2>Gallery 2 </h2>
<p>[<a href="http://gallery.menalto.com/downloads" title="http://gallery.menalto.com/downloads" rel="nofollow">Download</a>] Gallery2 and <a href="http://codex.gallery2.org/Gallery2:How_do_I_Install_Gallery2" title="Gallery2:How do I Install Gallery2">install</a> it according to documentation. Make sure to get the 'full' package because 'minimal' and 'typical' do not contain the required 'ImageBlock' (and 'ImageFrame') plugins. Gallery2 should be installed *inside* (or below) your Drupal root directory so that it's accessible by the same website. If you want/need to install Gallery2 somewhere else (e.g. at the same level as your Drupal codebase), you should create a symlink to G2 from inside your Drupal folder, e.g. </p>
<p>[<a href="http://gallery.menalto.com/downloads" title="http://gallery.menalto.com/downloads" target="_blank">Download</a>] Gallery2 and <a href="http://codex.gallery2.org/Gallery2:How_do_I_Install_Gallery2" title="Gallery2:How do I Install Gallery2" target="_blank">install</a> it according to documentation. Make sure to get the 'full' package because 'minimal' and 'typical' do not contain the required 'ImageBlock' (and 'ImageFrame') plugins. Gallery2 should be installed *inside* (or below) your Drupal root directory so that it's accessible by the same website. If you want/need to install Gallery2 somewhere else (e.g. at the same level as your Drupal codebase), you should create a symlink to G2 from inside your Drupal folder, e.g. </p>
<pre>cd /var/www/drupaldir<br />ln -s /path/to/gallery2 </pre>
<p><strong>Warning - Do not place your Gallery2 codebase at &quot;/drupaldir/gallery&quot;.</strong> We usually recommend that you place G2 (or the symlink) in &quot;/drupaldir/gallery2&quot;, but you can place it anywhere you like except in &quot;/drupaldir/gallery&quot; because this conflicts with the Drupal gallery module path as Drupal assumes that <em>http://www.drupalsite.com/gallery</em> refers to the Drupal module (and not to the G2 codebase). </p>
<p><em>FYI: In principle you can even place G2 outside the Drupal root directory and it should still work. The reason why we highly recommend you to keep G2 inside the Drupal dir is a limitation of the Drupal API and some advanced features that require this configuration. The drupal_add_js/css() functions do not support external paths. But without these functions we cant preserve a certain order of js/css includes in the resulting page. This is important for certain purposes, i.e. lightbox integration, jquery usage, ...</em> </p>
<p>If you want/need a Gallery2 multisite setup, we recommend that you place the individual sites at &quot;/drupaldir/sites/yoursite/gallery2&quot;. </p>
<p>Make sure you have the &quot;Image Block&quot; plugin (<a href="http://codex.gallery2.org/Gallery2:Modules:imageblock" title="Gallery2:Modules:imageblock">Gallery2:Modules:imageblock</a>) installed and enabled in G2 before proceeding with the embedded setup. You should also configure &quot;URL Rewrite&quot; in your standalone Gallery2 and set the &quot;Rules&quot; to </p>
<p>Make sure you have the &quot;Image Block&quot; plugin (<a href="http://codex.gallery2.org/Gallery2:Modules:imageblock" title="Gallery2:Modules:imageblock" target="_blank">Gallery2:Modules:imageblock</a>) installed and enabled in G2 before proceeding with the embedded setup. You should also configure &quot;URL Rewrite&quot; in your standalone Gallery2 and set the &quot;Rules&quot; to </p>
<pre>Show Item: &quot;gallery/v/%path%&quot; </pre>
<p>Please read the <a href="http://codex.gallery2.org/Integration:Drupal:Installation:URL_Rewrite" title="Integration:Drupal:Installation:URL Rewrite">URL Rewrite</a> tutorial for more information. </p>
<p>Please read the <a href="http://codex.gallery2.org/Integration:Drupal:Installation:URL_Rewrite" title="Integration:Drupal:Installation:URL Rewrite" target="_blank">URL Rewrite</a> tutorial for more information. </p>
<p>If you plan to create a multilingual site (e.g. using the i18n module in Drupal), do NOT prefix the paths with &quot;%language%&quot;.</p>
<h2> Drupal </h2>
<p><strong>Log out of your standalone Gallery2 to avoid session issues during embedded setup.</strong> </p>
<p>Get the latest gallery module package from drupal.org (<a href="http://drupal.org/project/gallery" title="http://drupal.org/project/gallery" rel="nofollow">[1]</a>). Unpack the archive into your &quot;/modules&quot; (or &quot;/sites/all/modules&quot; or &quot;/sites/yoursite/modules&quot;) directory. <em>Unless explicitly stated the most recent version of gallery module for your Drupal core release always works with the latest version of Gallery2.</em> </p>
<p>Get the latest gallery module package from drupal.org (<a href="http://drupal.org/project/gallery" title="http://drupal.org/project/gallery" target="_blank">[1]</a>). Unpack the archive into your &quot;/modules&quot; (or &quot;/sites/all/modules&quot; or &quot;/sites/yoursite/modules&quot;) directory. <em>Unless explicitly stated the most recent version of gallery module for your Drupal core release always works with the latest version of Gallery2.</em> </p>
<p>Enable the gallery module (and optionally the other modules from the package) at Administer &gt; Site building &gt; Modules (admin/build/modules). To setup the embedded gallery you still need to specify some details of your G2 installation. Start the installation wizard provided by the gallery module by navigating to Administer &gt; Site configuration &gt; Gallery settings (admin/settings/gallery). <em>You can always return to the &quot;Install&quot; tab (admin/settings/gallery/install) later to get a configuration and status report of your embedded G2 and its plugins.</em> </p>
<p>The install wizard should be quite intuitive to walk through. Please read the help text provided for the individual steps carefully as it already contains all instructions you need to know.</p>
<h4> Step 1: PHP Memory Test </h4>
......@@ -47,12 +47,12 @@ Embed URI: &quot;/drupal5/index.php?q=gallery&quot; </pre>
<p>Some Gallery2 plugins are required for embedded operation and some are better uninstalled to avoid conflicts with Drupal. This step is to notify you of these recommended/missing or unneeded Gallery2 plugins and optional Drupal modules you can install to extend functionality.</p>
<h4> Step 4: Clean URL / URL Rewrite </h4>
<p>This step requires the &quot;URL Rewrite&quot; plugin enabled and configured in standalone Gallery2. Usually the wizard is able to auto-detect the path to the .htaccess file of your <strong>Drupal</strong> installation. Otherwise you have to specify it here. Thats needed because G2 will add its own rewrite rules to resolve short urls in Drupal. You may also decide to skip this step in case you dont want/need short URLs for your embedded gallery. </p>
<p>Please read the <a href="http://codex.gallery2.org/Integration:Drupal:Installation:URL_Rewrite" title="Integration:Drupal:Installation:URL Rewrite">URL Rewrite</a> tutorial for more information.</p>
<p>Please read the <a href="http://codex.gallery2.org/Integration:Drupal:Installation:URL_Rewrite" title="Integration:Drupal:Installation:URL Rewrite" target="_blank">URL Rewrite</a> tutorial for more information.</p>
<h4> Step 5: Initial User Synchronization </h4>
<p>It is essential for the embedded Gallery to work correctly that your Drupal users/groups are sync correctly with their Gallery2 counterparts. Missing user/group mappings will cause severe issues in embedded operation. For that reason it is highly recommended that you synchronize all users/groups during installation. </p>
<p>However if you have a large number of users in Gallery2 already and you want to import them into Drupal, you might skip this step and use the &quot;Advanced Sync&quot; (admin/user/gallery/advanced) options instead.</p>
<h2> Post-Install tasks </h2>
<p>At this point your gallery is ready for embedded operation. You may now continue with the customization of your embedded gallery by configuring various options of gallery module (see <a href="http://codex.gallery2.org/Integration:Drupal:Configuration" title="Integration:Drupal:Configuration">Configuration</a>). </p>
<p>At this point your gallery is ready for embedded operation. You may now continue with the customization of your embedded gallery by configuring various options of gallery module (see <a href="http://codex.gallery2.org/Integration:Drupal:Configuration" title="Integration:Drupal:Configuration" target="_blank">Configuration</a>). </p>
<p>Most users want to enable at least the &quot;Gallery Navigation&quot; block and/or the &quot;Gallery Image/Grid&quot; block. You can do so in the Drupal &quot;Blocks&quot; administration at Administer &gt; Site building &gt; Blocks (admin/build/block).</p>
<h4> Access control </h4>
<p>Also make sure that you grant your users access to the embedded gallery. Browse to Administer &gt; User management &gt; Access control and configure permissions for </p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment