Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12406] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-03-24 19:29:07
|
Revision: 12406
http://sourceforge.net/p/xoops/svn/12406
Author: luciorota
Date: 2014-03-24 19:29:02 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
257 multipage help, added breadcrumb, standardize footer, ..., standardize xoops_version.php (still in progress), ...
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/module.css
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help2.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/breadcrumb.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/breadcrumb.php (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/breadcrumb.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -0,0 +1,70 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+ */
+/**
+ * xNewsletterBreadcrumb Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author lucio <luc...@gm...>
+ * @package xNewsletter
+ * @since 1.3
+ * @version $Id:$
+ *
+ * Example:
+ * $breadcrumb = new xNewsletterBreadcrumb();
+ * $breadcrumb->addLink( 'bread 1', 'index1.php' );
+ * $breadcrumb->addLink( 'bread 2', '' );
+ * $breadcrumb->addLink( 'bread 3', 'index3.php' );
+ * echo $breadcrumb->render();
+ */
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+class xNewsletterBreadcrumb
+{
+ var $dirname;
+ var $_bread = array();
+
+ function __construct()
+ {
+ $this->dirname = basename(dirname(dirname(__FILE__)));
+ }
+
+ /**
+ * Add link to breadcrumb
+ *
+ */
+ function addLink( $title='', $link='' )
+ {
+ $this->_bread[] = array(
+ 'link' => $link,
+ 'title' => $title
+ );
+ }
+
+ /**
+ * Render xNewsletter BreadCrumb
+ *
+ */
+ function render()
+ {
+ if ( !isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme']) ) {
+ include_once $GLOBALS['xoops']->path( "/class/theme.php" );
+ $GLOBALS['xoTheme'] = new xos_opal_Theme();
+ }
+
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ $breadcrumbTpl = new XoopsTpl();
+ $breadcrumbTpl->assign('breadcrumb', $this->_bread);
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.html");
+ unset($breadcrumbTpl);
+ return $html;
+ }
+}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/index.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/index.html 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/index.html 2014-03-24 19:29:02 UTC (rev 12406)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-03-24 19:29:02 UTC (rev 12406)
@@ -3,6 +3,8 @@
- templatize user side (luciorota)
- standardize code (luciorota)
- added html2txt function for non-HTML mail clients (luciorota)
+ - added: breadcrumb class (luciorota)
+ - added: updating to XOOPS 2.5.7 Multi-page help (luciorota)
Version 1.2
--------------
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -0,0 +1,37 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+ */
+/**
+ * xNewsletter module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xnewsletter
+ * @since 1.3
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+include_once XNEWSLETTER_PATH . "/include/functions.php";
+
+// copyright
+$xoopsTpl->assign('copyright', $moduleCopyrightHtml); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('copyright_code', $moduleCopyrightHtml); // include/config.php
+// advertise
+$xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('advertise_code', $GLOBALS['xoopsModuleConfig']['advertise']);
+// social
+if($GLOBALS['xoopsModuleConfig']['social_active'] == true) {
+ $xoopsTpl->assign('social_active', $GLOBALS['xoopsModuleConfig']['social_active']);
+ $xoopsTpl->assign('social_code', $GLOBALS['xoopsModuleConfig']['social_code']);
+}
+
+$xoopsTpl->assign("isAdmin", xNewsletter_userIsAdmin());
+
+include_once XOOPS_ROOT_PATH . '/footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -43,7 +43,6 @@
xoops_load('XoopsUserUtility');
$myts = & MyTextSanitizer::getInstance();
-$style = XNEWSLETTER_URL . "/css/style.css";
if (empty($xoopsModuleConfig)) {
$xoopsModuleConfig = $config_handler->getConfigsByCat(0, $xoopsModule->mid());
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -38,6 +38,7 @@
include_once XNEWSLETTER_ROOT_PATH . '/class/session.php'; // xNewsletterSession class
include_once XNEWSLETTER_ROOT_PATH . '/class/xnewsletter.php'; // xNewsletterxNewsletter class
include_once XNEWSLETTER_ROOT_PATH . '/class/request.php'; // xNewsletterRequest class
+include_once XNEWSLETTER_ROOT_PATH . '/class/breadcrumb.php'; // xNewsletterBreadcrumb class
xoops_load('XoopsUserUtility');
// MyTextSanitizer object
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -38,7 +38,7 @@
// module information
$moduleImageUrl = XNEWSLETTER_URL . "/images/xNewsletter.png";
-$moduleCopyrightHtml = "<br /><br /><a href='' title='' target='_blank'><img src='{$moduleImageUrl}' alt='' /></a>";
+$moduleCopyrightHtml = ""; //"<br /><br /><a href='' title='' target='_blank'><img src='{$moduleImageUrl}' alt='' /></a>";
// constants for account
define("_AM_ACCOUNTS_TYPE_VAL_PHP_MAIL", "1");
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/module.css
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/module.css (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/module.css 2014-03-24 19:29:02 UTC (rev 12406)
@@ -0,0 +1,553 @@
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ 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.
+ */
+/**
+ * xNewsletter module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package xnewsletter
+ * @since 1.3
+ * @author xNewsletter, Xoops Development Team, luciorota
+ * @version svn:$Id$
+ */
+.xnewsletter_headertable {
+ padding: 0;
+ border-bottom: 1px solid;
+ margin: 0 0 10px;
+}
+
+.xnewsletter_modulename {
+ font-size: 10px;
+ text-align: left;
+ font-weight: bold;
+ padding-right: 0.3em;
+ line-height: 18px;
+}
+
+.xnewsletter_breadcrumb {
+ font-size: 10px;
+ line-height: 18px;
+}
+
+.xnewsletter_infotitle {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ font-size: 250%;
+ line-height: 250%;
+ font-weight: bold;
+ display: block;
+}
+
+.xnewsletter_infotext {
+ margin-bottom: 8px;
+ line-height: 130%;
+ display: block;
+}
+
+.xnewsletter_adminlinks {
+ padding-top: 15px;
+ padding-bottom: 5px;
+ font-size: 10px;
+ text-align: center;
+ line-height: 18px;
+}
+
+.xnewsletter_indexfooter {
+ font-size: 10px;
+ font-weight: bold;
+ text-align: center;
+ padding: 10px;
+}
+
+.xnewsletter_itemfooter {
+ font-size: 10px;
+ font-weight: bold;
+ text-align: center;
+ padding: 10px;
+}
+
+ul {
+ padding: 2px;
+ list-style: disc;
+ text-align: left;
+}
+
+li {
+ margin-left: 5px;
+ color: #2F5376;
+}
+
+h4 {
+ font-size: 14px;
+ text-decoration: underline;
+}
+
+.xnewsletter_container {
+ height: 100%;
+ display: table;
+ width: 100%;
+ margin: 0 auto;
+ border: none;
+}
+
+.xnewsletter_static {
+ position: static;
+ clear: both;
+}
+
+/* ---------- global ---------- */
+.xnewsletter_pagenav {
+ text-align: right;
+}
+
+.xnewsletter_copyright {
+ text-align: center;
+}
+
+/* ---------- header.html ---------- */
+.xnewsletter_head_catimgheader {
+ text-align: center;
+}
+
+.xnewsletter_head_downimgheader {
+ text-align: center;
+}
+
+.xnewsletter_head_imgheader {
+ text-align: center;
+}
+
+.xnewsletter_head_catindexheader {
+ /* text-align: center; do not uncomment (will stop index alignment option working) */
+}
+
+.xnewsletter_head_catletters {
+ text-align: center;
+ font-size: 80%;
+}
+
+.xnewsletter_head_cattoolbar {
+ text-align: center;
+}
+
+/* ---------- footer.html ---------- */
+.xnewsletter_foot_commentnav {
+ text-align: center;
+ padding: 3px;
+ margin: 3px;
+}
+
+.xnewsletter_foot_comments {
+ padding: 3px;
+ margin: 3px;
+}
+
+/* ---------- newlist.html ---------- */
+.xnewsletter_newlist_top {
+ text-align: center;
+ width: 100%;
+}
+
+.xnewsletter_newlist_top fieldset {
+ text-align: center;
+ border: 1px solid silver;
+ width: 450px;
+}
+
+.xnewsletter_newlist_totallast {
+ text-align: center;
+ width: 100%;
+ font-weight: bold;
+ font-size: large;
+}
+
+/* ---------- disclaimer.html ---------- */
+.xnewsletter_disc_imghead {
+ text-align: center;
+}
+
+.xnewsletter_disc_disclaimer {
+ text-align: center;
+}
+
+.xnewsletter_disc_discform {
+ text-align: center;
+}
+
+/* ---------- ratefile.html ---------- */
+.xnewsletter_rate_imghead {
+ text-align: center;
+}
+
+/* ---------- viewcat.html ---------- */
+.xnewsletter_view_top {
+}
+
+.xnewsletter_view_subs {
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+
+.xnewsletter_view_subs h3 {
+ text-align: center;
+ width: 100%;
+ background-color: #BEC8D1;
+}
+
+.xnewsletter_view_subs fieldset {
+}
+
+.xnewsletter_view_subslist {
+ text-align: left;
+ vertical-align: middle;
+ width: 90%;
+}
+
+.xnewsletter_view_catpath {
+ text-align: left;
+ margin-left: 5px;
+ padding: 0;
+ font-weight: bold;
+}
+
+.xnewsletter_view_sortlist {
+ text-align: center;
+ font-size: small;
+}
+
+/* ---------- download.html ---------- */
+.xnewsletter_down_title {
+ padding-top: 2.0em
+}
+
+.xnewsletter_down_top_r {
+ float: right;
+ margin-right: 10px;
+ position: relative;
+}
+
+.xnewsletter_down_top_l {
+ float: left;
+}
+
+.xnewsletter_down_main_l {
+ width: 74%;
+ float: left;
+ height: 100%;
+ position: relative;
+ display: table;
+}
+
+.xnewsletter_down_main_l p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.xnewsletter_down_viewdetails {
+ text-align: right;
+}
+
+.xnewsletter_down_main_r {
+ width: 25%;
+ height: 100%;
+ float: right;
+ position: relative;
+ display: table;
+}
+
+.xnewsletter_down_main_r p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.xnewsletter_down_info_top {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ background-color: silver;
+ border-color: #999999;
+ font-size: .8em;
+}
+
+.xnewsletter_down_info_bottom {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ font-size: .8em;
+}
+
+.xnewsletter_down_main_b {
+ text-align: center;
+}
+
+.xnewsletter_down_main_bottom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+.xnewsletter_down_main_bottom2 {
+ text-align: center;
+ background-color: silver;
+ width: 100%;
+ position: relative;
+ line-height: 150%;
+}
+
+.xnewsletter_down_custom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+/* ---------- singlefile.html ---------- */
+.xnewsletter_single_title {
+ padding-top: 2.0em
+}
+
+.xnewsletter_single_title a {
+ color: #32529C;
+ background-color: inherit;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.xnewsletter_single_title a:hover {
+ color: #666;
+ background-color: inherit;
+ text-decoration: none;
+}
+
+.xnewsletter_single_top_r {
+ float: right;
+ margin-right: 10px;
+ position: relative;
+}
+
+.xnewsletter_single_top_l {
+ float: left;
+}
+
+.xnewsletter_single_main_l {
+ width: 74%;
+ height: 100%;
+ float: left;
+ position: relative;
+ display: table;
+}
+
+.xnewsletter_single_main_l p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.xnewsletter_single_main_r {
+ width: 25%;
+ float: right;
+ display: table-column;
+}
+
+.xnewsletter_single_info_top {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ background-color: silver;
+ border-color: #999999;
+ color: #333;
+ font-size: .8em;
+}
+
+.xnewsletter_single_info_dtimes {
+ margin-left: 4px;
+}
+
+.xnewsletter_single_main_custom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+.xnewsletter_single_main_bottom {
+ text-align: center;
+ background-color: silver;
+ width: 100%;
+ position: relative;
+ float: bottom;
+}
+
+.xnewsletter_single_userrev {
+ padding: 3px;
+ margin: 3px;
+}
+
+.xnewsletter_single_usermir {
+ padding: 3px;
+ margin: 3px;
+}
+
+/* ---------- mirrors.html ---------- */
+.xnewsletter_mirrors_head, .xnewsletter_mirrors_head2, .xnewsletter_mirrors_head3 {
+ border-bottom: 2px solid #000000;
+ border-left: 1px solid #000000;
+ background-color: #BEC8D1;
+ text-align: left;
+ font-family: Verdana, sans-serif;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+}
+
+.xnewsletter_mirrors_head4 {
+ border-bottom: 2px solid #000000;
+ border-left: 1px solid #000000;
+ background-color: #BEC8D1;
+ text-align: center;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+ width: 50px;
+}
+
+.xnewsletter_mirrors_head5 {
+ border-bottom: 2px solid #000000;
+ border-left: 0 solid #000000;
+ background-color: #BEC8D1;
+ text-align: center;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+ width: 30px;
+}
+
+tr.xnewsletter_mirrors_elist {
+ line-height: 25px;
+}
+
+.xnewsletter_mirrors_list, .xnewsletter_mirrors_list2, .xnewsletter_mirrors_list3 {
+ text-align: left;
+ border-right: 1px solid #000000;
+}
+
+.xnewsletter_mirrors_list4, .xnewsletter_mirrors_list5 {
+ text-align: center;
+ vertical-align: middle;
+}
+
+.xnewsletter_mirrors_found {
+}
+
+table.xnewsletter_mirrors {
+ width: 95%;
+ padding: 10px 10px 10px 10px;
+ border: 1px #000000 solid;
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+tr.xnewsletter_mirrors_end {
+ background-color: #BEC8D1;
+}
+
+.xnewsletter_mirrors_foot, .xnewsletter_mirrors_foot a {
+ border-top: 2px solid #000000;
+ font-weight: bold;
+}
+
+.xnewsletter_mirrors_bottom {
+ font-weight: bold;
+}
+
+/* ---------- reviews.html ---------- */
+.xnewsletter_reviews_title {
+}
+
+.xnewsletter_reviews_desc {
+}
+
+.xnewsletter_reviews_catpath {
+}
+
+.xnewsletter_reviews_found {
+ width: 90%;
+ text-align: center;
+}
+
+.xnewsletter_reviews_revfound {
+ text-align: left;
+}
+
+.xnewsletter_reviews_addrev {
+ text-align: right;
+}
+
+.xnewsletter_reviews_reviewlist {
+ padding: 10px 10px 10px 10px;
+ border: 1px #000000 solid;
+ border-collapse: collapse;
+ width: 95%;
+}
+
+.xnewsletter_reviews_reviewer {
+ text-align: left;
+ width: 80%;
+ background-color: #BEC8D1;
+ /* border-right: 1px solid #000000; */
+ border-bottom: 2px solid #000000;
+}
+
+.xnewsletter_reviews_reviewdate {
+ text-align: right;
+ width: 15%;
+ background-color: #BEC8D1;
+ border-bottom: 2px solid #000000;
+}
+
+.xnewsletter_reviews_revlistleft {
+ text-align: left;
+ border-right: 1px solid #000000;
+ width: 120px;
+}
+
+.xnewsletter_reviews_revlistright {
+ text-align: left;
+}
+
+.xnewsletter_reviews_revlistreview {
+ position: absolute;
+ top: 0;
+ left: 125px;
+ width: 90%;
+}
+
+.xnewsletter_reviews_revlisttitle {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ font-weight: bold;
+ color: #0000CC;
+}
+
+.xnewsletter_reviews_revlistrev {
+}
+
+.xnewsletter_reviews_foot {
+ background-color: #BEC8D1;
+ border: 2px solid #000000;
+ width: 95%;
+}
+
+.xnewsletter_reviews_addrev {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background-color: #BEC8D1;
+ border: 2px solid #000000;
+}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -37,20 +37,16 @@
$xoopsOption['template_main'] = 'xNewsletter_index.html';
include XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
$xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
- // module configs for template
- $xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
- $xoopsTpl->assign('advertise', $GLOBALS['xoopsModuleConfig']['advertise']);
- if($GLOBALS['xoopsModuleConfig']['social_active'] == true) {
- $xoopsTpl->assign('social_active', $GLOBALS['xoopsModuleConfig']['social_active']);
- $xoopsTpl->assign('social_code', $GLOBALS['xoopsModuleConfig']['social_code']);
- }
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
$xoopsTpl->assign('welcome_message', $GLOBALS['xoopsModuleConfig']['welcome_message']);
-
$xoopsTpl->assign('xnewsletter_content', _MA_XNEWSLETTER_WELCOME); // this definition is not removed for backward compatibility issues
break;
@@ -59,18 +55,15 @@
$xoopsOption['template_main'] = 'xnewsletter_letter_preview.html';
include XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
$xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
- // module configs for template
- $xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
- $xoopsTpl->assign('advertise', $GLOBALS['xoopsModuleConfig']['advertise']);
- if($GLOBALS['xoopsModuleConfig']['social_active'] == true) {
- $xoopsTpl->assign('social_active', $GLOBALS['xoopsModuleConfig']['social_active']);
- $xoopsTpl->assign('social_code', $GLOBALS['xoopsModuleConfig']['social_code']);
- }
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
$xoopsTpl->assign('welcome_message', $GLOBALS['xoopsModuleConfig']['welcome_message']);
$template_path = XNEWSLETTER_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/templates/';
@@ -107,18 +100,16 @@
$xoopsOption['template_main'] = 'xNewsletter_index_list_letters.html';
include XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
$xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
- // module configs for template
- $xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
- $xoopsTpl->assign('advertise', $GLOBALS['xoopsModuleConfig']['advertise']);
- if($GLOBALS['xoopsModuleConfig']['social_active'] == true) {
- $xoopsTpl->assign('social_active', $GLOBALS['xoopsModuleConfig']['social_active']);
- $xoopsTpl->assign('social_code', $GLOBALS['xoopsModuleConfig']['social_code']);
- }
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
$xoopsTpl->assign('welcome_message', $GLOBALS['xoopsModuleConfig']['welcome_message']);
// get letters array
@@ -163,4 +154,4 @@
break;
}
-include_once XOOPS_ROOT_PATH . "/footer.php";
+include 'footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html 2014-03-24 19:29:02 UTC (rev 12406)
@@ -25,7 +25,7 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-
+
<div id="help-template" class="outer">
<h1 class="head">Help:
<a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/xNewsletter/admin/index.php"
@@ -44,10 +44,10 @@
- Newsletter are based on templates<br />
- Detailed handling of permissions for groups and newsletter (subscribe, write, send)<br />
- Send: send test mail, resend to all subscribers or only to subscribers, where sending failed<br />
- - Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cronjob<br />
+ - Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cron job<br />
- Bounced email handler for handling Bounced emails in case of invalid e-mail-addresses<br />
- Optionally synchronisation with mailing lists (e.g. majordomo)<br />
- - Maintenace function included<br />
+ - Maintenance function included<br />
- Creating protocol for the important steps<br />
<br />
</p>
@@ -59,18 +59,18 @@
Manual</a>.<br /><br /></p>
<h4 class="odd">Tutorial</h4>
<!-- -----Help Content ---------- -->
-
-
-
+
+
+
<h5 class="odd">Basic information</h5>
<p class="even">The module is based on PHPMailer and PHPMailer-BMH
<br /><br /></p>
-
+
<h5 class="odd">(Un) subscriptions to newsletters</h5>
<p class="even">
- You can define for each newsletter and for each group, whether for (un) subscritpion or change a confirmation email with activation key is necessary or not (use double-option).<br />
+ You can define for each newsletter and for each group, whether for (un) subscription or change a confirmation email with activation key is necessary or not (use double-option).<br />
<br /><br /></p>
-
+
<h5 class="odd">Accounts</h5>
<p class="even">
You can use one or more email-account; sending with php mail, php sendmail, smtp is possible.<br />
@@ -78,13 +78,13 @@
<br />
Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page without any error).<br />
<br /><br /></p>
-
+
<h5 class="odd">Newsletter categories</h5>
<p class="even">
You can handle one or more newsletter categories.<br />
It is possible to set permissions "read", "create", "admin" and "list subscribers" for each newsletter cat.<br />
<br /><br /></p>
-
+
<h5 class="odd">Create a newsletter</h5>
<p class="even">
The newsletter can be created with each text editor which is installed in current xoops core (e.g. TinyMCE). <br />
@@ -94,14 +94,14 @@
Optionally you can also copy an older newsletter and edit or send it as a new one.<br /><br />
The type of text editor, allows mime-types and size of mail attachments can be set in module preferences.<br />
<br /><br /></p>
-
+
<h5 class="odd">Newsletter templates</h5>
<p class="even">
The newsletters are template based.<br />
The templates you can find in language/{yourlanguage}/templates.<br />
To create a new template you have only to make a new html-file in this folder and to put in the smarty-vars.<br />
<br /><br /></p>
-
+
<h5 class="odd">Sending newsletter</h5>
<p class="even">
You can show a preview of a newsletter before sending.<br />
@@ -112,19 +112,19 @@
You can restart sending procedure. You can send it again to all subscribers or send it only to the subscribers, where sending procedure failed).<br />
<br />
You can send all emails immediately or limit emails send in one package.<br />
- The number of emails and the minutes untill next sending can be defined in module preferences (e.g. 200 emails all 60 minutes).<br />
- The first package will be sent immediately. To start the next sending procedure you need an external cronjob, which is calling "../modules/xNewsletter/cron.php". Xoops cannot do this with current version (2.5.5).<br />
+ The number of emails and the minutes until next sending can be defined in module preferences (e.g. 200 emails all 60 minutes).<br />
+ The first package will be sent immediately. To start the next sending procedure you need an external cron job, which is calling "../modules/xNewsletter/cron.php". Xoops cannot do this with current version (2.5.5).<br />
<br />
Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page).<br />
<br /><br /></p>
-
+
<h5 class="odd">Task list</h5>
<p class="even">
- If you limit emails send in one package, you can see all newsletters waiting for next cronjob and the time, when cronjob can send the newsletter.<br />
+ If you limit emails send in one package, you can see all newsletters waiting for next cron job and the time, when cron job can send the newsletter.<br />
If you do not use this option, this list must always be empty.<br />
Normally the tab "Task list" is hidden, if this option is disabled.<br />
<br /><br /></p>
-
+
<h5 class="odd">Handle mailing lists</h5>
<p class="even">
If you have an existing mailing list, you can synchronize the (un) subscriptions of one newsletter category with one mailing list.<br />
@@ -135,7 +135,7 @@
<br />
<b>xNewsletter cannot create mailing lists</b>.
<br /><br /></p>
-
+
<h5 class="odd">Bounced email handler (BMH)</h5>
<p class="even">
If you send newsletters, there will always be some emails not delivered to recipient (Bounced email), because email is no more valid, mailbox is full, and so on.<br />
@@ -159,12 +159,12 @@
<br />
Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page).<br />
<br /><br /></p>
-
+
<h5 class="odd">Maintenance</h5>
<p class="even">
This module has a maintain function, which can repair several faults in the data.<br />
<br /><br /></p>
-
+
<h5 class="odd">Import</h5>
<p class="even">
You can import data with various plug-ins:
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help2.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help2.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help2.html 2014-03-24 19:29:02 UTC (rev 12406)
@@ -0,0 +1,20 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/xNewsletter/admin/index.php" title="Back to the administration of xNewsletter">
+ xNewsletter <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of xNewsletter"/>
+ </a>
+ </h1>
+ <h4 class="odd">Fresh Install</h4>
+ <p><b>Upload the module to your website</b>
+ <br>
+ <br>Upload the 'xNewsletter' folder to {xoops-rootdirectory}/modules folder
+ <br>
+ <br>
+ <br>Login as administrator and enter Xoops Administration page.
+ <br>Select System --> modules and install xNewsletter from there
+ <br>
+ <br><b>Configure the module</b>
+ <br>
+ <br>Most important steps now will be to setup the group permissions for the module and its blocks via System --> groups.
+ </p>
+</div>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -88,3 +88,14 @@
define('_MA_XNEWSLETTER_LETTER_NONEAVAIL',"No newsletters available for the moment");
//1.2.2
define('_MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL',"No email-accounts available for the moment");
+//1.3
+define('_MD_XNEWSLETTER_SUBSCRIBE',"(Un)Subscribe");
+define('_MD_XNEWSLETTER_LIST',"Newsletter list");
+define('_MD_XNEWSLETTER_LIST_SUBSCR',"List subscribers");
+define('_MD_XNEWSLETTER_LETTER_CREATE',"Create newsletter");
+define('_MD_XNEWSLETTER_LETTER_EDIT',"Edit newsletter");
+define('_MD_XNEWSLETTER_LETTER_DELETE',"Delete newsletter");
+define('_MD_XNEWSLETTER_LETTER_COPY',"Copy/clone newsletter");
+define('_MD_XNEWSLETTER_LETTER_PREVIEW',"Preview");
+define('_MD_XNEWSLETTER_SUBSCRIPTION_EDIT',"Edit subscriptions");
+define('_MD_XNEWSLETTER_SUBSCRIPTION_DELETE',"Delete subscriptions");
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -80,7 +80,7 @@
define('_MI_XNEWSLETTER_USE_SALUTATION',"Use field salutation");
define('_MI_XNEWSLETTER_USE_SALUTATION_DESC',"Please decide, whether you want use salutations like 'Mr.', 'Mrs.',...");
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES',"Send e-mails in packages");
-define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_DESC',"Number of e-mails, which should be sent in one package. 0 means, that all e-mails always be sent immediatly. You can use this option only, if you can start cronjobs with external programs.");
+define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_DESC', "Number of e-mails, which should be sent in one package. 0 means, that all e-mails always be sent immediately. You can use this option only, if you can start cron jobs with external programs.");
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME',"Time period for sending e-mails in packages");
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME_DESC',"Time period in minutes, when the next package should be sent. Only used, if 'Send e-mails in packages' is bigger than 0.");
define('_MI_XNEWSLETTER_UPGRADEFAILED',"Error while updating module");
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -73,15 +73,16 @@
$xoopsOption['template_main'] = 'xnewsletter_letter_list_subscrs.html';
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST_SUBSCR, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// check right to edit/delete subscription of other persons
$permissionChangeOthersSubscriptions = false;
foreach ($groups as $group) {
@@ -142,14 +143,15 @@
//$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
// get attachment
$attachment_id = xNewsletter_CleanVars($_REQUEST, 'attachment_' . $id_del, 'none', 'string');
@@ -211,15 +213,17 @@
$xoopsOption['template_main'] = 'xnewsletter_letter_preview.html';
include XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, XNEWSLETTER_URL . '/letter.php?op=list_letters');
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LETTER_PREVIEW, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// get letter templates path
$letterTemplatePath = XNEWSLETTER_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/templates/';
if (!is_dir($letterTemplatePath)) {
@@ -254,15 +258,16 @@
$xoopsOption['template_main'] = 'xnewsletter_letter_list_letters.html';
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// get letters array
$criteria_letters = new CriteriaCompo();
$criteria_letters->setSort("letter_id");
@@ -343,14 +348,16 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LETTER_CREATE, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
$letterObj =& $letterHandler->create();
$form = $letterObj->getForm();
@@ -363,14 +370,17 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, XNEWSLETTER_URL . '/letter.php?op=list_letters');
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LETTER_COPY, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
$obj_letter_old =& $letterHandler->get($letter_id);
@@ -393,14 +403,15 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
@@ -525,14 +536,17 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, XNEWSLETTER_URL . '/letter.php?op=list_letters');
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LETTER_EDIT, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
$letterObj = $letterHandler->get($letter_id);
@@ -545,14 +559,17 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html'; // IN PROGRESS
include_once XOOPS_ROOT_PATH . "/header.php";
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LIST, XNEWSLETTER_URL . '/letter.php?op=list_letters');
+ $breadcrumb->addLink(_MD_XNEWSLETTER_LETTER_DELETE, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// IN PROGRESS FROM HERE
$obj_letter =& $letterHandler->get($letter_id);
@@ -589,4 +606,4 @@
break;
}
-include_once XOOPS_ROOT_PATH . "/footer.php";
+include 'footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -114,7 +114,7 @@
echo '<!-- Sheet Css -->';
echo '<link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="' . XOOPS_URL . '/xoops.css" />\n';
echo '<link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="' . XOOPS_URL . '/themes/default/style.css" />\n';
- echo '<link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="' . XOOPS_URL . '/modules/xcomp/style.css" />\n';
+ echo '<link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="' . XOOPS_URL . '/modules/xnewsletter/css/module.css" />\n';
?>
<script type="text/javascript">
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -31,10 +31,16 @@
$xoopsOption['template_main'] = 'xnewsletter_protocol.html';
include_once XOOPS_ROOT_PATH . "/header.php";
-$xoTheme->addStylesheet($style);
-//$xoTheme->addScript($script);
-$xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
+$xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+$xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+
+// Breadcrumb
+$breadcrumb = new xNewsletterBreadcrumb();
+$breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+$xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
$letter_id = xNewsletter_CleanVars($_REQUEST, 'letter_id', 0, 'int');
$letterObj = $letterHandler->get($letter_id);
$xoopsTpl->assign('letter', $letterObj->toArray());
@@ -63,4 +69,4 @@
$xoopsTpl->assign('protocols', $protocols);
-include_once XOOPS_ROOT_PATH . "/footer.php";
+include 'footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -32,15 +32,14 @@
$xoopsOption['template_main'] = 'xnewsletter_letter.html';
include_once XOOPS_ROOT_PATH . "/header.php";
-$xoTheme->addStylesheet($style);
-$xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
-$xoopsTpl->assign('copyright', $moduleCopyrightHtml);
-// module configs for template
-if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
-}
+$xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+$xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+// Breadcrumb
+$breadcrumb = new xNewsletterBreadcrumb();
+$breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+$xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
include XOOPS_ROOT_PATH . "/modules/xNewsletter/include/task.inc.php";
@@ -91,4 +90,4 @@
redirect_header('letter.php', 3, $result_exec);
}
-include_once XOOPS_ROOT_PATH . "/footer.php";
+include 'footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-03-24 19:19:45 UTC (rev 12405)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-03-24 19:29:02 UTC (rev 12406)
@@ -97,16 +97,15 @@
$xoopsOption['template_main'] = 'xnewsletter_subscription_result.html';
include_once XOOPS_ROOT_PATH . "/header.php";
- // COMMON
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// resend the email with the confirmation code
$subscr_id = xNewsletter_CleanVars($_REQUEST, 'subscr_id', 0, 'int');
$criteria_subscr = new CriteriaCompo();
@@ -149,16 +148,14 @@
case "save_subscription" :
include_once XOOPS_ROOT_PATH . "/header.php";
- // COMMON
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
// check right to subscribe directly
$submitterUid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
@@ -534,16 +531,15 @@
$xoopsOption['template_main'] = 'xnewsletter_subscription.html';
include_once XOOPS_ROOT_PATH . "/header.php";
- // COMMON
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// get create subscr form
if ($subscr_email != '') {
//existing email
@@ -568,16 +564,17 @@
$xoopsOption['template_main'] = 'xnewsletter_subscription.html';
include_once XOOPS_ROOT_PATH . "/header.php";
- // COMMON
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
+ // Breadcrumb
+ $breadcrumb = new xNewsletterBreadcrumb();
+ $breadcrumb->addLink($xnewsletter->getModule()->getVar('name'), XNEWSLETTER_URL);
+ $breadcrumb->addLink(_MD_XNEWSLETTER_SUBSCRIBE, XNEWSLETTER_URL . '/subscription.php?op=list_subscriptions');
+ $breadcrumb->addLink(_MD_XNEWSLETTER_SUBSCRIPTION_EDIT, '');
+ $xoopsTpl->assign('xnewsletter_breadcrumb', $breadcrumb->render());
+
// get edit subscr form
$subscr_id = xNewsletter_CleanVars($_REQUEST, 'subscr_id', 0, 'int');
if ($subscr_id <= 0) {
@@ -593,18 +590,17 @@
case "delete_subscription" :
include_once XOOPS_ROOT_PATH . "/header.php";
- // COMMON
- $xoTheme->addStylesheet($style);
- $xoopsTpl->assign('xnewsletter_url', XNEWSLETTER_URL);
- $xoopsTpl->assign('copyright', $moduleCopyrightHtml);
- // module configs for template
- if($xoopsModuleConfig['social_active'] == true) {
- $xoopsTpl->assign('social_active', $xoopsModuleConfig['social_active']);
- $xoopsTpl->assign('social_code', $xoopsModuleConfig['social_code']);
- }
+ $xoTheme->addStylesheet(XNEWSLETTER_URL . '/css/module.css');
+ $xoTheme->addMeta('meta', 'keywords', $GLOBALS['xoopsModuleConfig']['keywords']); // keywords only for index page
+ $xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC)); // description
...
[truncated message content] |
