aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-05-31 19:46:59 +0000
committerplegall <plg@piwigo.org>2009-05-31 19:46:59 +0000
commit654ce203d3290c524adb797208d4e3037c0f5407 (patch)
tree8131f916430b69f9aa6d3ec272d4d26c3b484857
parent01dc8c2677f7a827f8e497e1bfed96932c1586bc (diff)
merge r3381 from branch 2.0 to trunk
feature 1020 added: ability to subscribe to Piwigo Announcement Newsletter from Piwigo itself. Admins can perform this action at the end of installation or on administration panel index. git-svn-id: http://piwigo.org/svn/trunk@3382 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/include/functions.php9
-rw-r--r--admin/intro.php9
-rw-r--r--admin/template/goto/install.tpl15
-rw-r--r--admin/template/goto/intro.tpl16
-rw-r--r--include/config_default.inc.php3
-rw-r--r--install.php5
-rw-r--r--language/en_UK/admin.lang.php4
-rw-r--r--language/fr_FR/admin.lang.php5
8 files changed, 63 insertions, 3 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 6f41aafba..88505ca5c 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -2114,4 +2114,13 @@ SELECT '.$conf['user_fields']['username'].'
return $username;
}
+
+function get_newsletter_subscribe_base_url($language) {
+ $subscribe_domain = 'piwigo.org';
+ if ('fr_FR' == $language) {
+ $subscribe_domain = 'fr.piwigo.org';
+ }
+
+ return 'http://'.$subscribe_domain.'/announcement/subscribe.php?email=';
+}
?> \ No newline at end of file
diff --git a/admin/intro.php b/admin/intro.php
index 98ee92f26..d2549b5db 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -115,6 +115,15 @@ else if (isset($_GET['action']) and 'phpinfo' == $_GET['action'])
$template->set_filenames(array('intro' => 'intro.tpl'));
+if ($conf['show_newsletter_subscription']) {
+ $template->assign(
+ array(
+ 'EMAIL' => $user['email'],
+ 'SUBSCRIBE_BASE_URL' => get_newsletter_subscribe_base_url($user['language']),
+ )
+ );
+}
+
$php_current_timestamp = date("Y-m-d H:i:s");
list($mysql_version, $db_current_timestamp) = mysql_fetch_row(pwg_query('SELECT VERSION(), CURRENT_TIMESTAMP;'));
diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl
index e5b28e6e6..daf68bd71 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/template/goto/install.tpl
@@ -147,9 +147,18 @@ TD {
</form>
{else}
<p>
- <br>
- <input type="button" name="index" value="{'home'|@translate}" onClick="document.location = 'index.php';">
- <input type="button" name="identification" value="{'Identification'|@translate}" onClick="document.location = 'identification.php';">
+ <br />
+ <input type="button" name="identification" value="{'Identification'|@translate}" onClick="window.open('identification.php');"/>
+</p>
+
+<div class="infos">
+ <ul>
+ <li>{'Subscribe to Piwigo Announcements Newsletter'|@translate}</li>
+ </ul>
+</div>
+
+<p>
+ <input type="button" name="subscribe" value="{'Subscribe %s'|@translate|@sprintf:$F_ADMIN_EMAIL}" onClick="window.open('{$SUBSCRIBE_BASE_URL}{$F_ADMIN_EMAIL}');"/>
</p>
{/if}
</div> {* content *}
diff --git a/admin/template/goto/intro.tpl b/admin/template/goto/intro.tpl
index 3b41539f6..e00b0d08d 100644
--- a/admin/template/goto/intro.tpl
+++ b/admin/template/goto/intro.tpl
@@ -1,3 +1,16 @@
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.dimensions" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.dimensions.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+
+<script type="text/javascript">
+jQuery().ready(function(){ldelim}
+ jQuery('.cluetip').cluetip({ldelim}
+ width: 300,
+ splitTitle: '|'
+ });
+});
+</script>
+
<h2>{'title_default'|@translate}</h2>
<dl style="padding-top: 30px;">
<dt>{'Piwigo version'|@translate}</dt>
@@ -6,6 +19,9 @@
<li><a href="{$PHPWG_URL}" onclick="window.open(this.href, '');
return false;">Piwigo</a> {$PWG_VERSION}</li>
<li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li>
+{if isset($SUBSCRIBE_BASE_URL)}
+ <li><a href="{$SUBSCRIBE_BASE_URL}{$EMAIL}" onclick="window.open(this.href); return false;" class="cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Subscribe to Piwigo Announcements Newsletter'|@translate|htmlspecialchars|nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}</a></li>
+{/if}
</ul>
</dd>
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index f44bcd7b8..5857d7fa1 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -657,6 +657,9 @@ $conf['allow_web_services'] = true;
// Maximum number of images to be returned foreach call to the web service
$conf['ws_max_images_per_page'] = 500;
+// Display a link to subscribe to Piwigo Announcements Newsletter
+$conf['show_newsletter_subscription'] = true;
+
// +-----------------------------------------------------------------------+
// | Filter |
// +-----------------------------------------------------------------------+
diff --git a/install.php b/install.php
index 8bd91f5c2..5140cffd7 100644
--- a/install.php
+++ b/install.php
@@ -418,6 +418,11 @@ else
{
array_push($errors, $error_copy);
}
+
+ $template->assign(
+ 'SUBSCRIBE_BASE_URL',
+ get_newsletter_subscribe_base_url($language)
+ );
}
if (count($errors) != 0)
{
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 835a2ac1d..374d3606b 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -648,4 +648,8 @@ $lang['Downloads'] = 'Downloads';
$lang['Released on'] = 'Released on';
$lang['Number of downloads'] = 'Number of downloads';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
+$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
+$lang['Subscribe %s'] = 'Subscribe %s';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index f5ad9dea9..6d65ea3b1 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -647,4 +647,9 @@ $lang['Downloads'] = 'Téléchargements';
$lang['Released on'] = 'Ajouté le';
$lang['Number of downloads'] = 'Nombre de téléchargements';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+$lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
+$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Restez en contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu\'une nouvelle version sera disponible (parfois un bug de sécurité est corrigé, il est important d\'être au courant et de mettre à jour) ou qu\'un événement majeur surviendra sur le projet. Seulement quelques messages par an.';
+$lang['Subscribe %s'] = 'Abonner %s';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
+
?>