Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-05-19 10:27:15
|
Revision: 9552
http://xoops.svn.sourceforge.net/xoops/?rev=9552&view=rev
Author: beckmi
Date: 2012-05-19 10:27:09 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Fixing division by zero in: $total_pages = ceil($this->total / $this->perpage);
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/pagenav.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/pagenav.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/pagenav.php 2012-05-19 10:26:22 UTC (rev 9551)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/pagenav.php 2012-05-19 10:27:09 UTC (rev 9552)
@@ -85,34 +85,36 @@
if ($this->total <= $this->perpage) {
return $ret;
}
- $total_pages = ceil($this->total / $this->perpage);
- if ($total_pages > 1) {
- $ret .= '<div id="xo-pagenav">';
- $prev = $this->current - $this->perpage;
- if ($prev >= 0) {
- $ret .= '<a class="xo-pagarrow" href="' . $this->url . $prev . $this->extra . '"><u>«</u></a> ';
- }
- $counter = 1;
- $current_page = intval(floor(($this->current + $this->perpage) / $this->perpage));
- while ($counter <= $total_pages) {
- if ($counter == $current_page) {
- $ret .= '<strong class="xo-pagact" >(' . $counter . ')</strong> ';
- } elseif (($counter > $current_page - $offset && $counter < $current_page + $offset) || $counter == 1 || $counter == $total_pages) {
- if ($counter == $total_pages && $current_page < $total_pages - $offset) {
- $ret .= '... ';
+ if(($this->total != 0) && ($this->perpage != 0)) {
+ $total_pages = ceil($this->total / $this->perpage);
+ if ($total_pages > 1) {
+ $ret .= '<div id="xo-pagenav">';
+ $prev = $this->current - $this->perpage;
+ if ($prev >= 0) {
+ $ret .= '<a class="xo-pagarrow" href="' . $this->url . $prev . $this->extra . '"><u>«</u></a> ';
+ }
+ $counter = 1;
+ $current_page = intval(floor(($this->current + $this->perpage) / $this->perpage));
+ while ($counter <= $total_pages) {
+ if ($counter == $current_page) {
+ $ret .= '<strong class="xo-pagact" >(' . $counter . ')</strong> ';
+ } elseif (($counter > $current_page - $offset && $counter < $current_page + $offset) || $counter == 1 || $counter == $total_pages) {
+ if ($counter == $total_pages && $current_page < $total_pages - $offset) {
+ $ret .= '... ';
+ }
+ $ret .= '<a class="xo-counterpage" href="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</a> ';
+ if ($counter == 1 && $current_page > 1 + $offset) {
+ $ret .= '... ';
+ }
}
- $ret .= '<a class="xo-counterpage" href="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</a> ';
- if ($counter == 1 && $current_page > 1 + $offset) {
- $ret .= '... ';
- }
+ $counter ++;
}
- $counter ++;
+ $next = $this->current + $this->perpage;
+ if ($this->total > $next) {
+ $ret .= '<a class="xo-pagarrow" href="' . $this->url . $next . $this->extra . '"><u>»</u></a> ';
+ }
+ $ret .= '</div> ';
}
- $next = $this->current + $this->perpage;
- if ($this->total > $next) {
- $ret .= '<a class="xo-pagarrow" href="' . $this->url . $next . $this->extra . '"><u>»</u></a> ';
- }
- $ret .= '</div> ';
}
return $ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-05-19 10:26:30
|
Revision: 9551
http://xoops.svn.sourceforge.net/xoops/?rev=9551&view=rev
Author: voltan1
Date: 2012-05-19 10:26:22 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Improve update system ( not complated and need test )
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/backend.php
XoopsModules/fmcontent/branches/news/admin/permissions.php
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/include/functions_update.php
XoopsModules/fmcontent/branches/news/index.php
XoopsModules/fmcontent/branches/news/pdf.php
XoopsModules/fmcontent/branches/news/print.php
XoopsModules/fmcontent/branches/news/rss.php
XoopsModules/fmcontent/branches/news/sql/mysql.sql
Added Paths:
-----------
XoopsModules/fmcontent/branches/news/class/rate.php
Modified: XoopsModules/fmcontent/branches/news/admin/backend.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/backend.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/admin/backend.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -67,7 +67,7 @@
$topic_id = $obj->db->getInsertId ();
//permission
- NewsPermission::News_SetPermission ( $NewsModule, 'news_access', $_POST ['groups_view'], $topic_id, true );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_view', $_POST ['groups_view'], $topic_id, true );
NewsPermission::News_SetPermission ( $NewsModule, 'news_submit', $_POST ['groups_submit'], $topic_id, true );
// Redirect page
@@ -96,7 +96,7 @@
NewsUtils::News_DeleteImg ( $NewsModule, 'topic_img', $obj );
}
//permission
- NewsPermission::News_SetPermission ( $NewsModule, 'news_access', $_POST ['groups_view'], $topic_id, false );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_view', $_POST ['groups_view'], $topic_id, false );
NewsPermission::News_SetPermission ( $NewsModule, 'news_submit', $_POST ['groups_submit'], $topic_id, false );
if (! $topic_handler->insert ( $obj )) {
Modified: XoopsModules/fmcontent/branches/news/admin/permissions.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/permissions.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/admin/permissions.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -64,7 +64,7 @@
break;
case 2:
$title_of_form = _NEWS_AM_PERMISSIONS_ACCESS;
- $perm_name = "news_access";
+ $perm_name = "news_view";
$perm_desc = "";
break;
@@ -72,7 +72,13 @@
$title_of_form = _NEWS_AM_PERMISSIONS_SUBMIT;
$perm_name = "news_submit";
$perm_desc = "";
- break;
+ break;
+
+ case 4:
+ $title_of_form = _NEWS_AM_PERMISSIONS_APPROVE;
+ $perm_name = "news_approve";
+ $perm_desc = "";
+ break;
}
$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, "admin/permissions.php");
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/article.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -112,7 +112,7 @@
// Check the access permission
$perm_handler = NewsPermission::getHandler ();
- if (! $perm_handler->News_IsAllowed ( $xoopsUser, 'news_access', $view_topic->getVar ( 'topic_id' ), $NewsModule )) {
+ if (! $perm_handler->News_IsAllowed ( $xoopsUser, 'news_view', $view_topic->getVar ( 'topic_id' ), $NewsModule )) {
redirect_header ( "index.php", 3, _NOPERM );
exit ();
}
Added: XoopsModules/fmcontent/branches/news/class/rate.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/rate.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/class/rate.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -0,0 +1,63 @@
+<?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.
+*/
+
+/**
+ * News page class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+class news_rate extends XoopsObject {
+
+ /**
+ * Class constructor
+ */
+ function news_rate() {
+ $this->initVar ( "rate_id", XOBJ_DTYPE_INT, '' );
+ $this->initVar ( "rate_modid", XOBJ_DTYPE_INT, '' );
+ $this->initVar ( "rate_story", XOBJ_DTYPE_INT, '' );
+ $this->initVar ( "rate_user", XOBJ_DTYPE_INT, '' );
+ $this->initVar ( "rate_rating", XOBJ_DTYPE_INT, '' );
+ $this->initVar ( "rate_hostname", XOBJ_DTYPE_TXTBOX, '' );
+ $this->initVar ( "rate_created", XOBJ_DTYPE_INT, '' );
+
+
+ $this->db = $GLOBALS ['xoopsDB'];
+ $this->table = $this->db->prefix ( 'news_rate' );
+ }
+
+ /**
+ * Returns an array representation of the object
+ *
+ * @return array
+ **/
+ function toArray() {
+ $ret = array ();
+ $vars = $this->getVars ();
+ foreach ( array_keys ( $vars ) as $i ) {
+ $ret [$i] = $this->getVar ( $i );
+ }
+ return $ret;
+ }
+
+}
+
+class NewsRateHandler extends XoopsPersistableObjectHandler {
+
+ function NewsRateHandler($db) {
+ parent::XoopsPersistableObjectHandler ( $db, 'news_rate', 'news_rate', 'rate_id', 'rate_story' );
+ }
+
+}
+?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -509,7 +509,7 @@
function News_GetContentList($NewsModule, $story_infos) {
$ret = array ();
- $access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
+ $access_topic = NewsPermission::News_GetItemIds ( 'news_view', $NewsModule);
$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
$topic_show = $topic_handler->allVisible($NewsModule,$story_infos ['topics'],$story_infos ['story_topic']);
if(isset($story_infos ['story_subtopic'])) {
@@ -574,7 +574,7 @@
function News_GetContentBlockList($NewsModule, $story_infos ,$topics) {
$ret = array ();
- $access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
+ $access_topic = NewsPermission::News_GetItemIds ( 'news_view', $NewsModule);
if (! (count ( $topics ) == 1 && $topics [0] == 0)) {
$topiclist = array_intersect($access_topic , $topics);
@@ -677,7 +677,7 @@
* use in homepage function in NewsUtils class
*/
function News_GetContentCount($NewsModule, $story_infos) {
- $access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
+ $access_topic = NewsPermission::News_GetItemIds ( 'news_view', $NewsModule);
$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
$topic_show = $topic_handler->allVisible($NewsModule,$story_infos ['topics'],$story_infos ['story_topic']);
if(isset($story_infos ['story_subtopic'])) {
@@ -1177,7 +1177,7 @@
function News_Slide($NewsModule, $story_infos ,$topics) {
$ret = array();
- $access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
+ $access_topic = NewsPermission::News_GetItemIds ( 'news_view', $NewsModule);
if (! (count ( $topics ) == 1 && $topics [0] == 0)) {
$topiclist = array_intersect($access_topic , $topics);
} else {
@@ -1249,7 +1249,7 @@
function News_Marquee($NewsModule, $story_infos ,$topics) {
$ret = array();
- $access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
+ $access_topic = NewsPermission::News_GetItemIds ( 'news_view', $NewsModule);
if (! (count ( $topics ) == 1 && $topics [0] == 0)) {
$topiclist = array_intersect($access_topic , $topics);
} else {
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -153,7 +153,7 @@
$full_list = array_keys ( $group_list );
global $xoopsModule;
if (! $this->isNew ()) {
- $groups_ids_view = $gperm_handler->getGroupIds ( 'news_access', $this->getVar ( 'topic_id' ), $xoopsModule->getVar ( 'mid' ) );
+ $groups_ids_view = $gperm_handler->getGroupIds ( 'news_view', $this->getVar ( 'topic_id' ), $xoopsModule->getVar ( 'mid' ) );
$groups_ids_submit = $gperm_handler->getGroupIds ( 'news_submit', $this->getVar ( 'topic_id' ), $xoopsModule->getVar ( 'mid' ) );
$groups_ids_view = array_values ( $groups_ids_view );
$groups_NEWS_AM_can_view_checkbox = new XoopsFormCheckBox ( _NEWS_AM_PERMISSIONS_ACCESS, 'groups_view[]', $groups_ids_view );
Modified: XoopsModules/fmcontent/branches/news/include/functions_update.php
===================================================================
--- XoopsModules/fmcontent/branches/news/include/functions_update.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/include/functions_update.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -23,44 +23,7 @@
* If your version is under 1.68 ( or 1.66 ) please frist update your old version to 1.68.
*/
function xoops_module_update_news($module, $version) {
-
- // start update to version 1.82
- if($version < 182) {
-
- $db = $GLOBALS["xoopsDB"];
- $error = false;
-
- include_once XOOPS_ROOT_PATH . '/modules/news/class/utils.php';
-
- if(!NewsUtils::News_FieldExists('topic_style' ,$db->prefix('news_topic')))
- {
- NewsUtils::News_AddField('`topic_style` varchar(64) NOT NULL' ,$db->prefix('news_topic'));
- }
-
- }
- // end update to version 1.82
- // start update to version 1.81
- if($version < 181) {
-
- $db = $GLOBALS["xoopsDB"];
- $error = false;
-
- include_once XOOPS_ROOT_PATH . '/modules/news/class/utils.php';
-
- if(!NewsUtils::News_FieldExists('story_slide' ,$db->prefix('news_story')))
- {
- NewsUtils::News_AddField('`story_slide` TINYINT( 1 ) NOT NULL AFTER `story_status`' ,$db->prefix('news_story'));
- }
-
- if(!NewsUtils::News_FieldExists('story_marquee' ,$db->prefix('news_story')))
- {
- NewsUtils::News_AddField('`story_marquee` TINYINT( 1 ) NOT NULL AFTER `story_slide`' ,$db->prefix('news_story'));
- }
-
- }
- // end update to version 1.81
-
// start update to version 1.80
if($version < 180) {
@@ -139,44 +102,44 @@
if(!NewsUtils::News_TableExists($db->prefix('news_story')))
{
$sql = "CREATE TABLE " . $db->prefix('news_story') . " (
- `story_id` int(10) NOT NULL auto_increment,
+ `story_id` int(10) NOT NULL auto_increment,
`story_title` varchar(255) NOT NULL,
- `story_subtitle` varchar(255) NOT NULL,
- `story_titleview` tinyint(1) NOT NULL default '1',
- `story_topic` int(11) NOT NULL,
- `story_type` varchar(25) NOT NULL,
- `story_short` text NOT NULL,
- `story_text` text NOT NULL,
- `story_link` varchar(255) NOT NULL,
- `story_words` varchar(255) NOT NULL,
- `story_desc` varchar(255) NOT NULL,
- `story_alias` varchar(255) NOT NULL,
- `story_important` tinyint(1) NOT NULL,
- `story_default` tinyint(1) NOT NULL,
+ `story_subtitle` varchar(255) NOT NULL,
+ `story_titleview` tinyint(1) NOT NULL default '1',
+ `story_topic` int(11) NOT NULL,
+ `story_type` varchar(25) NOT NULL,
+ `story_short` text NOT NULL,
+ `story_text` text NOT NULL,
+ `story_link` varchar(255) NOT NULL,
+ `story_words` varchar(255) NOT NULL,
+ `story_desc` varchar(255) NOT NULL,
+ `story_alias` varchar(255) NOT NULL,
+ `story_important` tinyint(1) NOT NULL,
+ `story_default` tinyint(1) NOT NULL,
`story_status` tinyint(1) NOT NULL,
`story_slide` tinyint(1) NOT NULL,
- `story_marquee` tinyint(1) NOT NULL,
- `story_create` int (10) NOT NULL default '0',
+ `story_marquee` tinyint(1) NOT NULL,
+ `story_create` int (10) NOT NULL default '0',
`story_update` int (10) NOT NULL default '0',
- `story_publish` int (10) NOT NULL default '0',
- `story_expire` int (10) NOT NULL default '0',
- `story_uid` int(11) NOT NULL,
- `story_author` varchar(255) NOT NULL,
- `story_source` varchar(255) NOT NULL,
- `story_groups` varchar(255) NOT NULL,
- `story_order` int(11) NOT NULL,
- `story_next` int(11) NOT NULL default '0',
- `story_prev` int(11) NOT NULL default '0',
- `story_modid` int(11) NOT NULL,
- `story_hits` int(11) NOT NULL,
- `story_img` varchar(255) NOT NULL,
+ `story_publish` int (10) NOT NULL default '0',
+ `story_expire` int (10) NOT NULL default '0',
+ `story_uid` int(11) NOT NULL,
+ `story_author` varchar(255) NOT NULL,
+ `story_source` varchar(255) NOT NULL,
+ `story_groups` varchar(255) NOT NULL,
+ `story_order` int(11) NOT NULL,
+ `story_next` int(11) NOT NULL default '0',
+ `story_prev` int(11) NOT NULL default '0',
+ `story_modid` int(11) NOT NULL,
+ `story_hits` int(11) NOT NULL,
+ `story_img` varchar(255) NOT NULL,
`story_comments` int(11) unsigned NOT NULL default '0',
- `story_file` tinyint(3) NOT NULL,
- `dohtml` tinyint(1) NOT NULL,
- `dobr` tinyint(1) NOT NULL,
- `doimage` tinyint(1) NOT NULL,
- `dosmiley` tinyint(1) NOT NULL,
- `doxcode` tinyint(1) NOT NULL,
+ `story_file` tinyint(3) NOT NULL,
+ `dohtml` tinyint(1) NOT NULL,
+ `dobr` tinyint(1) NOT NULL,
+ `doimage` tinyint(1) NOT NULL,
+ `dosmiley` tinyint(1) NOT NULL,
+ `doxcode` tinyint(1) NOT NULL,
PRIMARY KEY (`story_id`),
KEY `idxstoriestopic` (`story_topic`),
KEY `story_title` (`story_title`),
@@ -191,33 +154,34 @@
if(!NewsUtils::News_TableExists($db->prefix('news_topic')))
{
$sql = "CREATE TABLE " . $db->prefix('news_topic') . " (
- `topic_id` int (11) unsigned NOT NULL auto_increment,
- `topic_pid` int (5) unsigned NOT NULL ,
- `topic_title` varchar (255) NOT NULL ,
- `topic_desc` text NOT NULL ,
- `topic_img` varchar (255) NOT NULL ,
- `topic_weight` int (5) NOT NULL ,
- `topic_showtype` tinyint (4) NOT NULL ,
- `topic_perpage` tinyint (4) NOT NULL ,
- `topic_columns` tinyint (4) NOT NULL ,
- `topic_submitter` int (10) NOT NULL default '0',
- `topic_date_created` int (10) NOT NULL default '0',
- `topic_date_update` int (10) NOT NULL default '0',
- `topic_asmenu` tinyint (1) NOT NULL default '1',
- `topic_online` tinyint (1) NOT NULL default '1',
- `topic_modid` int(11) NOT NULL,
- `topic_showtopic` tinyint (1) NOT NULL default '0',
- `topic_showauthor` tinyint (1) NOT NULL default '1',
- `topic_showdate` tinyint (1) NOT NULL default '1',
- `topic_showpdf` tinyint (1) NOT NULL default '1',
- `topic_showprint` tinyint (1) NOT NULL default '1',
- `topic_showmail` tinyint (1) NOT NULL default '1',
- `topic_shownav` tinyint (1) NOT NULL default '1',
- `topic_showhits` tinyint (1) NOT NULL default '1',
- `topic_showcoms` tinyint (1) NOT NULL default '1',
+ `topic_id` int (11) unsigned NOT NULL auto_increment,
+ `topic_pid` int (5) unsigned NOT NULL ,
+ `topic_title` varchar (255) NOT NULL ,
+ `topic_desc` text NOT NULL ,
+ `topic_img` varchar (255) NOT NULL ,
+ `topic_weight` int (5) NOT NULL ,
+ `topic_showtype` tinyint (4) NOT NULL ,
+ `topic_perpage` tinyint (4) NOT NULL ,
+ `topic_columns` tinyint (4) NOT NULL ,
+ `topic_submitter` int (10) NOT NULL default '0',
+ `topic_date_created` int (10) NOT NULL default '0',
+ `topic_date_update` int (10) NOT NULL default '0',
+ `topic_asmenu` tinyint (1) NOT NULL default '1',
+ `topic_online` tinyint (1) NOT NULL default '1',
+ `topic_modid` int(11) NOT NULL,
+ `topic_showtopic` tinyint (1) NOT NULL default '0',
+ `topic_showauthor` tinyint (1) NOT NULL default '1',
+ `topic_showdate` tinyint (1) NOT NULL default '1',
+ `topic_showpdf` tinyint (1) NOT NULL default '1',
+ `topic_showprint` tinyint (1) NOT NULL default '1',
+ `topic_showmail` tinyint (1) NOT NULL default '1',
+ `topic_shownav` tinyint (1) NOT NULL default '1',
+ `topic_showhits` tinyint (1) NOT NULL default '1',
+ `topic_showcoms` tinyint (1) NOT NULL default '1',
`topic_alias` varchar(255) NOT NULL,
`topic_homepage` tinyint (4) NOT NULL ,
- `topic_show` tinyint (1) NOT NULL default '1',
+ `topic_show` tinyint (1) NOT NULL default '1',
+ `topic_style` varchar(64) NOT NULL,
PRIMARY KEY (`topic_id`,`topic_modid`),
UNIQUE KEY `file_id` (`topic_id`,`topic_modid`)
) ENGINE=MyISAM;";
@@ -245,6 +209,26 @@
return false;
}
}
+
+ if(!NewsUtils::News_TableExists($db->prefix('news_rate')))
+ {
+ $sql = "CREATE TABLE " . $db->prefix('news_rate') . " (
+ `rate_id` int(11) unsigned NOT NULL auto_increment,
+ `rate_modid` int(11) NOT NULL,
+ `rate_story` int(8) unsigned NOT NULL default '0',
+ `rate_user` int(11) NOT NULL default '0',
+ `rate_rating` tinyint(3) unsigned NOT NULL default '0',
+ `rate_hostname` varchar(60) NOT NULL default '',
+ `rate_created` int(10) NOT NULL default '0',
+ PRIMARY KEY (rate_id),
+ KEY rate_user (rate_user),
+ KEY rate_hostname (rate_hostname),
+ KEY rate_story (rate_story)
+ ) ENGINE=MyISAM;";
+ if (!$db->queryF($sql)) {
+ return false;
+ }
+ }
//load needed handler
$module_handler = xoops_gethandler('module');
@@ -253,6 +237,7 @@
$topic_handler = xoops_getmodulehandler('topic', 'news');
$story_handler = xoops_getmodulehandler('story', 'news');
$file_handler = xoops_getmodulehandler('file', 'news');
+ $vote_handler = xoops_getmodulehandler('rate', 'news');
$newsModule = $module_handler->getByDirname('news');
$news_mid = $newsModule->getVar('mid');
@@ -280,9 +265,9 @@
return false;
}
- $result = $db->query('SELECT * FROM '.$old_articles.' WHERE topicid = '.$topic['topic_id'].' ORDER BY created');
+ $result1 = $db->query('SELECT * FROM '.$old_articles.' WHERE topicid = '.$topic['topic_id'].' ORDER BY created');
- while ( $article = $db->fetchArray($result) ) {
+ while ( $article = $db->fetchArray($result1) ) {
$storyobj = $story_handler->create ();
$storyobj->setVar ( 'story_id', $article['storyid']);
@@ -317,8 +302,8 @@
}
// The files
- $result4 = $db->query('SELECT * FROM '.$old_files.' WHERE storyid='.$article['storyid']);
- while ( $file = $db->fetchArray($result4) ) {
+ $result2 = $db->query('SELECT * FROM '.$old_files.' WHERE storyid='.$article['storyid']);
+ while ( $file = $db->fetchArray($result2) ) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_id', $file['fileid']);
$fileobj->setVar ( 'file_modid', $news_mid);
@@ -334,6 +319,24 @@
return false;
}
}
+
+ // The votess
+ $result3 = $db->query('SELECT * FROM '.$old_rating.' WHERE storyid='.$article['storyid']);
+ while ( $vote = $db->fetchArray($result3) ) {
+ $voteobj = $vote_handler->create ();
+ $voteobj->setVar ( 'rate_id', $vote['ratingid']);
+ $voteobj->setVar ( 'rate_modid', $news_mid);
+ $voteobj->setVar ( 'rate_story', $vote['storyid']);
+ $voteobj->setVar ( 'rate_user', $vote['ratinguser']);
+ $voteobj->setVar ( 'rate_rating', $vote['rating']);
+ $voteobj->setVar ( 'rate_hostname', $vote['ratinghostname']);
+ $voteobj->setVar ( 'rate_created', $vote['ratingtimestamp']);
+
+ if (! $vote_handler->insert ( $voteobj )) {
+ return false;
+ }
+ }
+
}
}
}
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -74,7 +74,7 @@
// Check the access permission
$perm_handler = NewsPermission::getHandler ();
- if (! $perm_handler->News_IsAllowed ( $xoopsUser, 'news_access', $view_topic->getVar ( 'topic_id' ), $NewsModule )) {
+ if (! $perm_handler->News_IsAllowed ( $xoopsUser, 'news_view', $view_topic->getVar ( 'topic_id' ), $NewsModule )) {
redirect_header ( "index.php", 3, _NOPERM );
exit ();
}
Modified: XoopsModules/fmcontent/branches/news/pdf.php
===================================================================
--- XoopsModules/fmcontent/branches/news/pdf.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/pdf.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -78,7 +78,7 @@
// Check the access permission
$perm_handler = NewsPermission::getHandler();
- if (!$perm_handler->News_IsAllowed($xoopsUser, 'news_access', $view_topic->getVar('topic_id'), $NewsModule)) {
+ if (!$perm_handler->News_IsAllowed($xoopsUser, 'news_view', $view_topic->getVar('topic_id'), $NewsModule)) {
redirect_header("index.php", 3, _NOPERM);
exit;
}
Modified: XoopsModules/fmcontent/branches/news/print.php
===================================================================
--- XoopsModules/fmcontent/branches/news/print.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/print.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -76,7 +76,7 @@
// Check the access permission
$perm_handler = NewsPermission::getHandler();
- if (!$perm_handler->News_IsAllowed($xoopsUser, 'news_access', $view_topic->getVar('topic_id'), $NewsModule)) {
+ if (!$perm_handler->News_IsAllowed($xoopsUser, 'news_view', $view_topic->getVar('topic_id'), $NewsModule)) {
redirect_header("index.php", 3, _NOPERM);
exit;
}
Modified: XoopsModules/fmcontent/branches/news/rss.php
===================================================================
--- XoopsModules/fmcontent/branches/news/rss.php 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/rss.php 2012-05-19 10:26:22 UTC (rev 9551)
@@ -92,7 +92,7 @@
if ($story_topic != 0) {
$permHandler = NewsPermission::getHandler();
- if ($permHandler->News_IsAllowed($xoopsUser, 'news_access', $story_topic)) {
+ if ($permHandler->News_IsAllowed($xoopsUser, 'news_view', $story_topic)) {
$topic_obj = $topic_handler->get($story_topic);
}
}
Modified: XoopsModules/fmcontent/branches/news/sql/mysql.sql
===================================================================
--- XoopsModules/fmcontent/branches/news/sql/mysql.sql 2012-05-19 10:22:50 UTC (rev 9550)
+++ XoopsModules/fmcontent/branches/news/sql/mysql.sql 2012-05-19 10:26:22 UTC (rev 9551)
@@ -1,6 +1,6 @@
CREATE TABLE `news_story` (
`story_id` int(10) NOT NULL auto_increment,
-`story_title` varchar(255) NOT NULL,
+`story_title` varchar(255) NOT NULL,
`story_subtitle` varchar(255) NOT NULL,
`story_titleview` tinyint(1) NOT NULL default '1',
`story_topic` int(11) NOT NULL,
@@ -13,11 +13,11 @@
`story_alias` varchar(255) NOT NULL,
`story_important` tinyint(1) NOT NULL,
`story_default` tinyint(1) NOT NULL,
-`story_status` tinyint(1) NOT NULL,
-`story_slide` tinyint(1) NOT NULL,
+`story_status` tinyint(1) NOT NULL,
+`story_slide` tinyint(1) NOT NULL,
`story_marquee` tinyint(1) NOT NULL,
`story_create` int (10) NOT NULL default '0',
-`story_update` int (10) NOT NULL default '0',
+`story_update` int (10) NOT NULL default '0',
`story_publish` int (10) NOT NULL default '0',
`story_expire` int (10) NOT NULL default '0',
`story_uid` int(11) NOT NULL,
@@ -30,18 +30,18 @@
`story_modid` int(11) NOT NULL,
`story_hits` int(11) NOT NULL,
`story_img` varchar(255) NOT NULL,
-`story_comments` int(11) unsigned NOT NULL default '0',
+`story_comments` int(11) unsigned NOT NULL default '0',
`story_file` tinyint(3) NOT NULL,
`dohtml` tinyint(1) NOT NULL,
`dobr` tinyint(1) NOT NULL,
`doimage` tinyint(1) NOT NULL,
`dosmiley` tinyint(1) NOT NULL,
`doxcode` tinyint(1) NOT NULL,
-PRIMARY KEY (`story_id`),
-KEY `idxstoriestopic` (`story_topic`),
-KEY `story_title` (`story_title`),
-KEY `story_create` (`story_create`),
-FULLTEXT KEY `search` (`story_title`,`story_short`,`story_text`,`story_subtitle`)
+PRIMARY KEY (`story_id`),
+KEY `idxstoriestopic` (`story_topic`),
+KEY `story_title` (`story_title`),
+KEY `story_create` (`story_create`),
+FULLTEXT KEY `search` (`story_title`,`story_short`,`story_text`,`story_subtitle`)
) ENGINE=MyISAM;
@@ -70,24 +70,38 @@
`topic_shownav` tinyint (1) NOT NULL default '1',
`topic_showhits` tinyint (1) NOT NULL default '1',
`topic_showcoms` tinyint (1) NOT NULL default '1',
-`topic_alias` varchar(255) NOT NULL,
-`topic_homepage` tinyint (4) NOT NULL ,
-`topic_show` tinyint (1) NOT NULL default '1',
+`topic_alias` varchar(255) NOT NULL,
+`topic_homepage` tinyint (4) NOT NULL ,
+`topic_show` tinyint (1) NOT NULL default '1',
`topic_style` varchar(64) NOT NULL,
PRIMARY KEY (`topic_id`,`topic_modid`),
UNIQUE KEY `file_id` (`topic_id`,`topic_modid`)
-) ENGINE=MyISAM;
-
-CREATE TABLE `news_file` (
-`file_id` int (11) unsigned NOT NULL auto_increment,
-`file_modid` int(11) NOT NULL,
-`file_title` varchar (255) NOT NULL ,
-`file_name` varchar (255) NOT NULL ,
-`file_content` int(11) NOT NULL,
-`file_date` int(10) NOT NULL default '0',
-`file_type` varchar(64) NOT NULL default '',
-`file_status` tinyint(1) NOT NULL,
-`file_hits` int(11) NOT NULL,
+) ENGINE=MyISAM;
+
+CREATE TABLE `news_file` (
+`file_id` int (11) unsigned NOT NULL auto_increment,
+`file_modid` int(11) NOT NULL,
+`file_title` varchar (255) NOT NULL ,
+`file_name` varchar (255) NOT NULL ,
+`file_content` int(11) NOT NULL,
+`file_date` int(10) NOT NULL default '0',
+`file_type` varchar(64) NOT NULL default '',
+`file_status` tinyint(1) NOT NULL,
+`file_hits` int(11) NOT NULL,
PRIMARY KEY (`file_id`,`file_modid`),
UNIQUE KEY `file_id` (`file_id`,`file_modid`)
+) ENGINE=MyISAM;
+
+CREATE TABLE `news_rate` (
+`rate_id` int(11) unsigned NOT NULL auto_increment,
+`rate_modid` int(11) NOT NULL,
+`rate_story` int(8) unsigned NOT NULL default '0',
+`rate_user` int(11) NOT NULL default '0',
+`rate_rating` tinyint(3) unsigned NOT NULL default '0',
+`rate_hostname` varchar(60) NOT NULL default '',
+`rate_created` int(10) NOT NULL default '0',
+PRIMARY KEY (rate_id),
+KEY rate_user (rate_user),
+KEY rate_hostname (rate_hostname),
+KEY rate_story (rate_story)
) ENGINE=MyISAM;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-19 10:22:56
|
Revision: 9550
http://xoops.svn.sourceforge.net/xoops/?rev=9550&view=rev
Author: beckmi
Date: 2012-05-19 10:22:50 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Updating icon links
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html 2012-05-19 10:22:05 UTC (rev 9549)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html 2012-05-19 10:22:50 UTC (rev 9550)
@@ -15,10 +15,10 @@
<td class="txtcenter"><{$security.type}></td>
<td class="xo-actions txtcenter">
<{if $security.status == '1'}>
- <img src="<{xoAdminIcons success.png}>" alt="OK" />
+ <img src="<{xoModuleIcons16 1.png}>" alt="OK" />
<{/if}>
<{if $security.status == '0'}>
- <img src="<{xoAdminIcons cancel.png}>" alt="<{$smarty.const._AM_ADV_NOTSECURE}>"/>
+ <img src="<{xoModuleIcons16 0.png}>" alt="<{$smarty.const._AM_ADV_NOTSECURE}>"/>
<{/if}>
<{if $security.status == '-'}>
<{$security.status}>
@@ -27,7 +27,7 @@
<td class="txtleft"><{$security.info}></td>
<td class="xo-actions txtcenter">
<{if $security.text != ''}>
- <img class="xo-tooltip" onclick="display_dialog(<{$security.id}>, true, true, 'slide', 'slide', 200, 520);" src="<{xoAdminIcons display.png}>" title="<{$smarty.const._AM_ADV_VIEW}>" alt="<{$smarty.const._AM_ADV_VIEW}>" />
+ <img class="xo-tooltip" onclick="display_dialog(<{$security.id}>, true, true, 'slide', 'slide', 200, 520);" src="<{xoModuleIcons16 info.png}>" title="<{$smarty.const._AM_ADV_VIEW}>" alt="<{$smarty.const._AM_ADV_VIEW}>" />
<{/if}>
</td>
</tr>
@@ -45,7 +45,7 @@
<div class="xo-moduleadmin-infobox outer">
<div class="xo-window">
<div class="xo-window-title">
- <img src="<{$xoops_url}>/media/xoops/images/icons/16/info.png" alt="" /> <{$smarty.const._AM_ADV_SUBTITLECHECK}>
+ <img src="<{xoModuleIcons16 info.png}>" alt="" /> <{$smarty.const._AM_ADV_SUBTITLECHECK}>
<a class="down" href="javascript:;"> </a>
</div>
<div class="xo-window-data">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-05-19 10:22:12
|
Revision: 9549
http://xoops.svn.sourceforge.net/xoops/?rev=9549&view=rev
Author: txmodxoops
Date: 2012-05-19 10:22:05 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_footer.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_menu.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/update language 1.37 to 1.38.txt
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -19,7 +19,7 @@
* ****************************************************************************
*/
echo "<div class='center'><a href='http://www.xoops.org' target='_blank'>
- <img src='".$GLOBALS['pathImageAdmin']."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>
+ <img src='".$GLOBALS['pathIcon32']."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>
</div>";
echo "<div class='center pad5'>
<span class='bold'>".$GLOBALS['xoopsModule']->getVar('name')."</span>
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -27,8 +27,8 @@
$modulesHandler =& xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
$tablesHandler =& xoops_getModuleHandler('tdmcreate_tables', 'TDMCreate');
-$pathImageIcon = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32');
+$pathIcon16 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16');
+$pathIcon32 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32');
$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
$myts =& MyTextSanitizer::getInstance();
@@ -43,8 +43,8 @@
include_once(XOOPS_ROOT_PATH."/class/template.php");
$xoopsTpl = new XoopsTpl();
}
-$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
-$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
+$xoopsTpl->assign('pathIcon32', $pathIcon32);
//Load languages
xoops_loadLanguage('admin', $thisDirname);
xoops_loadLanguage('modinfo', $thisDirname);
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/menu.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/menu.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -17,29 +17,20 @@
* Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
* ****************************************************************************
*/
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('TDMCreate');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$pathImageAdmin = $moduleInfo->getInfo('icons32');
-$adminmenu = array();
-$i = 1;
+$pathIcon32 = $GLOBALS['xoopsModule']->getInfo('icons32');
+$adminmenu = array(); $i = 1;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_INDEX;
$adminmenu[$i]["link"] = 'admin/index.php';
-$adminmenu[$i]["icon"] = 'images/32/dashboard.png';
-$i++;
+$adminmenu[$i]["icon"] = 'images/32/dashboard.png'; $i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_MODULES;
$adminmenu[$i]["link"] = 'admin/modules.php';
-$adminmenu[$i]["icon"] = 'images/32/addmodule.png';
-$i++;
+$adminmenu[$i]["icon"] = 'images/32/addmodule.png'; $i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_TABLES;
$adminmenu[$i]["link"] = 'admin/tables.php';
-$adminmenu[$i]["icon"] = 'images/32/addtable.png';
-$i++;
+$adminmenu[$i]["icon"] = 'images/32/addtable.png'; $i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_CONST;
$adminmenu[$i]["link"] = 'admin/building.php';
-$adminmenu[$i]["icon"] = 'images/32/builder.png';
-$i++;
+$adminmenu[$i]["icon"] = 'images/32/builder.png'; $i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_ABOUT;
$adminmenu[$i]["link"] = 'admin/about.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png';
+$adminmenu[$i]["icon"] = '../../'.$pathIcon32.'/about.png';
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -27,7 +27,7 @@
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'modules_list', 'string' );
$modulesAdmin = new ModuleAdmin();
switch ($op) {
- case "modules_save":
+ case "modules_save":
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -94,23 +94,23 @@
if ($modulesHandler->insert($obj)) {
redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_FORMOK);
} else {
- redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_NOTINSERTED);
+ redirect_header('modules.php?op=modules_create', 2, _AM_TDMCREATE_NOTINSERTED);
}
break;
- case "modules_create":
+ case "modules_create":
echo $modulesAdmin->addNavigation('modules.php');
$modulesAdmin->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=modules_list', 'list');
echo $modulesAdmin->renderButton();
$obj =& $modulesHandler->create();
$form = $obj->getForm();
- break;
- case "modules_edit":
+ break;
+ case "modules_edit":
$obj =& $modulesHandler->get($_REQUEST['modules_id']);
$form = $obj->getForm();
- break;
- case "modules_delete":
+ break;
+ case "modules_delete":
$obj =& $modulesHandler->get($_REQUEST['modules_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
{
@@ -126,9 +126,9 @@
} else {
xoops_confirm(array('ok' => 1, 'modules_id' => $_REQUEST['modules_id'], 'op' => 'modules_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('modules_name')));
}
- break;
- case "modules_list":
- default:
+ break;
+ case "modules_list":
+ default:
echo $modulesAdmin->addNavigation('modules.php');
$modulesAdmin->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=modules_create', 'add');
echo $modulesAdmin->renderButton();
@@ -190,7 +190,7 @@
echo '<td> </td>';
echo '<td> </td>';
echo '<td>';
- echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src="'. $pathImageIcon .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src="'. $pathImageIcon .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td>';
echo '</tr>';
}
@@ -210,6 +210,6 @@
echo '<tr><td class="errorMsg" colspan="7">Empty!</td></tr>';
echo '</table><br><br>';
}
- break;
+ break;
}
include "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -60,8 +60,8 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(is_dir($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
+ if(is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
}
@@ -187,12 +187,13 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(is_dir($pathImageAdmin) && isset($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
+ if(is_dir($pathIcon32) && isset($pathIcon32)){
+ $uploaddir = $pathIcon32;
} else {
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/modules/".$modules_name."/images/32/";
}
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
$name_img = $_REQUEST['tables_name'].'.'.$extension;
@@ -352,12 +353,13 @@
$tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_champs', 'add');
echo $tablesAdmin->renderButton();
- //Champs existe deja ?
+ //Fields already exists?
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tables_name', $_REQUEST['tables_name']));
+ $criteria->add(new Criteria('tables_modules', $_REQUEST['tables_modules']), 'AND');
+ $criteria->add(new Criteria('tables_name', $_REQUEST['tables_name']), 'AND');
$nb_tables1 = $tablesHandler->getCount($criteria);
- if ( $nb_tables1 < 1 )
+ if ( $nb_tables1 == 1 )
{
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -379,8 +381,8 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- if(!is_dir($pathImageAdmin) && isset($pathImageAdmin)){
- $uploaddir = $pathImageAdmin;
+ if(!is_dir($pathIcon32) && isset($pathIcon32)){
+ $uploaddir = $pathIcon32;
}else{
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
}
@@ -515,7 +517,7 @@
echo '<td> </td>';
echo '<td> </td>';
echo '<td>';
- echo '<a href="tables.php?op=edit_modules&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '<a href="tables.php?op=edit_modules&modules_id='.$modules_id.'"><img src='. $pathIcon16 ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$modules_id.'"><img src='. $pathIcon16 ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td>';
echo '</tr>';
@@ -544,8 +546,8 @@
$blocs = ($tables_blocks == 1) ? _YES : _NO;
echo '<tr class="even center">';
echo '<td class="left"> <b>- '.$tables_name.'</b></a></td>';
- if(!is_dir($pathImageAdmin)){
- echo '<td><img src="'.$pathImageAdmin.'/'.$tables_img.'" height="30px"></td>';
+ if(!is_dir($pathIcon32)){
+ echo '<td><img src="'.$pathIcon32.'/'.$tables_img.'" height="30px"></td>';
}else{
echo '<td><img src="../images/uploads/tables/'.$tables_img.'" height="30px"></td>';
}
@@ -554,7 +556,7 @@
echo '<td>'.$blocs.'</td>';
echo '<td>'.$nb_champs.'</td>';
echo '<td>';
- echo '<a href="tables.php?op=edit_tables&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '<a href="tables.php?op=edit_tables&tables_id='.$tables_id.'"><img src='. $pathIcon16 ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tables_id.'"><img src='. $pathIcon16 ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tables_id.'"><img src='. $pathIcon16 ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td></tr>';
}
}
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_footer.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_footer.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -19,22 +19,22 @@
*/
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/const/const_entete.php';
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/functions_const.php';
-
function const_admin_footer($modules, $modules_name, $tables_arr)
{
$language = '_AM_'.strtoupper($modules_name).'_';
$myts =& MyTextSanitizer::getInstance();
$file = "admin_footer.php";
$path_file = TDM_CREATE_MURL."/".$modules_name."/admin/".$file;
- $en_tete = const_entete($modules, 0);
-
+ $en_tete = const_entete($modules, 0);
$text = '<?php'.$en_tete.'
-global $pathImageAdmin;
-echo "<div align=\'center\'><a href=\'http://www.xoops.org\' target=\'_blank\'>
- <img src=\'".$pathImageAdmin."/xoopsmicrobutton.gif\' alt=\'XOOPS\' title=\'XOOPS\'></a></div>";
-echo "<div class=\'center small italic pad5\'>
- <strong>" . $xoopsModule->getVar(\'name\') . "</strong> ".'.$language.'MAINTAINEDBY."
- <a href=\''.$modules->getVar("modules_forum_site_url").'\' title=\'Visit '.$modules->getVar("modules_forum_site_name").'\' class=\'tooltip\' rel=\'external\'>'.$modules->getVar("modules_forum_site_name").'</a></div>";
+echo "<div class=\'center\'><a href=\'http://www.xoops.org\' target=\'_blank\'>
+ <img src=\'".$GLOBALS[\'pathIcon32\']."/xoopsmicrobutton.gif\' alt=\'XOOPS\' title=\'XOOPS\'></a>
+ </div>";
+echo "<div class=\'center pad5\'>
+ <span class=\'bold\'>".$GLOBALS[\'xoopsModule\']->getVar(\'name\')."</span>
+ <span class=\'small italic\'> "._AM_TDMCREATE_MAINTAINEDBY."
+ <a href=\''.$modules->getVar("modules_forum_site_url").'\' title=\'Visit '.$modules->getVar("modules_forum_site_name").'\' class=\'tooltip\' rel=\'external\'>'.$modules->getVar("modules_forum_site_name").'</a></span>
+ </div>";
xoops_cp_footer();
';
createFile($path_file, $text,
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -34,8 +34,8 @@
$thisDirname = $GLOBALS[\'xoopsModule\']->getVar(\'dirname\');
-$pathImageIcon = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons16\');
-$pathImageAdmin = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons32\');
+$pathIcon16 = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons16\');
+$pathIcon32 = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons32\');
$pathModuleAdmin = $GLOBALS[\'xoopsModule\']->getInfo(\'dirmoduleadmin\');
$myts =& MyTextSanitizer::getInstance();
@@ -61,8 +61,8 @@
$xoopsTpl = new XoopsTpl();
}
-$xoopsTpl->assign(\'pathImageIcon\', $pathImageIcon);
-$xoopsTpl->assign(\'pathImageAdmin\', $pathImageAdmin);
+$xoopsTpl->assign(\'pathIcon16\', $pathIcon16);
+$xoopsTpl->assign(\'pathIcon32\', $pathIcon32);
//xoops_cp_header();
//Load languages
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_menu.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_menu.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_menu.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -29,18 +29,11 @@
$en_tete = const_entete($modules, 0);
$menu = 1;
$text = '<?php'.$en_tete.'
-$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$module_handler =& xoops_gethandler("module");
-$xoopsModule =& XoopsModule::getByDirname($dirname);
-$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid"));
-$pathImageAdmin = $moduleInfo->getInfo("icons32");
-
-$adminmenu = array();
-$i = 1;
+$pathIcon32 = $GLOBALS[\'xoopsModule\']->getInfo("icons32");
+$adminmenu = array(); $i = 1;
$adminmenu[$i]["title"] = '.$language.$menu.';
$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/home.png";
-$i++;'.PHP_EOL;
+$adminmenu[$i]["icon"] = "../../".$pathIcon32."/dashboard.png"; $i++;'.PHP_EOL;
$menu++;
foreach (array_keys($tables_arr) as $i)
{
@@ -49,8 +42,7 @@
$text .= '$adminmenu[$i]["title"] = '.$language.$menu.';
$adminmenu[$i]["link"] = "admin/'.$tables_arr[$i]->getVar("tables_name").'.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/'.$tables_arr[$i]->getVar("tables_img").'";
-$i++;'.PHP_EOL;
+$adminmenu[$i]["icon"] = "../../".$pathIcon32."/'.$tables_arr[$i]->getVar("tables_img").'"; $i++;'.PHP_EOL;
$menu++;
}
$tables_module_table = $tables_arr[$i]->getVar("tables_module_table");
@@ -62,14 +54,12 @@
$menu++;
$text .= '$adminmenu[$i]["title"] = '.$language.$menu.';
$adminmenu[$i]["link"] = "admin/permissions.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/permissions.png";
-$i++;'.PHP_EOL;
+$adminmenu[$i]["icon"] = "../../".$pathIcon32."/permissions.png"; $i++;'.PHP_EOL;
}
$menu++;
$text .= '$adminmenu[$i]["title"] = '.$language.$menu.';
$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = "../../".$pathImageAdmin."/about.png";
-unset( $i );
+$adminmenu[$i]["icon"] = "../../".$pathIcon32."/about.png"; unset( $i );
?>';
unset( $menu );
createFile($path_file, $text,
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_pages.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_pages.php 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_pages.php 2012-05-19 10:22:05 UTC (rev 9549)
@@ -29,7 +29,6 @@
$text = '<?php'.$en_tete.'
include "admin_header.php";
xoops_cp_header();
-global $pathImageIcon;
// We recovered the value of the argument op in the URL$
$op = '.$modules_name.'_CleanVars($_REQUEST, \'op\', \'list\', \'string\');
';
@@ -117,8 +116,8 @@
$text .= $champs_data.'
echo "<td class=\'center width5\'>
- <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
- <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
+ <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
+ <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
</td>";
echo "</tr>";
}';
@@ -132,8 +131,8 @@
$text .= $champs_data.'
echo "<td class=\'center width5\'>
- <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
- <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
+ <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
+ <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
</td>";
echo "</tr>";';
}
@@ -157,7 +156,7 @@
//Function that enables display child categories
function '.$modules_name.'_display_children($topic_id = 0, $topic_arr, $prefix = "", $order = "", &$class)
{
- global $pathImageIcon;
+ global $pathIcon16;
$topicHandler =& xoops_getModuleHandler("'.$tables_module_table.'", "'.$modules_name.'");
$prefix = $prefix."<img src=\'".XOOPS_URL."/modules/'.$modules_name.'/images/deco/arrow.gif\'>";
foreach (array_keys($topic_arr) as $i)
@@ -173,8 +172,8 @@
$text .= $champs_data.'
echo "<td class=\'center\' width=\'10%\'>
- <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
- <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
+ <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
+ <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
</td>
</tr>";
$class = ($class == "even") ? "odd" : "even";
@@ -220,8 +219,8 @@
$text .= ''.$champs_data.'
echo "<td class=\'center width5\'>
- <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
- <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
+ <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
+ <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
</td>
</tr>";
$class = ($class == "even") ? "odd" : "even";
@@ -247,8 +246,8 @@
$text .= $champs_data.'
echo "<td class=\'center width5\'>
- <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
- <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathImageIcon."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
+ <a href=\''.$tables_name.'.php?op=edit_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/edit.png alt=\'"._EDIT."\' title=\'"._EDIT."\'></a>
+ <a href=\''.$tables_name.'.php?op=delete_'.$tables_name.'&'.$champs_id.'=".$i."\'><img src=".$pathIcon16."/delete.png alt=\'"._DELETE."\' title=\'"._DELETE."\'></a>
</td>";
echo "</tr>";';
}
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/update language 1.37 to 1.38.txt
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/update language 1.37 to 1.38.txt 2012-05-19 10:21:57 UTC (rev 9548)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/update language 1.37 to 1.38.txt 2012-05-19 10:22:05 UTC (rev 9549)
@@ -54,6 +54,7 @@
// New Module
define("_AM_TDMCREATE_MODULES_ACTIVE_SUBMENU", "Visible Submenu");
define("_AM_TDMCREATE_MODULES_ACTIVE_NOTIFY", "Active Notifications");
+define("_AM_TDMCREATE_NOTINSERTED", "The module is not saved, it is likely that you have used a name that already exists, please change name for a new module");
// New Table
define("_AM_TDMCREATE_TABLES_DISPLAY_SUMENU", "Use view TAB Submenu");
@@ -63,8 +64,7 @@
// Filemanager.php
// Nav
define('_AM_TDMCREATE_FILEMANAGER_NAV_MANAGER','File Manager');
-define('_AM_TDMCREATE_FILEMANAGER_NAV_MAIN','File Manager');
-define("_AM_TDMCREATE_NOTINSERTED", "The module is not saved, it is likely that you have used a name that already exists, please change name for a new module");
+define('_AM_TDMCREATE_FILEMANAGER_NAV_MAIN','File Manager');
//Tips
define('_AM_TDMCREATE_FILEMANAGER_NAV_TIPS','
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-19 10:22:04
|
Revision: 9548
http://xoops.svn.sourceforge.net/xoops/?rev=9548&view=rev
Author: beckmi
Date: 2012-05-19 10:21:57 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Fixing icon links
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/menu.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/menu.php 2012-05-19 09:14:57 UTC (rev 9547)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/menu.php 2012-05-19 10:21:57 UTC (rev 9548)
@@ -27,12 +27,12 @@
$i = 1;
$adminmenu[$i]['title'] = _USERRANK_MI_INDEX;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon'] = 'home.png';
$i++;
$adminmenu[$i]['title'] = _USERRANK_MI_USERRANK;
$adminmenu[$i]['link'] = "admin/userrank.php";
-$adminmenu[$i]['icon'] = $pathIcon32 . '/user-icon.png';
+$adminmenu[$i]['icon'] = 'user-icon.png';
$i++;
$adminmenu[$i]['title'] = _USERRANK_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = $pathIcon32 . '/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = 'about.png';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-19 09:15:04
|
Revision: 9547
http://xoops.svn.sourceforge.net/xoops/?rev=9547&view=rev
Author: beckmi
Date: 2012-05-19 09:14:57 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Adding icons from XOOPS 2.5.5
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/0.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/1.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add_off.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/down_off.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/up_off.png
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/0.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/0.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/1.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add_off.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/add_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/down_off.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/down_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/up_off.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/icons/16/up_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-19 08:35:33
|
Revision: 9546
http://xoops.svn.sourceforge.net/xoops/?rev=9546&view=rev
Author: beckmi
Date: 2012-05-19 08:35:26 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Fixing link to icons (currently it creates /icons/32//
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/admin/menu.php 2012-05-19 08:20:10 UTC (rev 9545)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/admin/menu.php 2012-05-19 08:35:26 UTC (rev 9546)
@@ -25,12 +25,12 @@
$i = 1;
$adminmenu[$i]['title'] = _PM_MI_INDEX;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = '/home.png';
+$adminmenu[$i]['icon'] = 'home.png';
$i++;
$adminmenu[$i]['title'] = _PM_MI_PRUNE;
$adminmenu[$i]['link'] = "admin/prune.php";
-$adminmenu[$i]['icon'] = '/prune.png';
+$adminmenu[$i]['icon'] = 'prune.png';
$i++;
$adminmenu[$i]['title'] = _PM_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = 'about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/menu.php 2012-05-19 08:20:10 UTC (rev 9545)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/menu.php 2012-05-19 08:35:26 UTC (rev 9546)
@@ -26,28 +26,28 @@
$i = 1;
$adminmenu[$i]['title'] = _PROFILE_MI_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = '/home.png';
+$adminmenu[$i]['icon'] = 'home.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_USERS;
$adminmenu[$i]['link'] = "admin/user.php";
-$adminmenu[$i]['icon'] = '/users.png';
+$adminmenu[$i]['icon'] = 'users.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_CATEGORIES;
$adminmenu[$i]['link'] = "admin/category.php";
-$adminmenu[$i]['icon'] = '/category.png';
+$adminmenu[$i]['icon'] = 'category.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_FIELDS;
$adminmenu[$i]['link'] = "admin/field.php";
-$adminmenu[$i]['icon'] = '/index.png';
+$adminmenu[$i]['icon'] = 'index.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_STEPS;
$adminmenu[$i]['link'] = "admin/step.php";
-$adminmenu[$i]['icon'] = '/stats.png';
+$adminmenu[$i]['icon'] = 'stats.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
-$adminmenu[$i]['icon'] = '/permissions.png';
+$adminmenu[$i]['icon'] = 'permissions.png';
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = 'about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php 2012-05-19 08:20:10 UTC (rev 9545)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php 2012-05-19 08:35:26 UTC (rev 9546)
@@ -25,22 +25,22 @@
array(
'title' => _MI_PROTECTOR_ADMINHOME,
'link' => 'admin/index.php',
- 'icon' => '/home.png',
+ 'icon' => 'home.png',
), array(
'title' => _MI_PROTECTOR_ADMININDEX,
'link' => 'admin/center.php',
- 'icon' => '/firewall.png',
+ 'icon' => 'firewall.png',
), array(
'title' => _MI_PROTECTOR_ADVISORY,
'link' => 'admin/advisory.php',
- 'icon' => '/security.png',
+ 'icon' => 'security.png',
), array(
'title' => _MI_PROTECTOR_PREFIXMANAGER,
'link' => 'admin/prefix_manager.php',
- 'icon' => '/manage.png',
+ 'icon' => 'manage.png',
), array(
'title' => _MI_PROTECTOR_ADMINABOUT,
'link' => 'admin/about.php',
- 'icon' => '/about.png',
+ 'icon' => 'about.png',
),
);
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-05-19 08:20:16
|
Revision: 9545
http://xoops.svn.sourceforge.net/xoops/?rev=9545&view=rev
Author: txmodxoops
Date: 2012-05-19 08:20:10 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Added blank module slogo
Added Paths:
-----------
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/images/uploads/modules/naked.png
Added: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/images/uploads/modules/naked.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/images/uploads/modules/naked.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-05-19 08:14:20
|
Revision: 9544
http://xoops.svn.sourceforge.net/xoops/?rev=9544&view=rev
Author: txmodxoops
Date: 2012-05-19 08:14:11 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Updated
Pleace! reinstall or create a new index in database for modules and tables
Modified Paths:
--------------
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/building.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_entete.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_header.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_configs.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_js_jquery.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_modinfo_language.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/images/uploads/modules/default_slogo.png
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/italian/admin.php
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/update language 1.37 to 1.38.txt
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/docs/license.txt
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_footer.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -18,9 +18,12 @@
* Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
* ****************************************************************************
*/
-global $pathImageAdmin;
-
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . $pathImageAdmin.'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'></a></div>";
-echo "<div class='center small italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
-
+echo "<div class='center'><a href='http://www.xoops.org' target='_blank'>
+ <img src='".$GLOBALS['pathImageAdmin']."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>
+ </div>";
+echo "<div class='center pad5'>
+ <span class='bold'>".$GLOBALS['xoopsModule']->getVar('name')."</span>
+ <span class='small italic'> "._AM_TDMCREATE_MAINTAINEDBY."
+ <a href='http://www.xoops.org' title='Visit Xoops Community' class='tooltip' rel='external'>Xoops Community</a></span>
+ </div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/admin_header.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -18,36 +18,25 @@
* ****************************************************************************
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include_once("../include/functions.php");
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once '../include/functions.php';
include_once 'includes.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
-}else{
- echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
- //return false;
-}
+$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
//load class
$modulesHandler =& xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
$tablesHandler =& xoops_getModuleHandler('tdmcreate_tables', 'TDMCreate');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageIcon = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32');
+$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
$myts =& MyTextSanitizer::getInstance();
-
-if ($xoopsUser) {
- $moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- exit();
+// Locad admin menu class
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+}else{
+ redirect_header("../../../admin.php", 5, _AM_TDMCREATE_MODULEADMIN_MISSING, false);
}
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
@@ -57,9 +46,9 @@
$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
//Load languages
-xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('admin', $thisDirname);
+xoops_loadLanguage('modinfo', $thisDirname);
+xoops_loadLanguage('main', $thisDirname);
// Define Stylesheet
$sysjquistyle = XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css';
// Define scripts
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/building.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/building.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -189,7 +189,7 @@
//Creation of admin file about.php
const_admin_about($mods, $mods_name);
//Creation of admin file index.php
- const_admin_index($mods, $mods_name, $tbls_arr, $tbls_online, $tbls_pending);
+ const_admin_index($mods, $mods_name, $tbls_arr);
}
/************************************************/
/*User*/
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/modules.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -40,8 +40,8 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/modules/";
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
$name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
@@ -54,39 +54,49 @@
$obj->setVar('modules_image', $uploader->getSavedFileName());
}
} else {
- $obj->setVar('modules_image', $_REQUEST['modules_image']);
+ $obj->setVar('modules_image', $_POST['modules_image']);
}
- $obj->setVar('modules_name', $_REQUEST['modules_name']);
- $obj->setVar('modules_version', $_REQUEST['modules_version']);
- $obj->setVar('modules_description', $_REQUEST['modules_description']);
- $obj->setVar('modules_author', $_REQUEST['modules_author']);
- $obj->setVar('modules_author_mail', $_REQUEST['modules_author_mail']);
- $obj->setVar('modules_author_website_url', $_REQUEST['modules_author_website_url']);
- $obj->setVar('modules_author_website_name', $_REQUEST['modules_author_website_name']);
- $obj->setVar('modules_credits', $_REQUEST['modules_credits']);
+ $obj->setVar('modules_name', $_POST['modules_name']);
+ $obj->setVar('modules_version', $_POST['modules_version']);
+ $obj->setVar('modules_description', $_POST['modules_description']);
+ $obj->setVar('modules_author', $_POST['modules_author']);
+ $obj->setVar('modules_author_mail', $_POST['modules_author_mail']);
+ $obj->setVar('modules_author_website_url', $_POST['modules_author_website_url']);
+ $obj->setVar('modules_author_website_name', $_POST['modules_author_website_name']);
+ $obj->setVar('modules_credits', $_POST['modules_credits']);
$obj->setVar('modules_license', $_REQUEST['modules_license']);
- $obj->setVar('modules_release_info', $_REQUEST['modules_release_info']);
- $obj->setVar('modules_release_file', $_REQUEST['modules_release_file']);
+ $obj->setVar('modules_release_info', $_POST['modules_release_info']);
+ $obj->setVar('modules_release_file', $_POST['modules_release_file']);
$obj->setVar('modules_manual', $_REQUEST['modules_manual']);
- $obj->setVar('modules_manual_file', $_REQUEST['modules_manual_file']);
- $obj->setVar('modules_demo_site_url', $_REQUEST['modules_demo_site_url']);
- $obj->setVar('modules_demo_site_name', $_REQUEST['modules_demo_site_name']);
- $obj->setVar('modules_forum_site_url', $_REQUEST['modules_forum_site_url']);
- $obj->setVar('modules_forum_site_name', $_REQUEST['modules_forum_site_name']);
- $obj->setVar('modules_module_website_url', $_REQUEST['modules_module_website_url']);
- $obj->setVar('modules_module_website_name', $_REQUEST['modules_module_website_name']);
- $obj->setVar('modules_release', $_REQUEST['modules_release']);
- $obj->setVar('modules_module_status', $_REQUEST['modules_module_status']);
- $obj->setVar('modules_display_admin', $_REQUEST['modules_display_admin']);
- $obj->setVar('modules_display_user', $_REQUEST['modules_display_user']);
- $obj->setVar('modules_active_search', $_REQUEST['modules_active_search']);
- $obj->setVar('modules_active_comments', $_REQUEST['modules_active_comments']);
+ $obj->setVar('modules_manual_file', $_POST['modules_manual_file']);
+ $obj->setVar('modules_demo_site_url', $_POST['modules_demo_site_url']);
+ $obj->setVar('modules_demo_site_name', $_POST['modules_demo_site_name']);
+ $obj->setVar('modules_forum_site_url', $_POST['modules_forum_site_url']);
+ $obj->setVar('modules_forum_site_name', $_POST['modules_forum_site_name']);
+ $obj->setVar('modules_module_website_url', $_POST['modules_module_website_url']);
+ $obj->setVar('modules_module_website_name', $_POST['modules_module_website_name']);
+ $obj->setVar('modules_release', $_POST['modules_release']);
+ $obj->setVar('modules_module_status', $_POST['modules_module_status']);
+ $verif_display_admin = ($_REQUEST['modules_display_admin'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_admin', $verif_display_admin);
+ $verif_display_user = ($_REQUEST['modules_display_user'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_user', $verif_display_user);
+ $verif_display_submenu = ($_REQUEST['modules_display_submenu'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_submenu', $verif_display_submenu);
+ $verif_active_search = ($_REQUEST['modules_active_search'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_search', $verif_active_search);
+ $verif_active_coms = ($_REQUEST['modules_active_coms'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_coms', $verif_active_coms);
+ $verif_active_notify = ($_REQUEST['modules_active_notify'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_notify', $verif_active_notify);
if ($modulesHandler->insert($obj)) {
- redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ } else {
+ redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_NOTINSERTED);
}
- break;
+ break;
case "modules_create":
echo $modulesAdmin->addNavigation('modules.php');
@@ -101,21 +111,21 @@
$form = $obj->getForm();
break;
case "modules_delete":
- $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
- {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if ($modulesHandler->delete($obj)) {
- $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE modules_id = ".$_REQUEST['modules_id']);
- redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array('ok' => 1, 'modules_id' => $_REQUEST['modules_id'], 'op' => 'modules_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('modules_name')));
- }
+ {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($modulesHandler->delete($obj)) {
+ $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE modules_id = ".$_REQUEST['modules_id']);
+ redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'modules_id' => $_REQUEST['modules_id'], 'op' => 'modules_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('modules_name')));
+ }
break;
case "modules_list":
default:
@@ -142,7 +152,7 @@
$start = 0;
}
$modules_arr = $modulesHandler->getall($criteria);
- if ( $numrows > $limit ) {
+ if ( $numrows_modules > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
$pagenav = $pagenav->renderNav(4);
@@ -180,7 +190,7 @@
echo '<td> </td>';
echo '<td> </td>';
echo '<td>';
- echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src="'. $pathImageIcon .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src="'. $pathImageIcon .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
echo '</td>';
echo '</tr>';
}
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/admin/tables.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -155,7 +155,7 @@
if ($tablesHandler->insert($obj))
{
- redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
}
break;
@@ -225,7 +225,7 @@
$obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
if ($tablesHandler->insert($obj)) {
- redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK);
}
break;
@@ -268,8 +268,8 @@
//Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
$uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/modules/";
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
$name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
@@ -282,34 +282,42 @@
$obj->setVar('modules_image', $uploader->getSavedFileName());
}
} else {
- $obj->setVar('modules_image', $_REQUEST['modules_image']);
+ $obj->setVar('modules_image', $_POST['modules_image']);
}
- $obj->setVar('modules_name', $_REQUEST['modules_name']);
- $obj->setVar('modules_version', $_REQUEST['modules_version']);
- $obj->setVar('modules_description', $_REQUEST['modules_description']);
- $obj->setVar('modules_author', $_REQUEST['modules_author']);
- $obj->setVar('modules_author_email', $_REQUEST['modules_author_email']);
- $obj->setVar('modules_author_website_url', $_REQUEST['modules_author_website_url']);
- $obj->setVar('modules_author_website_name', $_REQUEST['modules_author_website_name']);
- $obj->setVar('modules_credits', $_REQUEST['modules_credits']);
+ $obj->setVar('modules_name', $_POST['modules_name']);
+ $obj->setVar('modules_version', $_POST['modules_version']);
+ $obj->setVar('modules_description', $_POST['modules_description']);
+ $obj->setVar('modules_author', $_POST['modules_author']);
+ $obj->setVar('modules_author_email', $_POST['modules_author_email']);
+ $obj->setVar('modules_author_website_url', $_POST['modules_author_website_url']);
+ $obj->setVar('modules_author_website_name', $_POST['modules_author_website_name']);
+ $obj->setVar('modules_credits', $_POST['modules_credits']);
$obj->setVar('modules_license', $_REQUEST['modules_license']);
- $obj->setVar('modules_release_info', $_REQUEST['modules_release_info']);
- $obj->setVar('modules_release_file', $_REQUEST['modules_release_file']);
+ $obj->setVar('modules_release_info', $_POST['modules_release_info']);
+ $obj->setVar('modules_release_file', $_POST['modules_release_file']);
$obj->setVar('modules_manual', $_REQUEST['modules_manual']);
- $obj->setVar('modules_manual_file', $_REQUEST['modules_manual_file']);
- $obj->setVar('modules_demo_site_url', $_REQUEST['modules_demo_site_url']);
- $obj->setVar('modules_demo_site_name', $_REQUEST['modules_demo_site_name']);
- $obj->setVar('modules_forum_site_url', $_REQUEST['modules_forum_site_url']);
- $obj->setVar('modules_forum_site_name', $_REQUEST['modules_forum_site_name']);
- $obj->setVar('modules_module_website_url', $_REQUEST['modules_module_website_url']);
- $obj->setVar('modules_module_website_name', $_REQUEST['modules_module_website_name']);
- $obj->setVar('modules_release', $_REQUEST['modules_release']);
- $obj->setVar('modules_module_status', $_REQUEST['modules_module_status']);
- $obj->setVar('modules_display_menu', $_REQUEST['modules_display_menu']);
- $obj->setVar('modules_display_admin', $_REQUEST['modules_display_admin']);
- $obj->setVar('modules_display_user', $_REQUEST['modules_display_user']);
- $obj->setVar('modules_active_search', $_REQUEST['modules_active_search']);
+ $obj->setVar('modules_manual_file', $_POST['modules_manual_file']);
+ $obj->setVar('modules_demo_site_url', $_POST['modules_demo_site_url']);
+ $obj->setVar('modules_demo_site_name', $_POST['modules_demo_site_name']);
+ $obj->setVar('modules_forum_site_url', $_POST['modules_forum_site_url']);
+ $obj->setVar('modules_forum_site_name', $_POST['modules_forum_site_name']);
+ $obj->setVar('modules_module_website_url', $_POST['modules_module_website_url']);
+ $obj->setVar('modules_module_website_name', $_POST['modules_module_website_name']);
+ $obj->setVar('modules_release', $_POST['modules_release']);
+ $obj->setVar('modules_module_status', $_POST['modules_module_status']);
+ $verif_display_admin = ($_REQUEST['modules_display_admin'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_admin', $verif_display_admin);
+ $verif_display_user = ($_REQUEST['modules_display_user'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_user', $verif_display_user);
+ $verif_display_submenu = ($_REQUEST['modules_display_submenu'] == 1) ? "1" : "0";
+ $obj->setVar('modules_display_submenu', $verif_display_submenu);
+ $verif_active_search = ($_REQUEST['modules_active_search'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_search', $verif_active_search);
+ $verif_active_coms = ($_REQUEST['modules_active_coms'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_coms', $verif_active_coms);
+ $verif_active_notify = ($_REQUEST['modules_active_notify'] == 1) ? "1" : "0";
+ $obj->setVar('modules_active_notify', $verif_active_notify);
if ($modulesHandler->insert($obj)) {
redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
@@ -374,10 +382,10 @@
if(!is_dir($pathImageAdmin) && isset($pathImageAdmin)){
$uploaddir = $pathImageAdmin;
}else{
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/modules/".$modules_name."/images/32/";
- }
- $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
$name_img = $_REQUEST['tables_name'].'.'.$extension;
@@ -438,10 +446,10 @@
$numrowsmod = count( $mod_arr );
// Redirect if there aren't modules
if ( $numrowsmod == 0 ) {
- redirect_header('modules.php?op=modules_create', 2, _AM_TDMCREATE_REDIRECT_NOMODULES );
+ redirect_header('modules.php?op=modules_create', 2, _AM_TDMCREATE_NOTMODULES );
}
- //Retirer les tables inutiles
+ //Remove unnecessary tables
$sql = "SELECT tables_id FROM ".$xoopsDB->prefix("tdmcreate_tables")." WHERE tables_modules = 0";
$result = $xoopsDB->queryF($sql);
while ( $myrow = $xoopsDB->fetchArray($result) )
@@ -469,7 +477,7 @@
$start = 0;
}
$modules_arr = $modulesHandler->getall($criteria);
- if ( $numrows > $limit ) {
+ if ( $numrows_modules > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
$pagenav = $pagenav->renderNav(4);
@@ -547,8 +555,7 @@
echo '<td>'.$nb_champs.'</td>';
echo '<td>';
echo '<a href="tables.php?op=edit_tables&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tables_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
- echo '</td>';
- echo '</tr>';
+ echo '</td></tr>';
}
}
}
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_modules.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_modules.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -2,10 +2,8 @@
/**
* ****************************************************************************
* - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
- * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ * - Licence GPL Copyright (c) (http://www.xoops.org)
*
- * Cette licence, contient des limitations!!!
- *
* 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.
@@ -16,17 +14,13 @@
* @license TDM GPL license
* @author TDM TEAM DEV MODULE
*
+ * Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
* ****************************************************************************
*/
-
if (!defined("XOOPS_ROOT_PATH")) {
die("XOOPS root path not defined");
}
-if (!class_exists('XoopsPersistableObjectHandler')) {
- include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/class/object.php';
-}
-
class tdmcreate_modules extends XoopsObject
{
@@ -34,35 +28,35 @@
function __construct()
{
$this->XoopsObject();
- $this->initVar("modules_id",XOBJ_DTYPE_INT,null,false,5);
- $this->initVar("modules_name",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("modules_version",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("modules_description",XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("modules_author",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_author_mail",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("modules_author_website_url",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_credits",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_license",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_release_info",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_release_file",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_manual",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_manual_file",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("modules_id",XOBJ_DTYPE_INT, 0,false,5);
+ $this->initVar("modules_name",XOBJ_DTYPE_TXTBOX, 'Module Name',false);
+ $this->initVar("modules_version",XOBJ_DTYPE_TXTBOX, '1.00',false);
+ $this->initVar("modules_description",XOBJ_DTYPE_TXTAREA, 'Description of the module', false);
+ $this->initVar("modules_author",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops (Timgno)', false);
+ $this->initVar("modules_author_mail",XOBJ_DTYPE_TXTBOX, 'su...@tx...',false);
+ $this->initVar("modules_author_website_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org',false);
+ $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops (Timgno)', false);
+ $this->initVar("modules_credits",XOBJ_DTYPE_TXTBOX, 'Timgno', false);
+ $this->initVar("modules_license",XOBJ_DTYPE_TXTBOX, 'GNU GPL see License', false);
+ $this->initVar("modules_release_info",XOBJ_DTYPE_TXTBOX, 'Beta 1 15/04/2012', false);
+ $this->initVar("modules_release_file",XOBJ_DTYPE_TXTBOX, 'changelog.txt', false);
+ $this->initVar("modules_manual",XOBJ_DTYPE_TXTBOX, 'Manual', false);
+ $this->initVar("modules_manual_file",XOBJ_DTYPE_TXTBOX, 'install.txt', false);
$this->initVar("modules_image",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_demo_site_url",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_demo_site_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_forum_site_url",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_forum_site_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_module_website_url",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_module_website_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_release",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("modules_module_status",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("modules_demo_site_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/modules/', false);
+ $this->initVar("modules_demo_site_name",XOBJ_DTYPE_TXTBOX, 'Module TXMod Xoops', false);
+ $this->initVar("modules_forum_site_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/modules/newbb', false);
+ $this->initVar("modules_forum_site_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops Community', false);
+ $this->initVar("modules_module_website_url",XOBJ_DTYPE_TXTBOX, 'http://www.txmodxoops.org/', false);
+ $this->initVar("modules_module_website_name",XOBJ_DTYPE_TXTBOX, 'TXMod Xoops', false);
+ $this->initVar("modules_release",XOBJ_DTYPE_TXTBOX, '15/04/2012', false);
+ $this->initVar("modules_module_status",XOBJ_DTYPE_TXTBOX, 'Beta 1', false);
$this->initVar("modules_display_admin",XOBJ_DTYPE_INT, null, false, 1);
$this->initVar("modules_display_user",XOBJ_DTYPE_INT, null, false, 1);
$this->initVar("modules_display_submenu",XOBJ_DTYPE_INT, null, false, 1);
$this->initVar("modules_active_search",XOBJ_DTYPE_INT, null, false, 1);
$this->initVar("modules_active_coms",XOBJ_DTYPE_INT, null, false, 1);
- $this->initVar("modules_active_notify",XOBJ_DTYPE_INT, null, false, 1);
+ $this->initVar("modules_active_notify",XOBJ_DTYPE_INT, null, false, 1);
}
function tdmcreate_modules()
@@ -90,7 +84,7 @@
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 50, 255, $this->getVar('modules_version')), true);
// Name description
$editor_configs=array();
- $editor_configs["name"] ="modules_description";
+ $editor_configs["name"] = "modules_description";
$editor_configs["value"] = $this->getVar('modules_description', 'e');
$editor_configs["rows"] = 5;
$editor_configs["cols"] = 100;
@@ -104,33 +98,33 @@
// Options
$options_tray = new XoopsFormElementTray(_OPTIONS,'<br />');
// Display Admin
- $modules_display_admin = $this->isNew() ? 0 : $this->getVar('modules_display_admin');
- $check_display_admin = new XoopsFormCheckBox('', 'modules_display_admin', $modules_display_admin);
+ $mdisplay_admin = $this->isNew() ? 0 : $this->getVar('modules_display_admin');
+ $check_display_admin = new XoopsFormCheckBox('', 'modules_display_admin', $mdisplay_admin);
$check_display_admin->addOption( 1, _AM_TDMCREATE_MODULES_DISPLAY_ADMIN );
$options_tray->addElement($check_display_admin);
// Display Admin
- $modules_display_user = $this->isNew() ? 0 : $this->getVar('modules_display_user');
- $check_display_user = new XoopsFormCheckBox('', 'modules_display_user', $modules_display_user);
+ $mdisplay_user = $this->isNew() ? 0 : $this->getVar('modules_display_user');
+ $check_display_user = new XoopsFormCheckBox('', 'modules_display_user', $mdisplay_user);
$check_display_user->addOption( 1, _AM_TDMCREATE_MODULES_DISPLAY_USER );
$options_tray->addElement($check_display_user);
// Display Submenu
- $modules_display_submenu = $this->isNew() ? 0 : $this->getVar('modules_display_submenu');
- $check_display_submenu = new XoopsFormCheckBox('', 'modules_display_submenu', $modules_display_submenu);
+ $mdisplay_submenu = $this->isNew() ? 0 : $this->getVar('modules_display_submenu');
+ $check_display_submenu = new XoopsFormCheckBox('', 'modules_display_submenu', $mdisplay_submenu);
$check_display_submenu->addOption( 1, _AM_TDMCREATE_MODULES_DISPLAY_SUBMENU );
$options_tray->addElement($check_display_submenu);
// Active Search
- $modules_active_search = $this->isNew() ? 0 : $this->getVar('modules_active_search');
- $check_display_search = new XoopsFormCheckBox('', 'modules_active_search', $modules_active_search);
+ $mactive_search = $this->isNew() ? 0 : $this->getVar('modules_active_search');
+ $check_display_search = new XoopsFormCheckBox('', 'modules_active_search', $mactive_search);
$check_display_search->addOption( 1, _AM_TDMCREATE_MODULES_ACTIVE_SEARCH );
$options_tray->addElement($check_display_search);
// Active Comments
- $modules_active_comments = $this->isNew() ? 0 : $this->getVar('modules_active_coms');
- $check_active_comments = new XoopsFormCheckBox('', 'modules_active_coms', $modules_active_comments);
+ $mactive_comments = $this->isNew() ? 0 : $this->getVar('modules_active_coms');
+ $check_active_comments = new XoopsFormCheckBox('', 'modules_active_coms', $mactive_comments);
$check_active_comments->addOption( 1, _AM_TDMCREATE_MODULES_ACTIVE_COMMENTS );
$options_tray->addElement($check_active_comments);
// Active Notify
- $modules_active_notify = $this->isNew() ? 0 : $this->getVar('modules_active_notify');
- $check_active_notify = new XoopsFormCheckBox('', 'modules_active_notify', $modules_active_notify);
+ $mactive_notify = $this->isNew() ? 0 : $this->getVar('modules_active_notify');
+ $check_active_notify = new XoopsFormCheckBox('', 'modules_active_notify', $mactive_notify);
$check_active_notify->addOption( 1, _AM_TDMCREATE_MODULES_ACTIVE_NOTIFY );
$options_tray->addElement($check_active_notify);
$form->addElement($options_tray);
@@ -174,7 +168,7 @@
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_STATUS, 'modules_module_status', 50, 255, $this->getVar('modules_module_status')), false);
$form->addElement(new XoopsFormHidden('op', 'modules_save'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
$form->display();
return $form;
}
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_tables.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_tables.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/class/tdmcreate_tables.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -2,10 +2,8 @@
/**
* ****************************************************************************
* - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
- * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ * - Licence GPL Copyright (c) (http://www.xoops.org)
*
- * Cette licence, contient des limitations!!!
- *
* 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.
@@ -16,20 +14,15 @@
* @license TDM GPL license
* @author TDM TEAM DEV MODULE
*
+ * Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
* ****************************************************************************
*/
-
if (!defined("XOOPS_ROOT_PATH")) {
die("XOOPS root path not defined");
}
-if (!class_exists('XoopsPersistableObjectHandler')) {
- include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/class/object.php';
-}
-
class tdmcreate_tables extends XoopsObject
{
-
//Constructor
function __construct()
{
@@ -751,7 +744,7 @@
$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . $uploadirectory . "/" . $tables_img . "' name='image3' id='image3' alt='' />" ) );
$fileseltray= new XoopsFormElementTray('','<br />');
- $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'attachedfile', 104857600),false);
+ $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD , 'attachedfile', $GLOBALS['xoopsModuleConfig']['maxsize']),false);
$fileseltray->addElement(new XoopsFormLabel(''), false);
$imgtray->addElement($fileseltray);
$form->addElement($imgtray);
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_admin_header.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -19,87 +19,60 @@
*/
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/const/const_entete.php';
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/functions_const.php';
-
function const_admin_header($modules, $modules_name, $tables_arr)
{
- $language = '_AM_'.strtoupper($modules_name).'_';
- $myts =& MyTextSanitizer::getInstance();
+ $language = '_AM_'.strtoupper($modules_name).'_';
$file = "admin_header.php";
$path_file = TDM_CREATE_MURL."/".$modules_name."/admin/".$file;
$en_tete = const_entete($modules, 0);
-
- $text = '<?php'.$en_tete.'
+
+ $text = '<?php'.$en_tete.'
include_once dirname(dirname(dirname(dirname(__FILE__)))) . \'/mainfile.php\';
-include_once XOOPS_ROOT_PATH . \'/include/cp_functions.php\';
+include_once XOOPS_ROOT_PATH . \'/include/cp_header.php\';
include_once \'../include/config.php\';
include_once \'../include/functions.php\';
-$pathDir = $GLOBALS[\'xoops\']->path(\'/Frameworks/moduleclasses/moduleadmin\');
-$globlang = $GLOBALS[\'xoopsConfig\'][\'language\'];
+$thisDirname = $GLOBALS[\'xoopsModule\']->getVar(\'dirname\');
-if ( file_exists($pathDir.\'/language/\'.$globlang.\'/main.php\')){
- include_once $pathDir.\'/language/\'.$globlang.\'/main.php\';
-} else {
- include_once $pathDir.\'/language/english/main.php\';
-}
-
-if ( file_exists($pathDir.\'/moduleadmin.php\')){
- include_once $pathDir.\'/moduleadmin.php\';
- //return true;
+$pathImageIcon = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons16\');
+$pathImageAdmin = XOOPS_URL .\'/\'. $GLOBALS[\'xoopsModule\']->getInfo(\'icons32\');
+$pathModuleAdmin = $GLOBALS[\'xoopsModule\']->getInfo(\'dirmoduleadmin\');
+
+$myts =& MyTextSanitizer::getInstance();
+// Locad admin menu class
+if ( file_exists($GLOBALS[\'xoops\']->path($pathModuleAdmin.\'/moduleadmin.php\'))){
+ include_once $GLOBALS[\'xoops\']->path($pathModuleAdmin.\'/moduleadmin.php\');
}else{
- xoops_cp_header();
- echo xoops_error('.$language.'NOFRAMEWORKS);
- xoops_cp_footer();
- //return false;
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
-
-$dirname = basename(dirname(dirname( __FILE__ ) ));
-$module_handler =& xoops_gethandler(\'module\');
-$xoopsModule = & $module_handler->getByDirname($dirname);
-$moduleInfo =& $module_handler->get($xoopsModule->getVar(\'mid\'));
-$pathImageIcon = XOOPS_URL .\'/\'. $moduleInfo->getInfo(\'icons16\');
-$pathImageAdmin = XOOPS_URL .\'/\'. $moduleInfo->getInfo(\'icons32\');
-
+//load class
';
foreach (array_keys($tables_arr) as $i)
{
- $t_name = $tables_arr[$i]->getVar("tables_name");
-$text .= '$'.$t_name.'Handler=& xoops_getModuleHandler(\''.$modules_name.'_'.$t_name.'\', $dirname);
+ $t_name = $tables_arr[$i]->getVar('tables_name');
+$text .= '$'.$t_name.'Handler=& xoops_getModuleHandler(\''.$modules_name.'\'_\''.$t_name.', $thisDirname);
';
}
-$text .=<<<'EOD'
+$text .= '
$myts =& MyTextSanitizer::getInstance();
-if ($xoopsUser) {
- $moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- exit();
-}
-
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH."/class/template.php");
$xoopsTpl = new XoopsTpl();
}
-$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
-$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
+$xoopsTpl->assign(\'pathImageIcon\', $pathImageIcon);
+$xoopsTpl->assign(\'pathImageAdmin\', $pathImageAdmin);
//xoops_cp_header();
//Load languages
-xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
-
-EOD;
+xoops_loadLanguage(\'admin\', $thisDirname);
+xoops_loadLanguage(\'modinfo\', $thisDirname);
+xoops_loadLanguage(\'main\', $thisDirname);
+';
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_ADMINS,
_AM_TDMCREATE_CONST_NOTOK_ADMINS, $file);
}
-
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_entete.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_entete.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_entete.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -49,6 +49,7 @@
* ---------------------------------------------------------------------------
* @copyright '.$modules_author.' ( '.$modules_author_website_url.' )
* @license '.$modules_license.'
+ * @since 2.5.0
* @package '.$modules_name.'
* @author '.$modules_author.' ( '.$modules_author_mail.' )
*
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_header.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_header.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -52,6 +52,7 @@
* ---------------------------------------------------------------------------
* @copyright '.$modules_author.' ( '.$modules_author_website_url.' )
* @license '.$modules_license.'
+ * @since 2.5.0
* @package '.$modules_name.'
* @author '.$modules_author.' ( '.$modules_author_mail.' )
*
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_configs.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_configs.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_configs.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -27,13 +27,17 @@
$en_tete = const_entete($modules, 0);
$text = '<?php'.$en_tete.'
if( ! defined( \'XOOPS_ROOT_PATH\' ) ) exit ;
-define("'.strtoupper($modules_name).'_PATH", XOOPS_ROOT_PATH."/modules/'.$modules_name.'");
-define("'.strtoupper($modules_name).'_URL", XOOPS_URL."/modules/'.$modules_name.'");
-
+if (!defined(\''.strtoupper($modules_name).'_MODULE_PATH\')) {
+define("'.strtoupper($modules_name).'_DIRNAME", "'.strtolower($modules_name).'");
+define("'.strtoupper($modules_name).'_PATH", XOOPS_ROOT_PATH."/modules/".'.strtoupper($modules_name).'_DIRNAME);
+define("'.strtoupper($modules_name).'_URL", XOOPS_URL."/modules/".'.strtoupper($modules_name).'_DIRNAME);
+define("'.strtoupper($modules_name).'_ADMIN", '.strtoupper($modules_name).'_URL . "/admin/index.php");
+define("'.strtoupper($modules_name).'_AUTHOR_LOGOIMG", '.strtoupper($modules_name).'_URL . "/images/'.str_replace(" ", "", strtolower($modules_a_w_name)).'_logo.png");
+}
// module information
-$mod_img = '.strtoupper($modules_name).'_URL."/images/'.str_replace(" ", "", strtolower($modules_a_w_name)).'_logo.png";
+$mod_admin = "<a href=\'".'.strtoupper($modules_name).'_ADMIN."\'>".'.$language.'_ADMIN."</a>";
$mod_copyright = "<a href=\''.$modules_a_w_url.'\' title=\''.$modules_a_w_name.'\' target=\'_blank\'>
- <img src=\'".$mod_img."\' alt=\''.$modules_a_w_name.'\' /></a>";
+ <img src=\'".'.strtoupper($modules_name).'_AUTHOR_LOGOIMG."\' alt=\''.$modules_a_w_name.'\' /></a>";
?>';
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_INCLUDES,
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_search.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_search.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_include_search.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -39,6 +39,7 @@
//Parametres
$parametres_total = explode("|", $tables_parametres);
$k = 0;
+ $champs_param_search_field = array();
//Recuperation des parametres affichage dans le formulaire
for($j=0; $j<$nb_champs; $j++)
{
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_js_jquery.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_js_jquery.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_js_jquery.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -27,8 +27,8 @@
$text = $en_tete.'
$(document).ready(function(){
$( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
- $( ".check" ).css("color","#fff").button();
- $( ".radio" ).css("color","#fff").buttonset();
+ $( "input[type=\'checkbox\']" ).css("color","#fff").button();
+ $( "input[type=\'radio\']" ).css("color","#fff").buttonset();
$( ".toolbar" ).css("color","#000").buttonset();
});
';
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_modinfo_language.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_modinfo_language.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_modinfo_language.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -38,8 +38,8 @@
$text = '<?php'.$en_tete.'
// Admin
-define("'.$language.'NAME","'. $modules_name .'");
-define("'.$language.'DESC","'. $modules_desc .'");
+define("'.$language.'NAME","'. UcFirstAndToLower($modules_name) .'");
+define("'.$language.'DESC","'. UcFirstAndToLower($modules_desc) .'");
//Menu
define("'.$language.'ADMENU'.$menu.'","Dashboard");
@@ -47,7 +47,9 @@
foreach (array_keys($tables_arr) as $i)
{
$menu++;
- $text .= 'define("'.$language.'ADMENU'.$menu.'","'.UcFirstAndToLower($tables_arr[$i]->getVar("tables_name")).'");
+ $t_name_desc = UcFirstAndToLower($tables_arr[$i]->getVar("tables_name"));
+ $t_name_desc = str_replace("_", " ", $t_name_desc);
+ $text .= 'define("'.$language.'ADMENU'.$menu.'","'.$t_name_desc.'");
';
}
if ( $topic == 1 ) {
@@ -105,16 +107,17 @@
$text .='
//Config
define("'.$language.'EDITOR","Editor");
+define("'.$language.'EDITOR_DESC","Choose an Editor");
define("'.$language.'KEYWORDS","Keywords");
-define("'.$language.'KEYWORDS_DESC","Insert here the keywords (separate by comma)");
+define("'.$language.'KEYWORDS_DESC","Insert here the keywords for index page (separated by comma)");
define("'.$language.'ADMINPERPAGE", "Admin per page");
define("'.$language.'ADMINPERPAGE_DESC", "Specifies how many items you want to display per page in the list.");
define("'.$language.'ADVERTISE","Code of advertise");
-define("'.$language.'ADVERTISE_DESC","Ensert here the code of advertisement");
-define("'.$language.'SOCIALACTIVE","View Socialnetworks?");
-define("'.$language.'SOCIALACTIVE_DESC","If you want to see the buttons of socialnetworks, click on Yes");
-define("'.$language.'SOCIALCODE","Code of socialnetworks");
-define("'.$language.'SOCIALCODE_DESC","Ensert here the code of socialnetworks");
+define("'.$language.'ADVERTISE_DESC","Insert here the code of advertisement");
+define("'.$language.'BARSOCIALS_ACTIVE","View barsocials");
+define("'.$language.'BARSOCIALS_ACTIVE_DESC","If you want to see the barsocials, click on Yes");
+define("'.$language.'FBCOMMENTS_ACTIVE","View Social Comments?");
+define("'.$language.'FBCOMMENTS_ACTIVE_DESC","If you want to see the Social Comments, click on Yes");
?>';
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_LANGUAGES,
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_templates_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_templates_footer.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_templates_footer.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -19,21 +19,21 @@
*/
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/const/const_entete.php';
include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/include/functions_const.php';
-
function const_templates_footer($modules, $modules_name, $tables_module_table)
{
$language = '_MA_'.strtoupper($modules_name).'_';
- $template_file = ''.$modules_name.'_footer.html';
+ $template_file = $modules_name.'_footer.html';
$template_path_file = TDM_CREATE_MURL."/".$modules_name."/templates/".$template_file;
$en_tete = const_entete($modules, 0);
-
- $text = '<{if $adv != \'\'}>
-<div class="center"><{$adv}></div>
+
+$text = '<{if $barsocials_active != 0}>
+ <{include file="db:system_barsocials.html"}>
<{/if}>
-<{if $social_active != 0}>
-<div class="center"><{$social_code}></div>
+<{if $fbcomments_active != 0}>
+ <{include file="db:system_fbcomments.html"}>
<{/if}>
<div class="left"><{$copyright}></div>
+<br />
';
if($tables_module_table != null){
$text .= '<{if $pagenav != \'\'}>
@@ -41,9 +41,13 @@
<{/if}>
<br />';
}
-$text .= '<{if $xoops_isadmin}>
- <div class="center bold"><a href="<{$'.strtolower($modules_name).'_url}>/admin/"><{$smarty.const.'.$language.'ADMIN}></a></div>
+$text .= '
+<{if $adv != \'\' && !$xoops_isadmin}>
+<div class="center"><{$adv}></div>
<{/if}>
+<{if $xoops_isadmin}>
+ <div class="center bold"><{$admin}></div>
+<{/if}>
';
createFile($template_path_file, $text,
_AM_TDMCREATE_CONST_OK_TEMPLATES,
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_xoopsversion.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/const/const_xoopsversion.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -44,7 +44,7 @@
'.$modv.'[\'license\'] = "'.$modules->getVar("modules_license").'";
'.$modv.'[\'help\'] = \'page=help\';
'.$modv.'[\'license\'] = \'GNU GPL 2.0 see Licence\';
-'.$modv.'[\'license_url\'] = "www.gnu.org/licenses/gpl-2.0.html/";
+'.$modv.'[\'license_url\'] = "www.gnu.org/licenses/gpl.html";
'.$modv.'[\'release_info\'] = "'.$modules->getVar("modules_release_info").'";
'.$modv.'[\'release_file\'] = XOOPS_URL."/modules/{$dirname}/docs/'.$modules->getVar("modules_release_file").'";
@@ -59,7 +59,7 @@
'.$modv.'[\'image\'] = "images/'.$modules->getVar("modules_image").'";
'.$modv.'[\'dirname\'] = "{$dirname}";
-'.$modv.'[\'dirmoduleadmin\'] = "Frameworks/moduleclasses";
+'.$modv.'[\'dirmoduleadmin\'] = "Frameworks/moduleclasses/moduleadmin";
'.$modv.'[\'icons16\'] = "Frameworks/moduleclasses/icons/16";
'.$modv.'[\'icons32\'] = "Frameworks/moduleclasses/icons/32";
//About
@@ -299,6 +299,20 @@
'.$modvc.'[\'formtype\'] = "textbox";
'.$modvc.'[\'valuetype\'] = "text";
'.$modvc.'[\'default\'] = \'15\';
+$i++;
+'.$modvc.'[\'name\'] = "barsocials_active";
+'.$modvc.'[\'title\'] = "'.$language.'_BARSOCIALS_ACTIVE";
+'.$modvc.'[\'description\'] = "'.$language.'_BARSOCIALS_ACTIVE_DESC";
+'.$modvc.'[\'formtype\'] = "yesno";
+'.$modvc.'[\'aluetype\'] = "int";
+'.$modvc.'[\'default\'] = 0;
+$i++;
+'.$modvc.'[\'name\'] = "fbcomments_active";
+'.$modvc.'[\'title\'] = "'.$language.'_FBCOMMENTS_ACTIVE";
+'.$modvc.'[\'description\'] = "'.$language.'_FBCOMMENTS_ACTIVE_DESC";
+'.$modvc.'[\'formtype\'] = "yesno";
+'.$modvc.'[\'aluetype\'] = "int";
+'.$modvc.'[\'default\'] = 0;
$i++;
'.$modvc.'[\'name\'] = "advertise";
'.$modvc.'[\'title\'] = "'.$language.'_ADVERTISE";
@@ -306,22 +320,7 @@
'.$modvc.'[\'formtype\'] = "textarea";
'.$modvc.'[\'valuetype\'] = "text";
'.$modvc.'[\'default\'] = "";
-$i++;
-'.$modvc.'[\'name\'] = "social_active";
-'.$modvc.'[\'title\'] = "'.$language.'_SOCIALACTIVE";
-'.$modvc.'[\'description\'] = "'.$language.'_SOCIALACTIVE_DESC";
-'.$modvc.'[\'formtype\'] = "yesno";
-'.$modvc.'[\'aluetype\'] = "int";
-'.$modvc.'[\'default\'] = 0;
-$i++;
-'.$modvc.'[\'name\'] = "social_code";
-'.$modvc.'[\'title\'] = "'.$language.'_SOCIALCODE";
-'.$modvc.'[\'description\'] = "'.$language.'_SOCIALCODE_DESC";
-'.$modvc.'[\'formtype\'] = "textarea";
-'.$modvc.'[\'valuetype\'] = "text";
-'.$modvc.'[\'default\'] = "";
unset($i);
-
?>';
createFile($path_file, $text,
_AM_TDMCREATE_CONST_OK_ROOTS,
Added: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/docs/license.txt
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/docs/license.txt (rev 0)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/docs/license.txt 2012-05-19 08:14:11 UTC (rev 9544)
@@ -0,0 +1,66 @@
+End User License Agreement for Xoops Modules
+
+IMPORTANT NOTICE Read and understand this License
+Agreement carefully before installing and using this Software.
+It contains extremely important information.
+
+BY USING THIS SOFTWARE IN ANY WAY YOU ACKNOWLEDGE
+THAT YOU HAVE READ, UNDERSTAND AND AGREE TO THE
+TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO
+THESE TERMS, DO NOT USE THIS SOFTWARE IN ANY WAY,
+AND PROMPTLY RETURN IT OR DELETE ANY COPIES OF
+THIS SOFTWARE IN YOUR POSSESSION.
+
+LICENSE GRANT the copyright holder grants you a non-exclusive
+license to use this software, and any associated documentation
+("The Software"), as indicated herein.
+
+You may install and use the Software on two computers for your use
+only.
+
+RESTRICTIONS You MAY NOT: (a) sell or distribute this Software
+package without prior written approval (b) cause or permit reverse
+engineering, disassembly, decompilation or alteration of this
+Software; (c) remove any product identification, copyright notices,
+or other notices or proprietary restrictions from this Software;
+
+TERM: This License is effective until terminated. You may terminate
+it at any time by destroying the Software, together with all copies
+thereof. This License will also terminate if you fail to comply with any
+term or condition of this Agreement. Upon such termination, you
+agree to destroy the Software, together with all copies thereof.
+
+COPYRIGHT/OWNERSHIP This Software and its source
+code are proprietary products of Pablo Software Solutions
+and are protected by copyright, trade secret and other intellectual
+property laws.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+This software was created to be free of defects and is designed to
+function on PC computers only. While this software has been tested
+and proven to run accurately, in the unlikely event of any user or
+computer incompatibility issues, the end user assumes complete
+liability of usage. This software contains no adware, scumware or
+spyware. The maker of this software does not support any
+questionable forms of use where this software could be misused in
+any way.
+
+http://www.txmodxoops.org
+http://www.xoops.org
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/images/uploads/modules/default_slogo.png
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/english/admin.php 2012-05-17 19:02:58 UTC (rev 9543)
+++ XoopsModules/TDMCreate/releases/1.38/modules/TDMCreate/language/english/admin.php 2012-05-19 08:14:11 UTC (rev 9544)
@@ -26,8 +26,8 @@
define("_AM_TDMCREATE_ADMIN_PREFERENCES", "Preferences");
define("_AM_TDMCREATE_ADMIN_UPDATE", "Update");
define("_AM_TDMCREATE_ADMIN_NUMMODULES", "Quantity Units");
-define("_AM_TDMCREATE_THEREARE_NUMMODULES", "There are <span class='red bold'>%s</span> modules stored in the Database");
-define("_AM_TDMCREATE_THEREARE_NUMTABLES", "There are <span class='red bold'>%s</span> tables stored in the Database");
+define("_AM_TDMCREATE_THEREARE_NUMMODULES", "- <span class='red bold'>%s</span> modules stored in the Database");
+define("_AM_TDMCREATE_THEREARE_NUMTABLES", "- <span class='red bold'>%s</span> tables stored in the Database");
define("_AM_TDMCREATE_TABLES_CHAMPS_MORE_ELEMENTS", "Forms: Elements");
define("_AM_TDMCREATE_TABLES_CHAMPS_MORE_DISPLAY_ADMIN", "Page: Show admin");
@@ -93,9 +93,6 @@
define("_AM_TDMCREATE_MODULES_DISPLAY_USER", "User Visible hand");
define("_AM_TDMCREATE_MODULES_ACTIVE_SEARCH", "Enable research");
define("_AM_TDMCREATE_MODULES_ACTIVE_COMMENTS", "Enable comments");
-// v1.38
-define("_AM_TDMCREATE_MODULES_DISPLAY_SUBMENU", "Visible Submenu");
-define("_AM_TDMCREATE_MODULES_ACTIVE_NOTIFY", "Active Notifications");
//Tables.php
//Form1
@@ -136,36 +133,36 @@
define("_AM_TDMCREATE_CONST_TAB...
[truncated message content] |
|
From: <ma...@us...> - 2012-05-17 19:03:04
|
Revision: 9543
http://xoops.svn.sourceforge.net/xoops/?rev=9543&view=rev
Author: mageg
Date: 2012-05-17 19:02:58 +0000 (Thu, 17 May 2012)
Log Message:
-----------
update logo for maintenance plugin
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/images/logo.png
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/images/logo.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ce...@us...> - 2012-05-17 14:18:35
|
Revision: 9542
http://xoops.svn.sourceforge.net/xoops/?rev=9542&view=rev
Author: cesag
Date: 2012-05-17 14:18:24 +0000 (Thu, 17 May 2012)
Log Message:
-----------
french module news corrections
Modified Paths:
--------------
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/help.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/modinfo.php
Modified: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html 2012-05-17 14:02:21 UTC (rev 9541)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html 2012-05-17 14:18:24 UTC (rev 9542)
@@ -9,56 +9,56 @@
<h4 class="odd">Description</h4><br />
<p class="even">
- <b>Possibilit\xE9s du module :</b><br /><br />
- . G\xE9rer les sujets et sous-sujets<br />
- . Cr\xE9er des autorisations strictes (qui peut lire, qui peut publier, qui peut
+ <b>Possibilités du module :</b><br /><br />
+ . Gérer les sujets et sous-sujets<br />
+ . Créer des autorisations strictes (qui peut lire, qui peut publier, qui peut
approuver)<br />
- . Possibilit\xE9 de valider les articles par certains groupes d'utilisateurs<br />
+ . Possibilité de valider les articles par certains groupes d'utilisateurs<br />
. Vous pouvez mettre l'accent sur votre contenu avec quelques blocs<br />
- . Possibilit\xE9 de lire les articles avec le fil RSS<br />
- . Utiliser des articles automatis\xE9s et des articles p\xE9rim\xE9s<br />
- . Recherche int\xE9gr\xE9e<br />
- . Diff\xE9rentes statistiques pour l'administrateur du module<br />
- . Possibilit\xE9 d'ajouter la publicit\xE9 \xE0 vos articles<br />
- . Documentation (en fran\xE7ais pour le moment)<br />
- . Articles \xE0 pages multiples, avec un titre personnalis\xE9 pour chaque page<br />
- . Possibilit\xE9 d'utiliser les m\xE9tadonn\xE9es du Dublin Core<br />
- . Possibilit\xE9 d'utiliser FireFox 2 "micror\xE9sum\xE9"<br />
+ . Possibilité de lire les articles avec le fil RSS<br />
+ . Utiliser des articles automatisés et des articles périmés<br />
+ . Recherche intégrée<br />
+ . Différentes statistiques pour l'administrateur du module<br />
+ . Possibilité d'ajouter la publicité à vos articles<br />
+ . Documentation (en français pour le moment)<br />
+ . Articles à pages multiples, avec un titre personnalisé pour chaque page<br />
+ . Possibilité d'utiliser les métadonnées du Dublin Core<br />
+ . Possibilité d'utiliser FireFox 2 "microrésumé"<br />
. Favoris sociaux de type Web 2 tels que del.icio.us, newsvine.com,
yahoo<br />
- . Liens vers l'article pr\xE9c\xE9dent et suivant (et un tableau r\xE9capitulatif)<br />
- . Utilise un syst\xE8me int\xE9gr\xE9 d'alerte (par exemple lorsqu'un article est
- publi\xE9)<br />
+ . Liens vers l'article précédent et suivant (et un tableau récapitulatif)<br />
+ . Utilise un système intégré d'alerte (par exemple lorsqu'un article est
+ publié)<br />
. Plusieurs blocs<br />
. etc<br /><br />
- Le module vous aidera \xE9galement \xE0 avoir des pages aim\xE9es des moteurs de recherche
- en utilisant des titres de pages significatifs (cr\xE9\xE9s \xE0 partir de votre contenu) et d'avoir
- meta mots cl\xE9s et description meta cr\xE9\xE9es aussi \xE0 partir de votre contenu.
+ Le module vous aidera également à avoir des pages aimées des moteurs de recherche
+ en utilisant des titres de pages significatifs (créés à partir de votre contenu) et d'avoir
+ meta mots clés et description meta créées aussi à partir de votre contenu.
- Le module peut \xE9galement \xEAtre utilis\xE9, comme c'est le cas sur certains sites, pour cr\xE9er un
+ Le module peut également être utilisé, comme c'est le cas sur certains sites, pour créer un
blog<br /><br /></p>
<h4 class="odd">Comment installer le module "News"</h4><br />
<p class="even">
- "News" est install\xE9 comme un module Xoops habituel, ce qui signifie que vous devez copier
+ "News" est installé comme un module Xoops habituel, ce qui signifie que vous devez copier
le
- dossier complet /news dans le r\xE9pertoire /modules de votre site Web. Puis
- Connectez-vous \xE0 votre site en tant qu'administrateur, allez dans syst\xE8me d'Administration > Modules, recherchez
- l'ic\xF4ne de "News" dans la liste des modules d\xE9sinstall\xE9s, puis cliquez sur l'ic\xF4ne
- d'installation. Suivez les instructions \xE0 l'\xE9cran et vous serez pr\xEAt \xE0
+ dossier complet /news dans le répertoire /modules de votre site Web. Puis
+ Connectez-vous à votre site en tant qu'administrateur, allez dans système d'Administration > Modules, recherchez
+ l'icône de "News" dans la liste des modules désinstallés, puis cliquez sur l'icône
+ d'installation. Suivez les instructions à l'écran et vous serez prêt à
commencer.<br /><br />
- Des instructions d\xE9taill\xE9es sur l'installation de modules sont disponibles dans le
- <a href="http://goo.gl/adT2i">Manuel des op\xE9rations de XOOPS</a> <br /><br />
+ Des instructions détaillées sur l'installation de modules sont disponibles dans le
+ <a href="http://goo.gl/adT2i">Manuel des opérations de XOOPS</a> <br /><br />
- V\xE9rifiez que le r\xE9pertoire modules\news\images\topics est accessible en \xE9criture
+ Vérifiez que le répertoire modules\news\images\topics est accessible en écriture
sur le
serveur (chmod=777).<br /><br />
- Apr\xE8s avoir cr\xE9\xE9 votre premier sujet (cat\xE9gorie) et avant de cr\xE9er
+ Après avoir créé votre premier sujet (catégorie) et avant de créer
votre premier
- article, vous devez cliquer sur l'onglet des Permissions pour d\xE9finir les permissions
+ article, vous devez cliquer sur l'onglet des Permissions pour définir les permissions
des groupes.<br /><br /></p>
<h4 class="odd">Tutoriel</h4><br />
Modified: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php 2012-05-17 14:02:21 UTC (rev 9541)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php 2012-05-17 14:18:24 UTC (rev 9542)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+// $Id: modinfo.php 1687 2012-05-17 13:20:50Z cesag $
// Module Info
// The name of this module
@@ -118,7 +118,7 @@
define('_MI_NEWS_META_DATA', "Permettre la saisie des données meta (keywords et description) ?");
define('_MI_NEWS_META_DATA_DESC', "Si vous positionnez cette option sur 'Oui', alors les approbateurs pourront entrer les données meta suivantes : keywords et description");
define('_MI_NEWS_BNAME8','Articles Aléatoires');
-define('_MI_NEWS_NEWSLETTER','Bulletin d'information');
+define('_MI_NEWS_NEWSLETTER',"Bulletin d'information");
define('_MI_NEWS_STATS','Statistiques');
define("_MI_NEWS_FORM_OPTIONS","Option de formulaire");
define("_MI_NEWS_FORM_COMPACT","Compact");
Modified: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/help.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/help.html 2012-05-17 14:02:21 UTC (rev 9541)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/help.html 2012-05-17 14:18:24 UTC (rev 9542)
@@ -9,60 +9,60 @@
<h4 class="odd">Description</h4><br />
<p class="even">
- <b>Possibilit\xE9s du module :</b><br /><br />
- . G\xE9rer les sujets et sous-sujets<br />
- . Cr\xE9er des autorisations strictes (qui peut lire, qui peut publier, qui peut
+ <b>Possibilités du module :</b><br /><br />
+ . Gérer les sujets et sous-sujets<br />
+ . Créer des autorisations strictes (qui peut lire, qui peut publier, qui peut
approuver)<br />
- . Possibilit\xE9 de valider les articles par certains groupes d'utilisateurs<br />
+ . Possibilité de valider les articles par certains groupes d'utilisateurs<br />
. Vous pouvez mettre l'accent sur votre contenu avec quelques blocs<br />
- . Possibilit\xE9 de lire les articles avec le fil RSS<br />
- . Utiliser des articles automatis\xE9s et des articles p\xE9rim\xE9s<br />
- . Recherche int\xE9gr\xE9e<br />
- . Diff\xE9rentes statistiques pour l'administrateur du module<br />
- . Possibilit\xE9 d'ajouter la publicit\xE9 \xE0 vos articles<br />
- . Documentation (en fran\xE7ais pour le moment)<br />
- . Articles \xE0 pages multiples, avec un titre personnalis\xE9 pour chaque page<br />
- . Possibilit\xE9 d'utiliser les m\xE9tadonn\xE9es du Dublin Core<br />
- . Possibilit\xE9 d'utiliser FireFox 2 "micror\xE9sum\xE9"<br />
+ . Possibilité de lire les articles avec le fil RSS<br />
+ . Utiliser des articles automatisés et des articles périmés<br />
+ . Recherche intégrée<br />
+ . Différentes statistiques pour l'administrateur du module<br />
+ . Possibilité d'ajouter la publicité à vos articles<br />
+ . Documentation (en français pour le moment)<br />
+ . Articles à pages multiples, avec un titre personnalisé pour chaque page<br />
+ . Possibilité d'utiliser les métadonnées du Dublin Core<br />
+ . Possibilité d'utiliser FireFox 2 "microrésumé"<br />
. Favoris sociaux de type Web 2 tels que del.icio.us, newsvine.com,
yahoo<br />
- . Liens vers l'article pr\xE9c\xE9dent et suivant (et un tableau r\xE9capitulatif)<br />
- . Utilise un syst\xE8me int\xE9gr\xE9 d'alerte (par exemple lorsqu'un article est
- publi\xE9)<br />
+ . Liens vers l'article précédent et suivant (et un tableau récapitulatif)<br />
+ . Utilise un système intégré d'alerte (par exemple lorsqu'un article est
+ publié)<br />
. Plusieurs blocs<br />
. etc<br /><br />
- Le module vous aidera \xE9galement \xE0 avoir des pages aim\xE9es des moteurs de recherche
- en utilisant des titres de pages significatifs (cr\xE9\xE9s \xE0 partir de votre contenu) et d'avoir
- meta mots cl\xE9s et description meta cr\xE9\xE9es aussi \xE0 partir de votre contenu.
+ Le module vous aidera également à avoir des pages aimées des moteurs de recherche
+ en utilisant des titres de pages significatifs (créés à partir de votre contenu) et d'avoir
+ meta mots clés et description meta créées aussi à partir de votre contenu.
- Le module peut \xE9galement \xEAtre utilis\xE9, comme c'est le cas sur certains sites, pour cr\xE9er un
+ Le module peut également être utilisé, comme c'est le cas sur certains sites, pour créer un
blog<br /><br /></p>
<h4 class="odd">Comment installer le module "News"</h4><br />
<p class="even">
- "News" est install\xE9 comme un module Xoops habituel, ce qui signifie que vous devez copier
+ "News" est installé comme un module Xoops habituel, ce qui signifie que vous devez copier
le
- dossier complet /news dans le r\xE9pertoire /modules de votre site Web. Puis
- Connectez-vous \xE0 votre site en tant qu'administrateur, allez dans syst\xE8me d'Administration > Modules, recherchez
- l'ic\xF4ne de "News" dans la liste des modules d\xE9sinstall\xE9s, puis cliquez sur l'ic\xF4ne
- d'installation. Suivez les instructions \xE0 l'\xE9cran et vous serez pr\xEAt \xE0
+ dossier complet /news dans le répertoire /modules de votre site Web. Puis
+ Connectez-vous à votre site en tant qu'administrateur, allez dans système d'Administration > Modules, recherchez
+ l'icône de "News" dans la liste des modules désinstallés, puis cliquez sur l'icône
+ d'installation. Suivez les instructions à l'écran et vous serez prêt à
commencer.<br /><br />
- Des instructions d\xE9taill\xE9es sur l'installation de modules sont disponibles dans le
- <a href="http://goo.gl/adT2i">Manuel des op\xE9rations de XOOPS</a> <br /><br />
+ Des instructions détaillées sur l'installation de modules sont disponibles dans le
+ <a href="http://goo.gl/adT2i">Manuel des opérations de XOOPS</a> <br /><br />
- V\xE9rifiez que le r\xE9pertoire modules\news\images\topics est accessible en \xE9criture
+ Vérifiez que le répertoire modules\news\images\topics est accessible en écriture
sur le
serveur (chmod=777).<br /><br />
- Apr\xE8s avoir cr\xE9\xE9 votre premier sujet (cat\xE9gorie) et avant de cr\xE9er
+ Après avoir créé votre premier sujet (catégorie) et avant de créer
votre premier
- article, vous devez cliquer sur l'onglet des Permissions pour d\xE9finir les permissions
+ article, vous devez cliquer sur l'onglet des Permissions pour définir les permissions
des groupes.<br /><br /></p>
<h4 class="odd">Tutoriel</h4><br />
<p class="even">
Pas disponible pour le moment.<br /></p>
-<!-- Traduit par Cesag le 16 Mai 2012 -->
+
</div>
\ No newline at end of file
Modified: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/modinfo.php 2012-05-17 14:02:21 UTC (rev 9541)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/modinfo.php 2012-05-17 14:18:24 UTC (rev 9542)
@@ -1,5 +1,5 @@
<?php
-// $Id$
+// $Id: modinfo.php 1687 2012-05-17 13:20:50Z cesag $
// Module Info
// The name of this module
@@ -118,7 +118,7 @@
define('_MI_NEWS_META_DATA', "Permettre la saisie des donn\xE9es meta (keywords et description) ?");
define('_MI_NEWS_META_DATA_DESC', "Si vous positionnez cette option sur 'Oui', alors les approbateurs pourront entrer les donn\xE9es meta suivantes : keywords et description");
define('_MI_NEWS_BNAME8','Articles Al\xE9atoires');
-define('_MI_NEWS_NEWSLETTER','Bulletin d'information');
+define('_MI_NEWS_NEWSLETTER',"Bulletin d'information");
define('_MI_NEWS_STATS','Statistiques');
define("_MI_NEWS_FORM_OPTIONS","Option de formulaire");
define("_MI_NEWS_FORM_COMPACT","Compact");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-17 14:02:30
|
Revision: 9541
http://xoops.svn.sourceforge.net/xoops/?rev=9541&view=rev
Author: djculex
Date: 2012-05-17 14:02:21 +0000 (Thu, 17 May 2012)
Log Message:
-----------
- change: Added height & innerHeight to show gallery
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-05-17 13:24:09 UTC (rev 9540)
+++ XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-05-17 14:02:21 UTC (rev 9541)
@@ -95,6 +95,7 @@
float: right;
position: relative;
margin-top: 30px;
+ max-height: 450px;
}
span.image-caption {
display: block;
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-17 13:24:09 UTC (rev 9540)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-17 14:02:21 UTC (rev 9541)
@@ -155,6 +155,7 @@
xoops_smallworld('div#page').show();
xoops_smallworld.fn.colorbox({
innerWidth:"1000px",
+ innerHeight:"90%",
inline:true,
onCleanup:function() {
xoops_smallworld('div#page').hide();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-17 13:24:21
|
Revision: 9540
http://xoops.svn.sourceforge.net/xoops/?rev=9540&view=rev
Author: djculex
Date: 2012-05-17 13:24:09 +0000 (Thu, 17 May 2012)
Log Message:
-----------
- Change: French translations (Cesag)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/french/main.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/main.php 2012-05-17 12:59:18 UTC (rev 9539)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/main.php 2012-05-17 13:24:09 UTC (rev 9540)
@@ -35,8 +35,8 @@
define("_SMALLWORLD_AVATAR","Image actuelle");
define("_SMALLWORLD_REALNAME","Nom de famille");
define("_SMALLWORLD_GENDER","Sexe");
-define("_SMALLWORLD_INTERESTEDIN","Intéressé par");
-define("_SMALLWORLD_RELATIONSHIPSTATUS","Statut de relation");
+define("_SMALLWORLD_INTERESTEDIN","Intéressé(e) par");
+define("_SMALLWORLD_RELATIONSHIPSTATUS","Statut de la relation");
define("_SMALLWORLD_PARTNER","Partenaire");
define("_SMALLWORLD_LOOKINGFOR", "A la recherche de");
define("_SMALLWORLD_BIRTHPLACE", "Lieu de naissance");
@@ -136,8 +136,8 @@
define("_SMALLWORLD_GSM","Téléphone portable");
define("_SMALLWORLD_ISSINGLE","est célibataire pour le moment");
define("_SMALLWORLD_INRELATIONSHIP","a une relation avec");
-define("_SMALLWORLD_ISMARRIED","est marié à");
-define("_SMALLWORLD_ISENGAGED","est fiancé à");
+define("_SMALLWORLD_ISMARRIED","est marié(e) à");
+define("_SMALLWORLD_ISENGAGED","est fiancé(e) à");
define("_SMALLWORLD_ISCOMPLICATED","a une relation compliquée avec");
define("_SMALLWORLD_OPENRELATIONSHIP","est en concubinage avec");
define("_SMALLWORLD_ADDITIONALINFO","En savoir plus sur");
@@ -153,8 +153,8 @@
define("_SMALLWORLD_MAN","Homme");
define("_SMALLWORLD_BOTH","Les deux");
define("_SMALLWORLD_NONE","Aucun");
-define("_SMALLWORLD_MARRIED","Marié");
-define("_SMALLWORLD_ENGAGED","Fiancé");
+define("_SMALLWORLD_MARRIED","Marié(e)");
+define("_SMALLWORLD_ENGAGED","Fiancé(e)");
define("_SMALLWORLD_SINGLE","Célibataire");
define("_SMALLWORLD_RELATIONSHIP","Dans une relation");
define("_SMALLWORLD_RELATIONSHIP_OPEN","En concubinage");
@@ -282,8 +282,8 @@
/*---------------- Messages (jSon, alerts) -------------------*/
define("_SMALLWORLD_FRIENDSHIPFOLLOW","Suivre");
define("_SMALLWORLD_FRIENDSHIPREQUESTS","Prendre contact avec : ");
-define("_SMALLWORLD_JSON_ADDFRIEND","Votre demande d'ami a été envoyé à ");
-define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Vous avez annulé demande d'ami pour ");
+define("_SMALLWORLD_JSON_ADDFRIEND","Votre demande d'ami a été envoyée à ");
+define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Vous avez annulé votre demande d'ami pour ");
define("_SMALLWORLD_JSON_DELETE_FRIEND_START","Suppression faite ");
define("_SMALLWORLD_JSON_DELETE_FRIEND_END"," de cette personne en tant qu'ami.");
define("_SMALLWORLD_JSON_REQUEST_PENDING","<br><br>Demande d'amitié en attente d'approbation.");
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php 2012-05-17 12:59:18 UTC (rev 9539)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php 2012-05-17 13:24:09 UTC (rev 9540)
@@ -35,8 +35,8 @@
define("_SMALLWORLD_AVATAR","Image actuelle");
define("_SMALLWORLD_REALNAME","Nom de famille");
define("_SMALLWORLD_GENDER","Sexe");
-define("_SMALLWORLD_INTERESTEDIN","Int\xE9ress\xE9 par");
-define("_SMALLWORLD_RELATIONSHIPSTATUS","Statut de relation");
+define("_SMALLWORLD_INTERESTEDIN","Int\xE9ress\xE9(e) par");
+define("_SMALLWORLD_RELATIONSHIPSTATUS","Statut de la relation");
define("_SMALLWORLD_PARTNER","Partenaire");
define("_SMALLWORLD_LOOKINGFOR", "A la recherche de");
define("_SMALLWORLD_BIRTHPLACE", "Lieu de naissance");
@@ -136,8 +136,8 @@
define("_SMALLWORLD_GSM","T\xE9l\xE9phone portable");
define("_SMALLWORLD_ISSINGLE","est c\xE9libataire pour le moment");
define("_SMALLWORLD_INRELATIONSHIP","a une relation avec");
-define("_SMALLWORLD_ISMARRIED","est mari\xE9 \xE0");
-define("_SMALLWORLD_ISENGAGED","est fianc\xE9 \xE0");
+define("_SMALLWORLD_ISMARRIED","est mari\xE9(e) \xE0");
+define("_SMALLWORLD_ISENGAGED","est fianc\xE9(e) \xE0");
define("_SMALLWORLD_ISCOMPLICATED","a une relation compliqu\xE9e avec");
define("_SMALLWORLD_OPENRELATIONSHIP","est en concubinage avec");
define("_SMALLWORLD_ADDITIONALINFO","En savoir plus sur");
@@ -153,8 +153,8 @@
define("_SMALLWORLD_MAN","Homme");
define("_SMALLWORLD_BOTH","Les deux");
define("_SMALLWORLD_NONE","Aucun");
-define("_SMALLWORLD_MARRIED","Mari\xE9");
-define("_SMALLWORLD_ENGAGED","Fianc\xE9");
+define("_SMALLWORLD_MARRIED","Mari\xE9(e)");
+define("_SMALLWORLD_ENGAGED","Fianc\xE9(e)");
define("_SMALLWORLD_SINGLE","C\xE9libataire");
define("_SMALLWORLD_RELATIONSHIP","Dans une relation");
define("_SMALLWORLD_RELATIONSHIP_OPEN","En concubinage");
@@ -282,8 +282,8 @@
/*---------------- Messages (jSon, alerts) -------------------*/
define("_SMALLWORLD_FRIENDSHIPFOLLOW","Suivre");
define("_SMALLWORLD_FRIENDSHIPREQUESTS","Prendre contact avec : ");
-define("_SMALLWORLD_JSON_ADDFRIEND","Votre demande d'ami a \xE9t\xE9 envoy\xE9 \xE0 ");
-define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Vous avez annul\xE9 demande d'ami pour ");
+define("_SMALLWORLD_JSON_ADDFRIEND","Votre demande d'ami a \xE9t\xE9 envoy\xE9e \xE0 ");
+define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Vous avez annul\xE9 votre demande d'ami pour ");
define("_SMALLWORLD_JSON_DELETE_FRIEND_START","Suppression faite ");
define("_SMALLWORLD_JSON_DELETE_FRIEND_END"," de cette personne en tant qu'ami.");
define("_SMALLWORLD_JSON_REQUEST_PENDING","<br><br>Demande d'amiti\xE9 en attente d'approbation.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 12:59:29
|
Revision: 9539
http://xoops.svn.sourceforge.net/xoops/?rev=9539&view=rev
Author: forxoops
Date: 2012-05-17 12:59:18 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Add forms style in main style
Change login template with bootstrap
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/required.png
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-05-17 11:53:10 UTC (rev 9538)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-05-17 12:59:18 UTC (rev 9539)
@@ -4,6 +4,28 @@
*/
@import url(bootstrap.min.css);
+/* Forms style */
+input:required, textarea:required{
+ background:url(../img/required.png) right center no-repeat;
+}
+input:focus:invalid, textarea:focus:invalid{
+ background-image:none;
+}
+
+.dsc_pattern_vertical{display:none;}
+
+input:focus:invalid + span + .dsc_pattern_vertical{
+ display:block;
+ color: #b94a48;
+}
+.dsc_pattern_horizontal{display:none;}
+input:focus:invalid + .dsc_pattern_horizontal{
+ display:inline;
+ color: #b94a48;
+}
+.caption-required{color: #b94a48;}
+
+
.clear {
clear: both;
}
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/required.png (from rev 9532, XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/required.png)
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:53:10 UTC (rev 9538)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 12:59:18 UTC (rev 9539)
@@ -22,7 +22,7 @@
</div>
<{if isset($block.lang_rememberme)}>
<label class="checkbox">
- <input type="checkbox" name="rememberme" value="On" class="formButton"/><{$block.lang_rememberme}>
+ <input type="checkbox" name="rememberme" value="On" class="formButton" checked><{$block.lang_rememberme}>
</label>
<{/if}>
<br/>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2012-05-17 11:53:10 UTC (rev 9538)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2012-05-17 12:59:18 UTC (rev 9539)
@@ -1,27 +1,52 @@
-<fieldset class="pad10">
- <legend class="bold"><{$lang_login}></legend>
- <form action="user.php" method="post">
- <{$lang_username}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" /><br /><br />
- <{$lang_password}> <input type="password" name="pass" size="21" maxlength="32" /><br /><br />
- <{if isset($lang_rememberme)}>
- <input type="checkbox" name="rememberme" value="On" checked /> <{$lang_rememberme}><br /><br />
- <{/if}>
-
- <input type="hidden" name="op" value="login" />
- <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" />
- <input type="submit" value="<{$lang_login}>" />
- </form>
- <br />
- <a name="lost"></a>
- <div><{$lang_notregister}><br /></div>
-</fieldset>
-
-<br />
-
-<fieldset class="pad10">
- <legend class="bold"><{$lang_lostpassword}></legend>
- <div><br /><{$lang_noproblem}></div>
- <form action="lostpass.php" method="post">
- <{$lang_youremail}> <input type="text" name="email" size="26" maxlength="60" /> <input type="hidden" name="op" value="mailpasswd" /><input type="hidden" name="t" value="<{$mailpasswd_token}>" /><input type="submit" value="<{$lang_sendpassword}>" />
- </form>
+<form class="form-horizontal" action="user.php" method="post">
+ <fieldset>
+ <legend class="bold"><{$lang_login}></legend>
+ <div class="control-group">
+ <label for="xo-sys-uname" class="control-label"><{$lang_username}><span class="caption-required">*</span></label>
+ <div class="controls">
+ <input type="text" name="uname" id="xo-sys-uname" class="span2" value="<{$usercookie}>" required="">
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="xo-sys-pass" class="control-label"><{$lang_password}><span class="caption-required">*</span></label>
+ <div class="controls">
+ <input type="password" name="pass" id="xo-sys-pass" class="span2" required="">
+ </div>
+ </div>
+ <{if isset($lang_rememberme)}>
+ <div class="control-group">
+ <div class="controls">
+ <label class="checkbox">
+ <input type="checkbox" name="rememberme" value="On" checked>
+ <{$lang_rememberme}>
+ </label>
+ </div>
+ </div>
+ <{/if}>
+ <input type="hidden" name="op" value="login">
+ <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>">
+ <div class="form-actions">
+ <button class="btn btn-primary" type="submit"><{$lang_login}></button>
+ </div>
+ </fieldset>
+</form>
+<p><{$lang_notregister}></p>
+<fieldset name="lost">
+ <legend class="bold"><{$lang_lostpassword}></legend>
+ <form class="form-horizontal" action="lostpass.php" method="post">
+ <p><{$lang_noproblem}></p>
+ <div class="control-group">
+ <label for="xo-sys-uname" class="control-label"><{$lang_youremail}><span class="caption-required">*</span></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">@</span><input type="text" name="email" id="xo-sys-email" class="span3" value="<{$usercookie}>" required="">
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="op" value="mailpasswd">
+ <input type="hidden" name="t" value="<{$mailpasswd_token}>">
+ <div class="form-actions">
+ <button class="btn btn-primary" type="submit"><{$lang_sendpassword}></button>
+ </div>
+ </form>
</fieldset>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:53:21
|
Revision: 9538
http://xoops.svn.sourceforge.net/xoops/?rev=9538&view=rev
Author: forxoops
Date: 2012-05-17 11:53:10 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Change the default theme to an HTML5 theme with bootstrap
Prepare theme manager part
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/style.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/logo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_c.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_l.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_r.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_left.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_right.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_menu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_vars.html
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/bg-ad-top.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/hbar.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/logo.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/poweredby.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/screenshot.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/style.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleIE8.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleMAC.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleNN.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_c.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_l.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_r.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockleft.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockright.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-banner_bg.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-info.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops-logo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops-logo.psd
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/bg-ad-top.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/index.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/style.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/style.css (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/css/style.css 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,132 @@
+/**
+ * Default style
+ */
+
+/* Hero unit style */
+.xo-hero {
+ background-color: #F0F0F0;
+ background-image: -moz-linear-gradient(center top , #F9F9F9 0%, #F0F0F0 100%);
+ background-repeat: repeat-x;
+ border-bottom: 1px solid #E1E1E1;
+ margin-top: 40px;
+ margin-bottom: 20px;
+}
+.xo-hero-content {
+ padding: 20px;
+}
+.xo-block {
+ margin-bottom: 10px;
+}
+.xo-block .xo-content {
+ text-align: justify;
+}
+/* Blocks left style */
+.xo-block-left .xo-block {
+ padding: 0 0 8px 0;
+ margin-bottom: 10px;
+ background-color: #F5F5F5;
+ border: 1px solid rgba(0, 0, 0, 0.05);
+ border-radius: 4px 4px 4px 4px;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
+}
+.xo-block-left [class*="xo-title"] {
+ background-color: #049CD9;
+ background-image: -moz-linear-gradient(center top , #004D9F 0%, #049CD9 100%);
+ background-repeat: repeat-x;
+ border-radius: 4px 4px 0 0;
+ border-bottom: 1px solid #ccc;
+ color: #F1F1F1;
+ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
+ text-align: center;
+ padding: 5px;
+}
+.xo-block-left [class*="xo-content"] {}
+
+/* Blocks right style */
+.xo-block-right .xo-block {
+ padding: 0 0 8px 0;
+ margin-bottom: 10px;
+ background-color: #F5F5F5;
+ border: 1px solid rgba(0, 0, 0, 0.05);
+ border-radius: 4px 4px 4px 4px;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
+}
+.xo-block-right [class*="xo-title"] {
+ background-color: #2f96b4;
+ background-image: -moz-linear-gradient(center top , #359cba 0%, #2f96b4 100%);
+ background-repeat: repeat-x;
+ border-radius: 4px 4px 0 0;
+ border-bottom: 1px solid #ccc;
+ color: #F1F1F1;
+ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
+ text-align: center;
+ padding: 5px;
+}
+.xo-block-right [class*="xo-content"] {}
+
+/* Blocks center style */
+.xo-block-center [class*="xo-title"] {
+ font-weight: bold;
+}
+.xo-block-login {
+ padding: 4px 10px;
+}
+.xo-block-search {
+ padding: 6px;
+ text-align: center;
+}
+.xo-block-search .btn-group {
+ margin: 0 22px;
+}
+.xo-block-online {
+ padding: 6px;
+}
+.xo-block-theme {
+ padding: 6px;
+ text-align: center;
+}
+.xo-block-topuser {}
+.xo-block-topuser .thumbnail {
+ display: inline;
+ width: 40px;
+ height: 40px;
+ padding: 1px;
+}
+.xo-block-newuser {}
+.xo-block-newuser .thumbnail {
+ display: inline;
+ width: 40px;
+ height: 40px;
+ padding: 1px;
+}
+.xo-block-siteinfo {}
+.xo-block-siteinfo .thumbnail {
+ display: inline;
+ width: 40px;
+ height: 40px;
+ padding: 1px;
+ margin-right: 5px;
+}
+
+footer {
+ background-color: #F5F5F5;
+ border-top: 1px solid #DDDDDD;
+ margin-top: 19px;
+ padding-top: 19px;
+ color: #999;
+}
+
+table .txt-centered {
+ text-align: center;
+}
+
+
+footer a, a:hover {
+ /*color: #fff; */
+ text-decoration: none;
+}
+
+.xo-footer-floor {
+ /*background: none repeat scroll 0 0 #1B1B1B; */
+ padding: 10px;
+}
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/hbar.gif
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/index.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/logo.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/img/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/index.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,39 @@
+<?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.
+*/
+
+/**
+ * Default language
+ *
+ * @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 themes
+ * @since 2.6.0
+ * @author Andricq Nicolas (AKA MusS)
+ * @version $Id$
+ */
+
+define("_THEME_LOGIN", "Login");
+define("_THEME_REGISTER", "Register");
+
+define("_THEME_HOME", "Home");
+
+define("_THEME_WELCOME", "Welcome");
+
+
+define("_THEME_QUICK", "Quick links");
+define("_THEME_ADMIN", "Administration");
+define("_THEME_MYACCOUNT", "View account");
+define("_THEME_EDITPROFILE", "Edit account");
+define("_THEME_NOTIFICATION", "Notifications");
+define("_THEME_PM", "Inbox");
+define("_THEME_LOGOUT", "Logout");
+
+define("_THEME_BACKTOP", "Back to top");
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/index.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/logo.gif
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/poweredby.gif
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/screenshot.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/style.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/style.css 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/style.css 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,251 +0,0 @@
-html, body {color: #000; background-color: #fff; margin: 0; padding: 0; font-size:9pt; font-family: Verdana, Arial, Helvetica, sans-serif;}
-
-table {width: 100%;}
-table td {padding: 0; border-width: 0; vertical-align: top; }
-
-a {color: #666; text-decoration: none; font-weight: bold; background-color: transparent;}
-a:hover {color: #ff6600;}
-
-h1 {font-size:1.4em;}
-h2 {font-size:1.3em;}
-h3 {font-size:1.2em;}
-h4 {font-size:1.1em;}
-h5 {font-size:1em;}
-ul { margin: 2px; padding: 2px; list-style: disc inside; text-align: left;}
-ol { margin: 2px; padding: 2px; list-style: decimal inside; text-align: left;}
-li { margin-left: 2px; color: #2A75C5;}
-
-input.formButton {}
-
-.item {border: 1px solid #666;}
-.itemHead {padding: 3px; background-color: #2A75C5; color: #fff;}
-.itemInfo {text-align: right; padding: 3px; background-color: #efefef}
-.itemTitle a {font-size: 1.2em; font-weight: bold; font-variant: small-caps; color: #fff; background-color: transparent;}
-.itemPoster {font-size: .9em; font-style:italic;}
-.itemPostDate {font-size: .9em; font-style:italic;}
-.itemStats {font-size: .9em; font-style:italic;}
-.itemBody {padding-left: 5px;}
-.itemText {margin-top: 5px; margin-bottom: 5px; line-height: 1.5em;}
-.itemText:first-letter {font-size: 1.3em; font-weight: bold;}
-.itemFoot {text-align: right; padding: 3px; background-color: #efefef;}
-.itemAdminLink {font-size: .9em;}
-.itemPermaLink {font-size: .9em;}
-
-#header {
- margin : 0;
- padding : 0;
- height: 80px;
- background: #2A75C5 url(xo-banner_bg.png) repeat-x left top;
- padding: 2px;
- color: #fff;
- border: 1px solid #000;
-}
-#headerbanner {width: 100%; vertical-align: middle; text-align:center;}
-/* fix for banner */
-#xo-bannerfix {
- /*position: absolute;*/
- position: relative;
- float: right;
- top: 5px;
- right: 25px;
- width: 480px;
- height: 72px;
- background: url(bg-ad-top.png) no-repeat;
- padding: 6px;
- z-index:99;
-}
-#xo-bannerfix object, #xo-bannerfix img {display: block;}
-/* end fix for banner */
-#headerlogo img {padding: 0;}
-#headerbar {border-bottom: 1px solid #ddd; background-image: url(hbar.gif);}
-
-#leftcolumn {width: 170px; border-right: 1px solid #ccc; font-size:1em;}
-#leftcolumn th {background-color: #2A75C5; color: #fff; vertical-align: middle;}
-#leftcolumn .blockTitle {padding: 3px; background-color: #ddd; color: #2A75C5; font-weight: bold;}
-#leftcolumn .blockContent {padding: 3px; line-height: 1.2em;}
-
-
-#centercolumn {font-size: 1em; padding: 0 0 0 1px;}
-#centercolumn th {background-color: #2A75C5; color: #fff; vertical-align: middle;}
-
-#centerCcolumn, #bottomCcolumn {padding: 0 3px 1px 3px;}
-#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0; font-size:1.1em;}
-#centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;}
-
-#centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn {
- width: 50%; padding: 0 3px 0 0;
-}
-#centerLcolumn .blockTitle, #bottomLcolumn .blockTitle, #centerRcolumn .blockTitle, #bottomRcolumn .blockTitle {
- padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0;
-}
-#centerLcolumn .blockContent, #centerRcolumn .blockContent, #bottomLcolumn .blockContent, #bottomRcolumn .blockContent {
- border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-left: 2px; margin-right: 3px; margin-bottom: 2px; line-height: 1.2em;
-}
-
-#content {text-align: left; padding: 8px;}
-
-#rightcolumn {width: 170px; border-left: 1px solid #ccc; font-size:1em;}
-#rightcolumn th {background-color: #2A75C5; color: #fff; vertical-align: middle;}
-#rightcolumn .blockTitle {padding: 3px; background-color: #ddd; color: #2A75C5; font-weight: bold;}
-#rightcolumn .blockContent {padding: 3px; line-height: 1.2em;}
-
-#footerbar { background-image: url(hbar.gif); font-size:.9em; height : 23px;}
-#footerbar td { vertical-align : middle; text-align:center;}
-
-#mainmenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px;}
-#mainmenu a:hover {background-color: #fff;}
-#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-#mainmenu a.menuSub {padding-left: 9px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-#mainmenu a.maincurrent {background-color:transparent; color:#ff9900;}
-
-#usermenu { font-size : .9em;}
-#usermenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 2px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0; font-weight : normal;}
-#usermenu a:hover {background-color: #fff;}
-#usermenu a.menuTop {border-top: 1px solid #c0c0c0;}
-#usermenu a.highlight {background-color: #fcc;}
-
-
-caption {font-weight: bold;}
-th, thead {background-color: #2A75C5; padding : 2px; color: #fff; vertical-align : middle;}
-.outer {border: 1px solid #c0c0c0;}
-.head {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-.even {background-color: #dee3e7; padding: 5px;}
-.odd {background-color: #E9E9E9; padding: 5px;}
-.foot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-tr.even td {background-color: #dee3e7; padding: 5px;}
-tr.odd td {background-color: #E9E9E9; padding: 5px;}
-tr.foot td {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
-
-.errorMsg,.confirmMsg, .resultMsg { padding: .8em; text-align:center; margin-bottom: 1em; border: 2px solid #ddd;}
-.errorMsg { background-color: #FBE3E4; color: #D12F19; border-color: #FBC2C4; }
-.confirmMsg { background-color: #FFF6BF; color: #817134; border-color: #FFD324; }
-.resultMsg { background-color: #E6EFC2; color: #529214; border-color: #C6D880; }
-.errorMsg a { background-color: transparent; color: #D12F19; }
-.confirmMsg a { background-color: transparent; color: #817134; }
-.successMsg a { background-color: transparent; color: #529214; }
-
-.xoopsCode { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px; height: 200px; overflow: auto; font-size:.9em;}
-.xoopsQuote { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px; font-size:.9em;}
-blockquote {font-style : italic; line-height:1.4em;}
-
-.comTitle {font-weight: bold; margin-bottom: 2px;}
-.comText {padding: 2px;}
-.comUserStat {font-size: .9em; color: #2A75C5; font-weight:bold; border: 1px solid #c0c0c0; background-color: #fff; margin: 2px; padding: 2px;}
-.comUserStatCaption {font-weight: normal;}
-.comUserStatus {margin-left: 2px; margin-top: 10px; color: #2A75C5; font-weight:bold; font-size: .9em;}
-.comUserRank {margin: 2px;}
-.comUserRankText {font-size: .9em;font-weight:bold;}
-.comUserRankImg {border: 0;}
-.comUserName a {color: #fff;}
-.comUserImg {margin: 2px;}
-.comDate {font-weight: normal; font-style: italic; font-size: .8em;}
-.comDateCaption {font-weight: bold; font-style: normal;}
-
-/*============== Styles for system_siteclosed.html (override system module) =================*/
-#xo-siteclose {
- width: 400px;
- margin: 100px auto;
- background-color: #e2e2e2;
- padding: 30px;
- color: #000;
- font-size: 1.2em;
- font-weight: bold;
- text-align: center;
- border: 1px solid #666;
-}
-#xo-userbar_siteclosed {
- display: block;
- background: #2A75C5 url(xo-banner_bg.png) repeat-x left top;
- padding-top: 8px;
- padding-right: 1em;
- color: #fff;
- font-size : .8em;
- text-align : center;
-}
-#xo-userbar_siteclosed form {
- display: inline;
- padding: 0;
-}
-
-#xo-userbar_siteclosed input, #xo-userbar_siteclosed button {
- width: 100px;
- background-color: transparent;
- color: #fff;
- font-size : .9em;
- margin: 2px;
-}
-#xo-userbar_siteclosed input:hover {}
-
-/*============== Styles for system_redirect.html (override system module) =================*/
-#xo-redirect {
- width: 780px;
- margin: 50px auto;
- padding: 1em;
- font-weight: bold;
- text-align: center;
-}
-#xo-redirect .notreload {
- height: 28px;
- background-color: inherit;
- padding-top: 2px;
- color: #000;
-}
-#xo-redirect .notreload a {
- background-color: inherit;
- color: #ff0000;
- font-weight: bold;
- text-decoration: none;
-}
-#xo-redirect .message {
- min-height: 60px;
- background-color: #f3f3f3;
- padding: 1em;
- color: #333;
- font-size: 1.2em;
- text-align: center;
- border: 1px solid #666;
-}
-#xo-redirect .message img{
- padding: 1em;
-}
-/*============== Styles for pagenav =================*/
-#xo-pagenav {
- margin: 7px 0;
- text-align: center;
- font-size: 1.05em;
-}
-#xo-pagenav a {
- text-decoration: none;
-}
-#xo-pagenav a:hover {
- color: #fff;
- background-color: #2A75C5;
- border: 1px solid #fff;
-}
-.xo-pagact {
- margin: 0;
- padding: .2em .5em;
- color: #fff;
- background-color: #2A75C5;
- border: 1px solid #fff;
-}
-.xo-counterpage, .xo-pagarrow {
- margin: 0;
- padding: .2em .5em;
- color: #000;
- background-color: #fff;
- border: 1px solid #000;
-}
-.xo-counterpage:hover {}
-.xo-pagarrow {
- letter-spacing: 0.2em;
-}
-/*======= Tinymce background textarea ========*/
-body.mceContentBody {
- margin: 0;
- padding: 0;
- background-color: #fff;
- background-image: none;
- color: #000;
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleIE8.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleIE8.css 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleIE8.css 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,2 +0,0 @@
-/* specifoc style sheat for IE */
-#xo-bannerfix { padding: 6px 6px 6px 0;}
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleMAC.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleMAC.css 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleMAC.css 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,2 +0,0 @@
-@import url(style.css);
-/* Very short Mac-specific additions/changes here (if any) */
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleNN.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleNN.css 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/styleNN.css 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,2 +0,0 @@
-@import url(style.css);
-/* Very short Gecko-specific additions/changes here (if any) */
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,153 +1,147 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<!DOCTYPE html>
+<html lang="<{$xoops_langcode}>">
<head>
- <!-- Assign Theme name -->
- <{assign var=theme_name value=$xoTheme->folderName}>
-
- <!-- Title and meta -->
- <meta http-equiv="content-language" content="<{$xoops_langcode}>" />
- <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
- <title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> - <{/if}><{$xoops_sitename}></title>
- <meta name="robots" content="<{$xoops_meta_robots}>" />
- <meta name="keywords" content="<{$xoops_meta_keywords}>" />
- <meta name="description" content="<{$xoops_meta_description}>" />
- <meta name="rating" content="<{$xoops_meta_rating}>" />
- <meta name="author" content="<{$xoops_meta_author}>" />
- <meta name="copyright" content="<{$xoops_meta_copyright}>" />
- <meta name="generator" content="XOOPS" />
-
- <!-- Rss -->
- <link rel="alternate" type="application/rss+xml" title="" href="<{xoAppUrl backend.php}>" />
-
- <!-- Favicon -->
- <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
- <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
-
- <!-- Sheet Css -->
- <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{xoAppUrl xoops.css}>" />
- <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{xoImgUrl style.css}>" />
- <!--[if lte IE 8]>
- <link rel="stylesheet" href="<{xoImgUrl styleIE8.css}>" type="text/css" />
- <![endif]-->
-
- <!-- customized header contents -->
- <{$xoops_module_header}>
+ <!-- Assign Theme variables -->
+ <{includeq file="$theme_tpl/theme_vars.html"}>
+ <!-- Title, meta, CSS and javascript -->
+ <{includeq file="$theme_tpl/theme_head.html"}>
</head>
<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
-
-<!-- Start Header -->
-<table cellspacing="0">
- <tr id="header">
- <td id="headerlogo"><a href="<{xoAppUrl /}>" title="<{$xoops_sitename}>"><img src="<{xoImgUrl xoops-logo.png}>" alt="<{$xoops_sitename}>" /></a></td>
- <td id="headerbanner"><div id="xo-bannerfix"><{$xoops_banner}></div></td>
- </tr>
- <tr>
- <td id="headerbar" colspan="2"> </td>
- </tr>
-</table>
-<!-- End header -->
-
-<table cellspacing="0">
- <tr>
- <!-- Start left blocks loop -->
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="<{xoAppUrl }>" title="<{$xoops_sitename}>">
+ <img src="<{xoImgUrl img/logo.png}>" alt="<{$xoops_sitename}>" />
+ </a>
+ <!-- Navigation bar menu -->
+ <{includeq file="$theme_tpl/theme_menu.html"}>
+ <!-- User menu -->
+ <{includeq file="$theme_tpl/theme_user.html"}>
+ </div>
+ </div>
+</div>
+<div class="xo-hero">
+ <div class="container xo-hero-content">
+ <h1>XOOPS. Powered by You!</h1>
+ <p>easy to use dynamic web content management system written in PHP</p>
+ <p>
+ <a class="btn btn-warning btn-large">
+ Learn more
+ </a>
+ </p>
+ </div>
+</div>
+<div class="container">
+ <div class="row">
<{if $xoops_showlblock}>
- <td id="leftcolumn">
+ <div class="span3 xo-block-left">
<{foreach item=block from=$xoBlocks.canvas_left}>
- <{includeq file="$theme_name/theme_blockleft.html"}>
+ <{includeq file="$theme_tpl/block_left.html"}>
<{/foreach}>
- </td>
+ </div>
<{/if}>
- <!-- End left blocks loop -->
-
- <td id="centercolumn">
- <!-- Display center blocks if any -->
+ <div class="span<{$col_span}> xo-block-center">
<{if $xoBlocks.page_topleft or $xoBlocks.page_topcenter or $xoBlocks.page_topright}>
- <table cellspacing="0">
- <tr>
- <td id="centerCcolumn" colspan="2">
- <!-- Start center-center blocks loop -->
- <{foreach item=block from=$xoBlocks.page_topcenter}>
- <{includeq file="$theme_name/theme_blockcenter_c.html"}>
- <{/foreach}>
- <!-- End center-center blocks loop -->
- </td>
- </tr>
- <tr>
- <td id="centerLcolumn">
- <!-- Start center-left blocks loop -->
- <{foreach item=block from=$xoBlocks.page_topleft}>
- <{includeq file="$theme_name/theme_blockcenter_l.html"}>
- <{/foreach}>
- <!-- End center-left blocks loop -->
- </td>
- <td id="centerRcolumn">
- <!-- Start center-right blocks loop -->
- <{foreach item=block from=$xoBlocks.page_topright}>
- <{includeq file="$theme_name/theme_blockcenter_r.html"}>
- <{/foreach}>
- <!-- End center-right blocks loop -->
- </td>
- </tr>
- </table>
+ <!-- Display center blocks if any -->
+ <div class="row">
+ <div class="span<{$col_span}> xo-top">
+ <div class="row">
+ <div class="span<{$col_span}> xo-center">
+ <!-- Start center-center blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topcenter}>
+ <{includeq file="$theme_tpl/block_center_c.html"}>
+ <{/foreach}>
+ <!-- End center-center blocks loop -->
+ </div>
+ </div>
+ <div class="row">
+ <div class="span<{$col_span_mid}> xo-left">
+ <!-- Start center-left blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topleft}>
+ <{includeq file="$theme_tpl/block_center_l.html"}>
+ <{/foreach}>
+ <!-- End center-left blocks loop -->
+ </div>
+ <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
+ <div class="span<{$col_span_mid}> xo-right">
+ <!-- Start center-right blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topright}>
+ <{includeq file="$theme_tpl/block_center_r.html"}>
+ <{/foreach}>
+ <!-- End center-right blocks loop -->
+ </div>
+ </div>
+ </div>
+ </div>
<{/if}>
- <!-- End center top blocks loop -->
-
+ <{if $xoops_contents && ($xoops_contents != ' ') }>
<!-- Start content module page -->
- <{if $xoops_contents && ($xoops_contents != ' ') }><div id="content"><{$xoops_contents}></div><{/if}>
+ <div class="row">
+ <div class="span<{$col_span}>">
+ <{$xoops_contents}>
+ </div>
+ </div>
<!-- End content module -->
-
- <!-- Start center bottom blocks loop -->
- <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomright or $xoBlocks.page_bottomcenter}>
- <table cellspacing="0">
- <{if $xoBlocks.page_bottomcenter}>
- <tr>
- <td id="bottomCcolumn" colspan="2">
- <{foreach from=$xoBlocks.page_bottomcenter item=block}>
- <{include file="$theme_name/theme_blockcenter_c.html"}>
+ <{/if}>
+ <div class="row">
+ <div class="span<{$col_span}> xo-bottom">
+ <div class="row">
+ <div class="span<{$col_span}> xo-center">
+ <!-- Start center-center blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_bottomcenter}>
+ <{includeq file="$theme_tpl/block_center_c.html"}>
<{/foreach}>
- </td>
- </tr>
- <{/if}>
-
- <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomright}>
- <tr>
- <td id="bottomLcolumn">
- <{foreach from=$xoBlocks.page_bottomleft item=block}>
- <{include file="$theme_name/theme_blockcenter_l.html"}>
+ <!-- End center-center blocks loop -->
+ </div>
+ </div>
+ <div class="row">
+ <div class="span<{$col_span_mid}> xo-left">
+ <!-- Start center-left blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_bottomright}>
+ <{includeq file="$theme_tpl/block_center_l.html"}>
<{/foreach}>
- </td>
-
- <td id="bottomRcolumn">
- <{foreach from=$xoBlocks.page_bottomright item=block}>
- <{include file="$theme_name/theme_blockcenter_r.html"}>
+ <!-- End center-left blocks loop -->
+ </div>
+ <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
+ <div class="span<{$col_span_mid}> xo-right">
+ <!-- Start center-right blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_bottomright}>
+ <{includeq file="$theme_tpl/block_center_r.html"}>
<{/foreach}>
- </td>
- </tr>
- <{/if}>
- </table>
- <{/if}>
- <!-- End center bottom blocks loop -->
- </td>
-
- <!-- Start right blocks loop -->
+ <!-- End center-right blocks loop -->
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
<{if $xoops_showrblock}>
- <td id="rightcolumn">
+ <div class="span3 xo-block-right">
<{foreach item=block from=$xoBlocks.canvas_right}>
- <{includeq file="$theme_name/theme_blockright.html"}>
+ <{includeq file="$theme_tpl/block_right.html"}>
<{/foreach}>
- </td>
+ </div>
<{/if}>
- <!-- End right blocks loop -->
- </tr>
-</table>
-
-<!-- Start footer -->
-<table cellspacing="0">
-<tr id="footerbar">
- <td><{$xoops_footer}></td>
-</tr>
-</table>
-<!-- End footer -->
-<!--{xo-logger-output}-->
+ </div>
+</div>
+<footer>
+ <div class="container">
+ <div class="row">
+ <div class="container">
+ <div class="span12">
+ <p class="pull-right"><a href="#"><{$smarty.const._THEME_BACKTOP}></a></p>
+ <div class="pagination-centered">
+ <{$xoops_footer}>
+ </div>
+ <!--{xo-logger-output}-->
+ </div>
+ </div>
+ </div>
+ </div>
+</footer>
+<script type="text/javascript" src="<{xoAppUrl media/jquery/jquery.js}>"></script>
+<script type="text/javascript" src="<{xoAppUrl media/bootstrap/js/bootstrap.min.js}>"></script>
+<script type="text/javascript">
+ $().dropdown();
+</script>
</body>
</html>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_c.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_c.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_c.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,8 +0,0 @@
-<div style="padding: 5px;">
- <fieldset>
- <{if $block.title}>
- <legend class="blockTitle"><{$block.title}></legend>
- <{/if}>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
-</div>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_l.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_l.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_l.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,8 +0,0 @@
-<div style="padding: 0px 0px 0px 8px;">
- <fieldset>
- <{if $block.title}>
- <legend class="blockTitle"><{$block.title}></legend>
- <{/if}>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
-</div>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_r.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_r.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockcenter_r.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,8 +0,0 @@
-<div style="padding: 0px 5px 0px 0px;">
- <fieldset>
- <{if $block.title}>
- <legend class="blockTitle"><{$block.title}></legend>
- <{/if}>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
-</div>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockleft.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockleft.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockleft.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,4 +0,0 @@
-<{if $block.title}>
- <div class="blockTitle"><{$block.title}></div>
-<{/if}>
-<div class="blockContent"><{$block.content}></div>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockright.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockright.html 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme_blockright.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,4 +0,0 @@
-<{if $block.title}>
- <div class="blockTitle"><{$block.title}></div>
-<{/if}>
-<div class="blockContent"><{$block.content}></div>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-banner_bg.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-info.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-info.php 2012-05-17 11:51:37 UTC (rev 9537)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xo-info.php 2012-05-17 11:53:10 UTC (rev 9538)
@@ -1,31 +0,0 @@
-<?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.
-*/
-
-/**
- * XOOPS default theme configuration file
- *
- * Not used yet, for forward compat
- *
- * @copyright The Xoops project http://www.xoops.org/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Taiwen Jiang <ph...@us...>
- * @since 2.3
- * @version $Id$
- */
-
-
-return array(
- 'copyright' => '© XOOPS Core Team, maintained by XOOPS Design Team led by Kris',
- // Types of language constants
- "languages" => array("main", "admin"),
-);
-
-?>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops-logo.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops-logo.psd
===================================================================
(Binary files differ)
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops_version.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xoops_version.php 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,41 @@
+<?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.
+*/
+
+/**
+ * System menu
+ *
+ * @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 themes
+ * @author Andricq Nicolas (AKA MusS)
+ * @version $Id$
+ */
+
+// Main
+$theme_version['name'] = 'Default';
+$theme_version['description'] = 'Default Xoops template';
+$theme_version['version'] = 0.1;
+$theme_version['author'] = 'Andricq Nicolas';
+$theme_version['nickname'] = 'MusS';
+$theme_version['credits'] = 'The XOOPS Project';
+$theme_version['license'] = 'GNU GPL 2.0';
+$theme_version['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
+$theme_version['official'] = 1;
+$theme_version['image'] = 'icons/logo.png';
+$theme_version['dirname'] = 'default';
+// About
+$theme_version['release_date'] = '2012/05/13';
+$theme_version['theme_website_url'] = 'http://www.xoops.org/';
+$theme_version['theme_website_name'] = 'XOOPS';
+$theme_version['theme_status'] = 'ALPHA';
+
+
+
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_c.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_c.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_c.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,4 @@
+<div class="xo-block">
+ <{if $block.title}><div class="xo-title"><h4><{$block.title}></h4></div><{/if}>
+ <div class="xo-content"><{$block.content}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_l.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_l.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_l.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,4 @@
+<div class="xo-block">
+ <{if $block.title}><div class="xo-title"><h4><{$block.title}></h4></div><{/if}>
+ <div class="xo-content"><{$block.content}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_r.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_r.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_center_r.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,4 @@
+<div class="xo-block">
+ <{if $block.title}><div class="xo-title"><h4><{$block.title}></h4></div><{/if}>
+ <div class="xo-content"><{$block.content}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_left.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_left.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_left.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,4 @@
+<div class="xo-block">
+ <div class="xo-title"><{$block.title}></div>
+ <div class="xo-content"><{$block.content}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_right.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_right.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/block_right.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,4 @@
+<div class="xo-block">
+ <div class="xo-title"><{$block.title}></div>
+ <div class="xo-content"><{$block.content}></div>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/index.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,35 @@
+<!-- Title and meta -->
+ <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+ <title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> - <{/if}><{$xoops_sitename}></title>
+ <meta name="robots" content="<{$xoops_meta_robots}>" />
+ <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+ <meta name="description" content="<{$xoops_meta_description}>" />
+ <meta name="rating" content="<{$xoops_meta_rating}>" />
+ <meta name="author" content="<{$xoops_meta_author}>" />
+ <meta name="generator" content="XOOPS" />
+
+ <!-- Rss -->
+ <link rel="alternate" type="application/rss+xml" title="" href="<{xoAppUrl backend.php}>" />
+
+ <!-- Favicon -->
+ <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
+ <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
+
+ <!-- Xoops style sheet -->
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/xoops.bootstrap.css}>" />
+ <!--<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/bootstrap-responsive.min.css}>" />-->
+ <!-- Theme style sheet -->
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl css/style.css}>" />
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" href="<{xoImgUrl styleIE8.css}>" type="text/css" />
+ <![endif]-->
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- customized header contents -->
+ <{$xoops_module_header}>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_menu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_menu.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_menu.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,5 @@
+<ul class="nav nav-pills">
+ <li class="active">
+ <a href="<{xoAppUrl }>"><{$smarty.const._THEME_HOME}></a>
+ </li>
+</ul>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,70 @@
+<div class="pull-right">
+ <{if !$xoops_isuser}>
+ <a class="btn btn-primary" href="<{xoAppUrl user.php}>">
+ <i class="icon-white icon-user"></i>
+ <{$smarty.const._THEME_LOGIN}>
+ </a>
+ <a class="btn btn-info" href="<{xoAppUrl register.php}>">
+ <i class="icon-white icon-leaf"></i>
+ <{$smarty.const._THEME_REGISTER}>
+ </a>
+ <{else}>
+ <ul class="nav pull-right">
+ <li class="divider-vertical"></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="ico-lightning"></i> <{$smarty.const._THEME_QUICK}><i class="caret"></i></a>
+ <ul class="dropdown-menu">
+ <{if $xoops_isadmin}>
+ <li>
+ <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._THEME_ADMIN}>">
+ <i class="icon-wrench"></i>
+ <{$smarty.const._THEME_ADMIN}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php}>" title="<{$smarty.const._THEME_MYACCOUNT}>">
+ <i class="icon-user"></i>
+ <{$smarty.const._THEME_MYACCOUNT}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl edituser.php}>" title="<{$smarty.const._THEME_EDITPROFILE}>">
+ <i class="icon-edit"></i>
+ <{$smarty.const._THEME_EDITPROFILE}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl /notifications.php}>" title="<{$smarty.const._THEME_NOTIFICATION}>">
+ <i class="icon-comment"></i>
+ <{$smarty.const._THEME_NOTIFICATION}>
+ </a>
+ </li>
+ <{xoInboxCount assign=pm_count}>
+ <{if $pm_count}>
+ <li>
+ <a href="<{xoAppUrl viewpmsg.php}>" title="<{$smarty.const._THEME_PM}>">
+ <i class="icon-envelope"></i>
+ <{$smarty.const._THEME_PM}> (<strong><{$pm_count}></strong>)
+ </a>
+ </li>
+ <{else}>
+ <li>
+ <a href="<{xoAppUrl viewpmsg.php}>" title="<{$smarty.const._THEME_PM}>">
+ <i class="icon-envelope"></i>
+ <{$smarty.const._THEME_PM}>
+ </a>
+ </li>
+ <{/if}>
+ <li class="divider"></li>
+ <li>
+ <a href="<{xoAppUrl user.php?op=logout}>" title="<{$smarty.const._THEME_LOGOUT}>">
+ <i class="icon-off"></i>
+ <{$smarty.const._THEME_LOGOUT}>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <{/if}>
+</div>
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_vars.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_vars.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_vars.html 2012-05-17 11:53:10 UTC (rev 9538)
@@ -0,0 +1,20 @@
+<!-- Assign Theme variables -->
+<{if !$xoops_showlblock && $xoops_showrblock}>
+<{assign var=col_span value=9}>
+<{assign var=col_span_mid value=4}>
+<{/if}>
+
+<{if $xoops_showlblock && !$xoops_showrblock}>
+<{assign var=col_span value=9}>
+<{assign var=col_span_mid value=4}>
+<{/if}>
+
+<{if $xoops_showlblock && $xoops_showrblock}>
+<{assign var=col_span value=6}>
+<{assign var=col_span_mid value=3}>
+<{/if}>
+
+<{if !$xoops_showlblock && !$xoops_showrblock}>
+<{assign var=col_span value=12}>
+<{assign var=col_span_mid value=6}>
+<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:51:44
|
Revision: 9537
http://xoops.svn.sourceforge.net/xoops/?rev=9537&view=rev
Author: forxoops
Date: 2012-05-17 11:51:37 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Update all template with HTML5 and bootstrap
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:51:37 UTC (rev 9537)
@@ -300,7 +300,7 @@
function b_system_info_show($options)
{
- global $xoopsConfig, $xoopsUser;
+ global $xoopsUser;
$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
$myts = MyTextSanitizer::getInstance();
$block = array();
@@ -318,20 +318,19 @@
if (isset($xoopsUser) && is_object($xoopsUser)) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'] . "','pmlite',450,370);\"><img src=\"" . XOOPS_URL . "/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>",
+ 'pm_link' => XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
if ($userinfo['user_viewemail']) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . XOOPS_URL . '/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>',
+ 'msg_link' => $userinfo['email'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
$block['groups'][$i]['users'][] = array(
- 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => ' ', 'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
+ 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname'])
);
}
}
@@ -603,7 +602,7 @@
if ($options[0] == 1) {
$block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"" . XOOPS_THEME_URL . "/" . $xoopsConfig['theme_set'] . "/shot.gif\" alt=\"screenshot\" width=\"" . intval($options[1]) . "\" /><br /><select id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/shot.gif', '" . XOOPS_URL . "');\">" . $theme_options . "</select><input type=\"submit\" value=\"" . _GO . "\" />";
} else {
- $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
+ $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
}
$block['theme_select'] .= '<br />(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>' . count($xoopsConfig['theme_set_allowed']) . '</strong>') . ')<br />';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,15 @@
-<table cellspacing="1" class="outer width100">
- <{foreach item=comment from=$block.comments}>
- <tr class="<{cycle values='even,odd'}>">
- <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
- <td><{$comment.title}></td>
- <td class="txtcenter"><{$comment.module}></td>
- <td class="txtcenter"><{$comment.poster}></td>
- <td class="txtright"><{$comment.time}></td>
- </tr>
- <{/foreach}>
-</table>
\ No newline at end of file
+<div class="xo-block-comment">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=comment from=$block.comments}>
+ <tr>
+ <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
+ <td><{$comment.title}></td>
+ <td class="txtcenter"><{$comment.module}></td>
+ <td class="txtcenter"><{$comment.poster}></td>
+ <td class="txtright"><{$comment.time}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,20 +1,43 @@
-<div class="txtcenter">
- <form style="margin-top: 0;" action="<{xoAppUrl user.php}>" method="post">
- <{$block.lang_username}><br />
- <input type="text" name="uname" size="12" value="<{$block.unamevalue}>" maxlength="25" /><br />
- <{$block.lang_password}><br />
- <input type="password" name="pass" size="12" maxlength="32" /><br />
- <{if isset($block.lang_rememberme)}>
- <input type="checkbox" name="rememberme" value="On" class ="formButton" /><{$block.lang_rememberme}><br />
- <{/if}>
- <br />
- <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
- <input type="hidden" name="op" value="login" />
- <input type="submit" value="<{$block.lang_login}>" /><br />
- <{$block.sslloginlink}>
- </form>
- <br />
- <a href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
- <br /><br />
- <a href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+<div class="xo-block-login">
+ <form class="form" action="<{xoAppUrl user.php}>" method="post">
+ <div class="control-group">
+ <label class="control-label" for="xo-login-uname"><{$block.lang_username}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-user"></i>
+ </span><input class="span2" type="text" name="uname" id="xo-login-uname" value="<{$block.unamevalue}>" placeholder="Login…">
+ </div>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="xo-login-pass"><{$block.lang_password}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-cog"></i>
+ </span><input class="span2" type="password" name="pass" id="xo-login-pass">
+ </div>
+ </div>
+ </div>
+ <{if isset($block.lang_rememberme)}>
+ <label class="checkbox">
+ <input type="checkbox" name="rememberme" value="On" class="formButton"/><{$block.lang_rememberme}>
+ </label>
+ <{/if}>
+ <br/>
+ <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>"/>
+ <input type="hidden" name="op" value="login"/>
+ <div class="pagination-centered">
+ <button class="btn btn-primary" type="submit">
+ <i class="icon-white icon-user"></i>
+ <{$block.lang_login}>
+ </button>
+ <hr />
+ <a class="btn btn-mini pull-left" href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
+ <a class="btn btn-mini btn-info pull-right" href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+ <div class="clear"></div>
+ </div>
+ <{$block.sslloginlink}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,27 @@
-<div id="mainmenu">
- <a class="menuTop <{if !$block.nothome}>maincurrent<{/if}>" href="<{xoAppUrl }>" title="<{$block.lang_home}>"><{$block.lang_home}></a>
+<ul class="nav nav-list">
+ <li class="<{if !$block.nothome}>active<{/if}>">
+ <a href="<{xoAppUrl }>" title="<{$block.lang_home}>">
+ <i class="icon-home <{if !$block.nothome}>icon-white<{/if}>"></i>
+ <{$block.lang_home}>
+ </a>
+ </li>
<!-- start module menu loop -->
<{foreach item=module from=$block.modules}>
- <a class="menuMain <{if $module.highlight}>maincurrent<{/if}>" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>"><{$module.name}></a>
- <{foreach item=sublink from=$module.sublinks}>
- <a class="menuSub" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
- <{/foreach}>
+ <li class="<{if $module.highlight}>active<{/if}>">
+ <a class="" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>">
+ <i class="icon-tags <{if $module.highlight}>icon-white<{/if}>"></i>
+ <{$module.name}>
+ </a>
+ <{if $module.sublinks}>
+ <ul class="nav nav-list">
+ <{foreach item=sublink from=$module.sublinks}>
+ <li>
+ <a class="" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ </li>
<{/foreach}>
<!-- end module menu loop -->
-</div>
\ No newline at end of file
+</ul>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,13 +1,19 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.joindate}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-newuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="span2 txt-centered">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
+ </h5>
+ </td>
+ <td class="txt-centered"><{$user.joindate}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,28 +1,28 @@
<form action="<{$block.target_page}>" method="post">
-<table class="outer">
- <{foreach item=category from=$block.categories}>
- <{foreach name=inner item=event from=$category.events}>
- <{if $smarty.foreach.inner.first}>
- <tr>
- <td class="head" colspan="2"><{$category.title}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="odd">
- <{counter assign=index}>
- <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
- <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
- </td>
- <td class="odd"><{$event.caption}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot" colspan="2">
- <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
- <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
- <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
- </td>
- </tr>
-</table>
+ <table class="outer">
+ <{foreach item=category from=$block.categories}>
+ <{foreach name=inner item=event from=$category.events}>
+ <{if $smarty.foreach.inner.first}>
+ <tr>
+ <td class="head" colspan="2"><{$category.title}></td>
+ </tr>
+ <{/if}>
+ <tr>
+ <td class="odd">
+ <{counter assign=index}>
+ <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
+ <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
+ </td>
+ <td class="odd"><{$event.caption}></td>
+ </tr>
+ <{/foreach}>
+ <{/foreach}>
+ <tr>
+ <td class="foot" colspan="2">
+ <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
+ <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
+ <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
+ </td>
+ </tr>
+ </table>
</form>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,10 +1,20 @@
-<{$block.online_total}>
-<br /><br />
-<{$block.lang_members}>: <{$block.online_members}>
-<br />
-<{$block.lang_guests}>: <{$block.online_guests}>
-<br /><br />
-<{$block.online_names}>
-<a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
- <{$block.lang_more}>
-</a>
\ No newline at end of file
+<div class="xo-block-online">
+ <ul class="nav nav-list">
+ <li class="nav-header">
+ <{$block.online_total}>
+ </li>
+ <li>
+ <i class="icon-user"></i>
+ <{$block.lang_members}>: <{$block.online_members}>
+ </li>
+ <li>
+ <i class="icon-globe"></i>
+ <{$block.lang_guests}>: <{$block.online_guests}>
+ </li>
+ </ul>
+ <hr />
+ <{$block.online_names}>
+ <a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
+ <{$block.lang_more}>
+ </a>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,8 +1,10 @@
-<div class="txtcenter">
-<form style="margin-top: 0;" action="<{xoAppUrl search.php}>" method="get">
- <input type="text" name="query" size="14" />
- <input type="hidden" name="action" value="results" /><br />
- <input type="submit" value="<{$block.lang_search}>" />
-</form>
-<a href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+<div class="xo-block-search">
+ <form action="<{xoAppUrl search.php}>" method="get">
+ <input class="span2" type="text" name="query">
+ <input type="hidden" name="action" value="results" />
+ <div class="btn-group">
+ <button class="btn btn-primary btn-small" type="submit"><{$block.lang_search}></button>
+ <a class="btn btn-small" href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+ </div>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,34 +1,43 @@
-<table class="outer collapse">
-
- <{if $block.showgroups == true}>
-
- <!-- start group loop -->
- <{foreach item=group from=$block.groups}>
- <tr>
- <th colspan="2"><{$group.name}></th>
- </tr>
-
- <!-- start group member loop -->
- <{foreach item=user from=$group.users}>
- <tr>
- <td class="even txtcenter alignmiddle">
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="odd width20 txtright alignmiddle">
- <{$user.msglink}>
- </td>
- </tr>
- <{/foreach}>
- <!-- end group member loop -->
-
- <{/foreach}>
- <!-- end group loop -->
- <{/if}>
-</table>
-
-<br />
-
-<div class="txtcenter marg3">
- <img src="<{$block.logourl}>" alt="" /><br /><{$block.recommendlink}>
+<div class="xo-block-siteinfo">
+ <ul class="nav nav-list">
+ <{if $block.showgroups == true}>
+ <!-- start group loop -->
+ <{foreach item=group from=$block.groups}>
+ <li class="nav-header">
+ <{$group.name}>
+ </li>
+ <!-- start group member loop -->
+ <{foreach item=user from=$group.users}>
+ <li>
+ <img class="thumbnail pull-left" src="<{$user.avatar}>" alt="<{$user.name}>">
+ <div class="pull-left">
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>">
+ <i class="icon-user"></i>
+ <{$user.name}>
+ </a>
+ </h5>
+ <{if $user.pm_link}>
+ <a class="pull-left" href="javascript:openWithSelfMain('<{$user.pm_link}>','pmlite',500,450)">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ <{if $user.msg_link}>
+ <a class="pull-left" href="mailto:<{$user.msg_link}>">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ </div>
+ </li>
+ <{/foreach}>
+ <!-- end group member loop -->
+ <{/foreach}>
+ <!-- end group loop -->
+ <{/if}>
+ </ul>
+</div>
+<div class="clear"></div>
+<hr />
+<div class="pagination-centered">
+ <img src="<{$block.logourl}>" alt=""><br /><{$block.recommendlink}>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,5 @@
-<div class="txtcenter">
-<form action="<{xoAppUrl index.php}>" method="post">
-<{$block.theme_select}>
-</form>
+<div class="xo-block-theme">
+ <form action="<{xoAppUrl index.php}>" method="post">
+ <{$block.theme_select}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,14 +1,18 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td><{$user.rank}></td>
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.posts}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-topuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="txt-centered"><{$user.rank}></td>
+ <td class="txt-centered span1">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5><a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a></h5>
+ </td>
+ <td class="txt-centered"><{$user.posts}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,16 +1,49 @@
-<div id="usermenu">
- <{if $xoops_isadmin}>
- <a class="menuTop" href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>"><{$block.lang_adminmenu}></a>
- <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{else}>
- <a class="menuTop" href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{/if}>
- <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>"><{$block.lang_editaccount}></a>
- <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>"><{$block.lang_notifications}></a>
- <{if $block.new_messages > 0}>
- <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)</a>
- <{else}>
- <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}></a>
- <{/if}>
- <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>"><{$block.lang_logout}></a>
-</div>
+<ul class="nav nav-list">
+ <{if $xoops_isadmin}>
+ <li>
+ <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>">
+ <i class="icon-wrench"></i>
+ <{$block.lang_adminmenu}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>">
+ <i class="icon-user"></i>
+ <{$block.lang_youraccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>">
+ <i class="icon-edit"></i>
+ <{$block.lang_editaccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>">
+ <i class="icon-comment"></i>
+ <{$block.lang_notifications}>
+ </a>
+ </li>
+ <{if $block.new_messages > 0}>
+ <li>
+ <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)
+ </a>
+ </li>
+ <{else}>
+ <li>
+ <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>">
+ <i class="icon-off"></i>
+ <{$block.lang_logout}>
+ </a>
+ </li>
+</ul>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,10 @@
-<ul>
- <{foreach item=module from=$block.modules}>
- <li><a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>"><{$module.lang_linkname}></a>: <{$module.pendingnum}></li>
- <{/foreach}>
+<ul class="nav nav-list">
+ <{foreach item=module from=$block.modules}>
+ <li>
+ <a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>">
+ <i class="icon-time"></i>
+ <{$module.lang_linkname}> : <{$module.pendingnum}>
+ </a>
+ </li>
+ <{/foreach}>
</ul>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:50:33
|
Revision: 9536
http://xoops.svn.sourceforge.net/xoops/?rev=9536&view=rev
Author: forxoops
Date: 2012-05-17 11:50:23 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Add some new variables for theme
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2012-05-17 11:49:42 UTC (rev 9535)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2012-05-17 11:50:23 UTC (rev 9536)
@@ -125,14 +125,14 @@
$inst->path = XOOPS_ADMINTHEME_PATH . '/' . $inst->folderName;
$inst->url = XOOPS_ADMINTHEME_URL . '/' . $inst->folderName;
$inst->template->assign(array(
- 'theme_path' => $inst->path,
- 'theme_tpl' => $inst->path . '/xotpl',
- 'theme_url' => $inst->url,
- 'theme_img' => $inst->url . '/img',
+ 'theme_path' => $inst->path,
+ 'theme_tpl' => $inst->path . '/xotpl',
+ 'theme_url' => $inst->url,
+ 'theme_img' => $inst->url . '/img',
'theme_icons' => $inst->url . '/icons',
- 'theme_css' => $inst->url . '/css',
- 'theme_js' => $inst->url . '/js',
- 'theme_lang' => $inst->url . '/language',
+ 'theme_css' => $inst->url . '/css',
+ 'theme_js' => $inst->url . '/js',
+ 'theme_lang' => $inst->url . '/language',
));
return $inst;
@@ -238,8 +238,8 @@
* @var array
*/
public $metas = array(
- 'meta' => array(),
- 'link' => array(),
+ 'meta' => array(),
+ 'link' => array(),
'script' => array()
);
@@ -300,31 +300,41 @@
$this->template->currentTheme = $this;
$this->template->assign_by_ref('xoTheme', $this);
$this->template->assign(array(
- 'xoops_theme' => $xoops->getConfig('theme_set'),
- 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoops->getConfig('theme_set') . '/',
- 'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
+ 'xoops_theme' => $xoops->getConfig('theme_set'),
+ 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoops->getConfig('theme_set') . '/',
+ 'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
- 'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
- 'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
- 'xoops_dirname' => $xoops->moduleDirname,
- 'xoops_banner' => $this->renderBanner ? $xoops->getBanner() : ' ',
- 'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES)
+ 'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
+ 'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
+ 'xoops_dirname' => $xoops->moduleDirname,
+ 'xoops_banner' => $this->renderBanner ? $xoops->getBanner() : ' ',
+ 'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES)
));
+ $this->template->assign(array(
+ 'theme_path' => $this->path,
+ 'theme_tpl' => $this->path . '/xotpl',
+ 'theme_url' => $this->url,
+ 'theme_img' => $this->url . '/img',
+ 'theme_icons' => $this->url . '/icons',
+ 'theme_css' => $this->url . '/css',
+ 'theme_js' => $this->url . '/js',
+ 'theme_lang' => $this->url . '/language',
+ ));
if ($xoops->isUser()) {
$this->template->assign(array(
- 'xoops_isuser' => true,
- 'xoops_avatar' => XOOPS_UPLOAD_URL . "/" . $xoops->user->getVar('user_avatar'),
- 'xoops_userid' => $xoops->user->getVar('uid'),
- 'xoops_uname' => $xoops->user->getVar('uname'),
- 'xoops_name' => $xoops->user->getVar('name'),
- 'xoops_isadmin' => $xoops->isAdmin(),
+ 'xoops_isuser' => true,
+ 'xoops_avatar' => XOOPS_UPLOAD_URL . "/" . $xoops->user->getVar('user_avatar'),
+ 'xoops_userid' => $xoops->user->getVar('uid'),
+ 'xoops_uname' => $xoops->user->getVar('uname'),
+ 'xoops_name' => $xoops->user->getVar('name'),
+ 'xoops_isadmin' => $xoops->isAdmin(),
'xoops_usergroups' => $xoops->user->getGroups()
));
} else {
$this->template->assign(array(
- 'xoops_isuser' => false,
- 'xoops_isadmin' => false,
+ 'xoops_isuser' => false,
+ 'xoops_isadmin' => false,
'xoops_usergroups' => array(XOOPS_GROUP_ANONYMOUS)
));
}
@@ -429,7 +439,7 @@
$this->contentCacheId = $this->generateCacheId('page_' . substr(md5($uri), 0, 8));
if ($this->template->is_cached($template, $this->contentCacheId)) {
XoopsLogger::getInstance()
- ->addExtra($template, sprintf('Cached (regenerates every %d seconds)', $this->contentCacheLifetime));
+ ->addExtra($template, sprintf('Cached (regenerates every %d seconds)', $this->contentCacheLifetime));
$this->render(null, null, $template);
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:49:51
|
Revision: 9535
http://xoops.svn.sourceforge.net/xoops/?rev=9535&view=rev
Author: forxoops
Date: 2012-05-17 11:49:42 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Correct some warning for W3C validation
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php 2012-05-17 11:47:50 UTC (rev 9534)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php 2012-05-17 11:49:42 UTC (rev 9535)
@@ -110,7 +110,7 @@
E_STRICT => _LOGGER_E_STRICT
);
$class = 'even';
- $ret .= '<table id="xo-logger-errors" class="outer"><tr><th>' . _LOGGER_ERRORS . '</th></tr>';
+ $ret .= '<table id="xo-logger-errors" class="outer"><thead><tr><th>' . _LOGGER_ERRORS . '</th></tr></thead><tbody>';
foreach ($this->errors as $error) {
$ret .= "\n<tr><td class='$class'>";
$ret .= isset($types[$error['errno']]) ? $types[$error['errno']] : _LOGGER_UNKNOWN;
@@ -119,25 +119,25 @@
$ret .= "<br />\n</td></tr>";
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= "\n</table>\n";
+ $ret .= "\n</tbody></table>\n";
}
if (empty($mode) || $mode == 'deprecated') {
$class = 'even';
- $ret .= '<table id="xo-logger-deprecated" class="outer"><tr><th>' . _LOGGER_DEPRECATED . '</th></tr>';
+ $ret .= '<table id="xo-logger-deprecated" class="outer"><thead><tr><th>' . _LOGGER_DEPRECATED . '</th></tr></thead><tbody>';
foreach ($this->deprecated as $message) {
$ret .= "\n<tr><td class='$class'>";
$ret .= $message;
$ret .= "<br />\n</td></tr>";
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= "\n</table>\n";
+ $ret .= "\n</tbody></table>\n";
}
if (empty($mode) || $mode == 'queries') {
$class = 'even';
$db = XoopsDatabaseFactory::getDatabaseConnection();
- $ret .= '<table id="xo-logger-queries" class="outer"><tr><th>' . _LOGGER_QUERIES . '</th></tr>';
+ $ret .= '<table id="xo-logger-queries" class="outer"><thead><tr><th>' . _LOGGER_QUERIES . '</th></tr></thead><tbody>';
$pattern = '/\b' . preg_quote($db->prefix()) . '\_/i';
foreach ($this->queries as $q) {
@@ -152,11 +152,11 @@
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= '<tr class="foot"><td>' . _LOGGER_TOTAL . ': <span style="color:#ff0000;">' . count($this->queries) . '</span></td></tr></table>';
+ $ret .= '</tbody><tfoot><tr class="foot"><td>' . _LOGGER_TOTAL . ': <span style="color:#ff0000;">' . count($this->queries) . '</span></td></tr></tfoot></table>';
}
if (empty($mode) || $mode == 'blocks') {
$class = 'even';
- $ret .= '<table id="xo-logger-blocks" class="outer"><tr><th colspan="2">' . _LOGGER_BLOCKS . '</th></tr>';
+ $ret .= '<table id="xo-logger-blocks" class="outer"><thead><tr><th>' . _LOGGER_BLOCKS . '</th></tr></thead><tbody>';
foreach ($this->blocks as $b) {
if ($b['cached']) {
$ret .= '<tr><td class="' . $class . '"><strong>' . $b['name'] . ':</strong> ' . sprintf(_LOGGER_CACHED, intval($b['cachetime'])) . '</td></tr>';
@@ -165,29 +165,29 @@
}
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= '<tr class="foot"><td>' . _LOGGER_TOTAL . ': <span style="color:#ff0000;">' . count($this->blocks) . '</span></td></tr></table>';
+ $ret .= '</tbody><tfoot><tr class="foot"><td>' . _LOGGER_TOTAL . ': <span style="color:#ff0000;">' . count($this->blocks) . '</span></td></tr></tfoot></table>';
}
if (empty($mode) || $mode == 'extra') {
$class = 'even';
- $ret .= '<table id="xo-logger-extra" class="outer"><tr><th colspan="2">' . _LOGGER_EXTRA . '</th></tr>';
+ $ret .= '<table id="xo-logger-extra" class="outer"><thead><tr><th>' . _LOGGER_EXTRA . '</th></tr></thead><tbody>';
foreach ($this->extra as $ex) {
$ret .= '<tr><td class="' . $class . '"><strong>';
$ret .= htmlspecialchars($ex['name']) . ':</strong> ' . htmlspecialchars($ex['msg']);
$ret .= '</td></tr>';
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= '</table>';
+ $ret .= '</tbody></table>';
}
if (empty($mode) || $mode == 'timers') {
$class = 'even';
- $ret .= '<table id="xo-logger-timers" class="outer"><tr><th colspan="2">' . _LOGGER_TIMERS . '</th></tr>';
+ $ret .= '<table id="xo-logger-timers" class="outer"><thead><tr><th>' . _LOGGER_TIMERS . '</th></tr></thead><tbody>';
foreach ($this->logstart as $k => $v) {
$ret .= '<tr><td class="' . $class . '"><strong>';
$ret .= sprintf(_LOGGER_TIMETOLOAD, htmlspecialchars($k) . '</strong>', '<span style="color:#ff0000;">' . sprintf("%.03f", $this->dumpTime($k)) . '</span>');
$ret .= '</td></tr>';
$class = ($class == 'odd') ? 'even' : 'odd';
}
- $ret .= '</table>';
+ $ret .= '</tbody></table>';
}
if (empty($mode)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:47:56
|
Revision: 9534
http://xoops.svn.sourceforge.net/xoops/?rev=9534&view=rev
Author: forxoops
Date: 2012-05-17 11:47:50 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Remove PHP 5.3 error
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoInboxCount.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoInboxCount.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoInboxCount.php 2012-05-17 10:11:59 UTC (rev 9533)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoInboxCount.php 2012-05-17 11:47:50 UTC (rev 9534)
@@ -14,7 +14,7 @@
} else {
$pm_handler = $xoops->getHandlerPrivmessage();
- $xoopsPreload =& XoopsPreload::getInstance();
+ $xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.class.smarty.xoops_plugins.xoinboxcount', array($pm_handler));
$criteria = new CriteriaCompo(new Criteria('read_msg', 0));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ce...@us...> - 2012-05-17 10:12:10
|
Revision: 9533
http://xoops.svn.sourceforge.net/xoops/?rev=9533&view=rev
Author: cesag
Date: 2012-05-17 10:11:59 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Core 2.5.5 fr del. non fr files, already present in english
Removed Paths:
-------------
XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/index.html
XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/index.html
XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/index.html
XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/moduleadmin/index.html
Deleted: XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/index.html
===================================================================
--- XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/index.html 2012-05-17 09:25:33 UTC (rev 9532)
+++ XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/index.html 2012-05-17 10:11:59 UTC (rev 9533)
@@ -1 +0,0 @@
-<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/index.html
===================================================================
--- XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/index.html 2012-05-17 09:25:33 UTC (rev 9532)
+++ XoopsLanguages/french/core/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/index.html 2012-05-17 10:11:59 UTC (rev 9533)
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/index.html
===================================================================
--- XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/index.html 2012-05-17 09:25:33 UTC (rev 9532)
+++ XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/index.html 2012-05-17 10:11:59 UTC (rev 9533)
@@ -1 +0,0 @@
-<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/moduleadmin/index.html
===================================================================
--- XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/moduleadmin/index.html 2012-05-17 09:25:33 UTC (rev 9532)
+++ XoopsLanguages/french/core/2.5.5_iso/htdocs/Frameworks/moduleclasses/moduleadmin/index.html 2012-05-17 10:11:59 UTC (rev 9533)
@@ -1 +0,0 @@
-<script>history.go(-1);</script>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 09:25:43
|
Revision: 9532
http://xoops.svn.sourceforge.net/xoops/?rev=9532&view=rev
Author: forxoops
Date: 2012-05-17 09:25:33 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Update bootstrap framework to 2.0.3
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/glyphicons-halflings-white.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/glyphicons-halflings.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/js/bootstrap.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/js/bootstrap.min.js
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.css 2012-05-17 00:18:37 UTC (rev 9531)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.css 2012-05-17 09:25:33 UTC (rev 9532)
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.0.1
+ * Bootstrap Responsive v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -7,20 +7,86 @@
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
+
.clearfix {
*zoom: 1;
}
-.clearfix:before, .clearfix:after {
+
+.clearfix:before,
+.clearfix:after {
display: table;
content: "";
}
+
.clearfix:after {
clear: both;
}
+
+.hide-text {
+ font: 0/0 a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0;
+}
+
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
.hidden {
display: none;
visibility: hidden;
}
+
+.visible-phone {
+ display: none !important;
+}
+
+.visible-tablet {
+ display: none !important;
+}
+
+.hidden-desktop {
+ display: none !important;
+}
+
+@media (max-width: 767px) {
+ .visible-phone {
+ display: inherit !important;
+ }
+ .hidden-phone {
+ display: none !important;
+ }
+ .hidden-desktop {
+ display: inherit !important;
+ }
+ .visible-desktop {
+ display: none !important;
+ }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+ .visible-tablet {
+ display: inherit !important;
+ }
+ .hidden-tablet {
+ display: none !important;
+ }
+ .hidden-desktop {
+ display: inherit !important;
+ }
+ .visible-desktop {
+ display: none !important ;
+ }
+}
+
@media (max-width: 480px) {
.nav-collapse {
-webkit-transform: translate3d(0, 0, 0);
@@ -29,34 +95,8 @@
display: block;
line-height: 18px;
}
- input[class*="span"],
- select[class*="span"],
- textarea[class*="span"],
- .uneditable-input {
- display: block;
- width: 100%;
- min-height: 28px;
- /* Make inputs at least the height of their button counterpart */
-
- /* Makes inputs behave like true block-level elements */
-
- -webkit-box-sizing: border-box;
- /* Older Webkit */
-
- -moz-box-sizing: border-box;
- /* Older FF */
-
- -ms-box-sizing: border-box;
- /* IE8 */
-
- box-sizing: border-box;
- /* CSS3 spec*/
-
- }
- .input-prepend input[class*="span"], .input-append input[class*="span"] {
- width: auto;
- }
- input[type="checkbox"], input[type="radio"] {
+ input[type="checkbox"],
+ input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
@@ -72,14 +112,14 @@
padding-top: 0;
}
.form-horizontal .form-actions {
+ padding-right: 10px;
padding-left: 10px;
- padding-right: 10px;
}
.modal {
position: absolute;
top: 10px;
+ right: 10px;
left: 10px;
- right: 10px;
width: auto;
margin: 0;
}
@@ -94,30 +134,77 @@
position: static;
}
}
+
@media (max-width: 767px) {
+ body {
+ padding-right: 20px;
+ padding-left: 20px;
+ }
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
+ margin-right: -20px;
+ margin-left: -20px;
+ }
+ .container-fluid {
+ padding: 0;
+ }
+ .dl-horizontal dt {
+ float: none;
+ width: auto;
+ clear: none;
+ text-align: left;
+ }
+ .dl-horizontal dd {
+ margin-left: 0;
+ }
.container {
width: auto;
- padding: 0 20px;
}
.row-fluid {
width: 100%;
}
- .row {
+ .row,
+ .thumbnails {
margin-left: 0;
}
- .row > [class*="span"], .row-fluid > [class*="span"] {
+ [class*="span"],
+ .row-fluid [class*="span"] {
+ display: block;
float: none;
+ width: auto;
+ margin-left: 0;
+ }
+ .input-large,
+ .input-xlarge,
+ .input-xxlarge,
+ input[class*="span"],
+ select[class*="span"],
+ textarea[class*="span"],
+ .uneditable-input {
display: block;
+ width: 100%;
+ min-height: 28px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+ .input-prepend input,
+ .input-append input,
+ .input-prepend input[class*="span"],
+ .input-append input[class*="span"] {
+ display: inline-block;
width: auto;
- margin: 0;
}
}
+
@media (min-width: 768px) and (max-width: 979px) {
.row {
margin-left: -20px;
*zoom: 1;
}
- .row:before, .row:after {
+ .row:before,
+ .row:after {
display: table;
content: "";
}
@@ -128,281 +215,232 @@
float: left;
margin-left: 20px;
}
- .span1 {
- width: 42px;
+ .container,
+ .navbar-fixed-top .container,
+ .navbar-fixed-bottom .container {
+ width: 724px;
}
- .span2 {
- width: 104px;
+ .span12 {
+ width: 724px;
}
- .span3 {
- width: 166px;
+ .span11 {
+ width: 662px;
}
- .span4 {
- width: 228px;
+ .span10 {
+ width: 600px;
}
- .span5 {
- width: 290px;
+ .span9 {
+ width: 538px;
}
- .span6 {
- width: 352px;
+ .span8 {
+ width: 476px;
}
.span7 {
width: 414px;
}
- .span8 {
- width: 476px;
+ .span6 {
+ width: 352px;
}
- .span9 {
- width: 538px;
+ .span5 {
+ width: 290px;
}
- .span10 {
- width: 600px;
+ .span4 {
+ width: 228px;
}
- .span11 {
- width: 662px;
+ .span3 {
+ width: 166px;
}
- .span12, .container {
- width: 724px;
+ .span2 {
+ width: 104px;
}
- .offset1 {
- margin-left: 82px;
+ .span1 {
+ width: 42px;
}
- .offset2 {
- margin-left: 144px;
+ .offset12 {
+ margin-left: 764px;
}
- .offset3 {
- margin-left: 206px;
+ .offset11 {
+ margin-left: 702px;
}
- .offset4 {
- margin-left: 268px;
+ .offset10 {
+ margin-left: 640px;
}
- .offset5 {
- margin-left: 330px;
+ .offset9 {
+ margin-left: 578px;
}
- .offset6 {
- margin-left: 392px;
+ .offset8 {
+ margin-left: 516px;
}
.offset7 {
margin-left: 454px;
}
- .offset8 {
- margin-left: 516px;
+ .offset6 {
+ margin-left: 392px;
}
- .offset9 {
- margin-left: 578px;
+ .offset5 {
+ margin-left: 330px;
}
- .offset10 {
- margin-left: 640px;
+ .offset4 {
+ margin-left: 268px;
}
- .offset11 {
- margin-left: 702px;
+ .offset3 {
+ margin-left: 206px;
}
+ .offset2 {
+ margin-left: 144px;
+ }
+ .offset1 {
+ margin-left: 82px;
+ }
.row-fluid {
width: 100%;
*zoom: 1;
}
- .row-fluid:before, .row-fluid:after {
+ .row-fluid:before,
+ .row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
+ display: block;
float: left;
+ width: 100%;
+ min-height: 28px;
margin-left: 2.762430939%;
+ *margin-left: 2.709239449638298%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
- .row-fluid > .span1 {
- width: 5.801104972%;
+ .row-fluid .span12 {
+ width: 99.999999993%;
+ *width: 99.9468085036383%;
}
- .row-fluid > .span2 {
- width: 14.364640883%;
+ .row-fluid .span11 {
+ width: 91.436464082%;
+ *width: 91.38327259263829%;
}
- .row-fluid > .span3 {
- width: 22.928176794%;
+ .row-fluid .span10 {
+ width: 82.87292817100001%;
+ *width: 82.8197366816383%;
}
- .row-fluid > .span4 {
- width: 31.491712705%;
+ .row-fluid .span9 {
+ width: 74.30939226%;
+ *width: 74.25620077063829%;
}
- .row-fluid > .span5 {
- width: 40.055248616%;
+ .row-fluid .span8 {
+ width: 65.74585634900001%;
+ *width: 65.6926648596383%;
}
- .row-fluid > .span6 {
- width: 48.618784527%;
- }
- .row-fluid > .span7 {
+ .row-fluid .span7 {
width: 57.182320438000005%;
+ *width: 57.129128948638304%;
}
- .row-fluid > .span8 {
- width: 65.74585634900001%;
+ .row-fluid .span6 {
+ width: 48.618784527%;
+ *width: 48.5655930376383%;
}
- .row-fluid > .span9 {
- width: 74.30939226%;
+ .row-fluid .span5 {
+ width: 40.055248616%;
+ *width: 40.0020571266383%;
}
- .row-fluid > .span10 {
- width: 82.87292817100001%;
+ .row-fluid .span4 {
+ width: 31.491712705%;
+ *width: 31.4385212156383%;
}
- .row-fluid > .span11 {
- width: 91.436464082%;
+ .row-fluid .span3 {
+ width: 22.928176794%;
+ *width: 22.874985304638297%;
}
- .row-fluid > .span12 {
- width: 99.999999993%;
+ .row-fluid .span2 {
+ width: 14.364640883%;
+ *width: 14.311449393638298%;
}
- input.span1, textarea.span1, .uneditable-input.span1 {
- width: 32px;
+ .row-fluid .span1 {
+ width: 5.801104972%;
+ *width: 5.747913482638298%;
}
- input.span2, textarea.span2, .uneditable-input.span2 {
- width: 94px;
+ input,
+ textarea,
+ .uneditable-input {
+ margin-left: 0;
}
- input.span3, textarea.span3, .uneditable-input.span3 {
- width: 156px;
+ input.span12,
+ textarea.span12,
+ .uneditable-input.span12 {
+ width: 714px;
}
- input.span4, textarea.span4, .uneditable-input.span4 {
- width: 218px;
+ input.span11,
+ textarea.span11,
+ .uneditable-input.span11 {
+ width: 652px;
}
- input.span5, textarea.span5, .uneditable-input.span5 {
- width: 280px;
+ input.span10,
+ textarea.span10,
+ .uneditable-input.span10 {
+ width: 590px;
}
- input.span6, textarea.span6, .uneditable-input.span6 {
- width: 342px;
+ input.span9,
+ textarea.span9,
+ .uneditable-input.span9 {
+ width: 528px;
}
- input.span7, textarea.span7, .uneditable-input.span7 {
- width: 404px;
- }
- input.span8, textarea.span8, .uneditable-input.span8 {
+ input.span8,
+ textarea.span8,
+ .uneditable-input.span8 {
width: 466px;
}
- input.span9, textarea.span9, .uneditable-input.span9 {
- width: 528px;
+ input.span7,
+ textarea.span7,
+ .uneditable-input.span7 {
+ width: 404px;
}
- input.span10, textarea.span10, .uneditable-input.span10 {
- width: 590px;
+ input.span6,
+ textarea.span6,
+ .uneditable-input.span6 {
+ width: 342px;
}
- input.span11, textarea.span11, .uneditable-input.span11 {
- width: 652px;
+ input.span5,
+ textarea.span5,
+ .uneditable-input.span5 {
+ width: 280px;
}
- input.span12, textarea.span12, .uneditable-input.span12 {
- width: 714px;
+ input.span4,
+ textarea.span4,
+ .uneditable-input.span4 {
+ width: 218px;
}
-}
-@media (max-width: 979px) {
- body {
- padding-top: 0;
+ input.span3,
+ textarea.span3,
+ .uneditable-input.span3 {
+ width: 156px;
}
- .navbar-fixed-top {
- position: static;
- margin-bottom: 18px;
+ input.span2,
+ textarea.span2,
+ .uneditable-input.span2 {
+ width: 94px;
}
- .navbar-fixed-top .navbar-inner {
- padding: 5px;
+ input.span1,
+ textarea.span1,
+ .uneditable-input.span1 {
+ width: 32px;
}
- .navbar .container {
- width: auto;
- padding: 0;
- }
- .navbar .brand {
- padding-left: 10px;
- padding-right: 10px;
- margin: 0 0 0 -5px;
- }
- .navbar .nav-collapse {
- clear: left;
- }
- .navbar .nav {
- float: none;
- margin: 0 0 9px;
- }
- .navbar .nav > li {
- float: none;
- }
- .navbar .nav > li > a {
- margin-bottom: 2px;
- }
- .navbar .nav > .divider-vertical {
- display: none;
- }
- .navbar .nav .nav-header {
- color: #999999;
- text-shadow: none;
- }
- .navbar .nav > li > a, .navbar .dropdown-menu a {
- padding: 6px 15px;
- font-weight: bold;
- color: #999999;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- }
- .navbar .dropdown-menu li + li a {
- margin-bottom: 2px;
- }
- .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
- background-color: #222222;
- }
- .navbar .dropdown-menu {
- position: static;
- top: auto;
- left: auto;
- float: none;
- display: block;
- max-width: none;
- margin: 0 15px;
- padding: 0;
- background-color: transparent;
- border: none;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
- }
- .navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
- display: none;
- }
- .navbar .dropdown-menu .divider {
- display: none;
- }
- .navbar-form, .navbar-search {
- float: none;
- padding: 9px 15px;
- margin: 9px 0;
- border-top: 1px solid #222222;
- border-bottom: 1px solid #222222;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- }
- .navbar .nav.pull-right {
- float: none;
- margin-left: 0;
- }
- .navbar-static .navbar-inner {
- padding-left: 10px;
- padding-right: 10px;
- }
- .btn-navbar {
- display: block;
- }
- .nav-collapse {
- overflow: hidden;
- height: 0;
- }
}
-@media (min-width: 980px) {
- .nav-collapse.collapse {
- height: auto !important;
- }
-}
+
@media (min-width: 1200px) {
.row {
margin-left: -30px;
*zoom: 1;
}
- .row:before, .row:after {
+ .row:before,
+ .row:after {
display: table;
content: "";
}
@@ -413,169 +451,358 @@
float: left;
margin-left: 30px;
}
- .span1 {
- width: 70px;
+ .container,
+ .navbar-fixed-top .container,
+ .navbar-fixed-bottom .container {
+ width: 1170px;
}
- .span2 {
- width: 170px;
+ .span12 {
+ width: 1170px;
}
- .span3 {
- width: 270px;
+ .span11 {
+ width: 1070px;
}
- .span4 {
- width: 370px;
+ .span10 {
+ width: 970px;
}
- .span5 {
- width: 470px;
+ .span9 {
+ width: 870px;
}
- .span6 {
- width: 570px;
+ .span8 {
+ width: 770px;
}
.span7 {
width: 670px;
}
- .span8 {
- width: 770px;
+ .span6 {
+ width: 570px;
}
- .span9 {
- width: 870px;
+ .span5 {
+ width: 470px;
}
- .span10 {
- width: 970px;
+ .span4 {
+ width: 370px;
}
- .span11 {
- width: 1070px;
+ .span3 {
+ width: 270px;
}
- .span12, .container {
- width: 1170px;
+ .span2 {
+ width: 170px;
}
- .offset1 {
- margin-left: 130px;
+ .span1 {
+ width: 70px;
}
- .offset2 {
- margin-left: 230px;
+ .offset12 {
+ margin-left: 1230px;
}
- .offset3 {
- margin-left: 330px;
+ .offset11 {
+ margin-left: 1130px;
}
- .offset4 {
- margin-left: 430px;
+ .offset10 {
+ margin-left: 1030px;
}
- .offset5 {
- margin-left: 530px;
+ .offset9 {
+ margin-left: 930px;
}
- .offset6 {
- margin-left: 630px;
+ .offset8 {
+ margin-left: 830px;
}
.offset7 {
margin-left: 730px;
}
- .offset8 {
- margin-left: 830px;
+ .offset6 {
+ margin-left: 630px;
}
- .offset9 {
- margin-left: 930px;
+ .offset5 {
+ margin-left: 530px;
}
- .offset10 {
- margin-left: 1030px;
+ .offset4 {
+ margin-left: 430px;
}
- .offset11 {
- margin-left: 1130px;
+ .offset3 {
+ margin-left: 330px;
}
+ .offset2 {
+ margin-left: 230px;
+ }
+ .offset1 {
+ margin-left: 130px;
+ }
.row-fluid {
width: 100%;
*zoom: 1;
}
- .row-fluid:before, .row-fluid:after {
+ .row-fluid:before,
+ .row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
+ display: block;
float: left;
+ width: 100%;
+ min-height: 28px;
margin-left: 2.564102564%;
+ *margin-left: 2.510911074638298%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
- .row-fluid > .span1 {
- width: 5.982905983%;
+ .row-fluid .span12 {
+ width: 100%;
+ *width: 99.94680851063829%;
}
- .row-fluid > .span2 {
- width: 14.529914530000001%;
+ .row-fluid .span11 {
+ width: 91.45299145300001%;
+ *width: 91.3997999636383%;
}
- .row-fluid > .span3 {
- width: 23.076923077%;
+ .row-fluid .span10 {
+ width: 82.905982906%;
+ *width: 82.8527914166383%;
}
- .row-fluid > .span4 {
- width: 31.623931624%;
+ .row-fluid .span9 {
+ width: 74.358974359%;
+ *width: 74.30578286963829%;
}
- .row-fluid > .span5 {
- width: 40.170940171000005%;
+ .row-fluid .span8 {
+ width: 65.81196581200001%;
+ *width: 65.7587743226383%;
}
- .row-fluid > .span6 {
+ .row-fluid .span7 {
+ width: 57.264957265%;
+ *width: 57.2117657756383%;
+ }
+ .row-fluid .span6 {
width: 48.717948718%;
+ *width: 48.6647572286383%;
}
- .row-fluid > .span7 {
- width: 57.264957265%;
+ .row-fluid .span5 {
+ width: 40.170940171000005%;
+ *width: 40.117748681638304%;
}
- .row-fluid > .span8 {
- width: 65.81196581200001%;
+ .row-fluid .span4 {
+ width: 31.623931624%;
+ *width: 31.5707401346383%;
}
- .row-fluid > .span9 {
- width: 74.358974359%;
+ .row-fluid .span3 {
+ width: 23.076923077%;
+ *width: 23.0237315876383%;
}
- .row-fluid > .span10 {
- width: 82.905982906%;
+ .row-fluid .span2 {
+ width: 14.529914530000001%;
+ *width: 14.4767230406383%;
}
- .row-fluid > .span11 {
- width: 91.45299145300001%;
+ .row-fluid .span1 {
+ width: 5.982905983%;
+ *width: 5.929714493638298%;
}
- .row-fluid > .span12 {
- width: 100%;
+ input,
+ textarea,
+ .uneditable-input {
+ margin-left: 0;
}
- input.span1, textarea.span1, .uneditable-input.span1 {
- width: 60px;
+ input.span12,
+ textarea.span12,
+ .uneditable-input.span12 {
+ width: 1160px;
}
- input.span2, textarea.span2, .uneditable-input.span2 {
- width: 160px;
+ input.span11,
+ textarea.span11,
+ .uneditable-input.span11 {
+ width: 1060px;
}
- input.span3, textarea.span3, .uneditable-input.span3 {
- width: 260px;
+ input.span10,
+ textarea.span10,
+ .uneditable-input.span10 {
+ width: 960px;
}
- input.span4, textarea.span4, .uneditable-input.span4 {
- width: 360px;
+ input.span9,
+ textarea.span9,
+ .uneditable-input.span9 {
+ width: 860px;
}
- input.span5, textarea.span5, .uneditable-input.span5 {
- width: 460px;
+ input.span8,
+ textarea.span8,
+ .uneditable-input.span8 {
+ width: 760px;
}
- input.span6, textarea.span6, .uneditable-input.span6 {
+ input.span7,
+ textarea.span7,
+ .uneditable-input.span7 {
+ width: 660px;
+ }
+ input.span6,
+ textarea.span6,
+ .uneditable-input.span6 {
width: 560px;
}
- input.span7, textarea.span7, .uneditable-input.span7 {
- width: 660px;
+ input.span5,
+ textarea.span5,
+ .uneditable-input.span5 {
+ width: 460px;
}
- input.span8, textarea.span8, .uneditable-input.span8 {
- width: 760px;
+ input.span4,
+ textarea.span4,
+ .uneditable-input.span4 {
+ width: 360px;
}
- input.span9, textarea.span9, .uneditable-input.span9 {
- width: 860px;
+ input.span3,
+ textarea.span3,
+ .uneditable-input.span3 {
+ width: 260px;
}
- input.span10, textarea.span10, .uneditable-input.span10 {
- width: 960px;
+ input.span2,
+ textarea.span2,
+ .uneditable-input.span2 {
+ width: 160px;
}
- input.span11, textarea.span11, .uneditable-input.span11 {
- width: 1060px;
+ input.span1,
+ textarea.span1,
+ .uneditable-input.span1 {
+ width: 60px;
}
- input.span12, textarea.span12, .uneditable-input.span12 {
- width: 1160px;
- }
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
}
+ .row-fluid .thumbnails {
+ margin-left: 0;
+ }
}
+
+@media (max-width: 979px) {
+ body {
+ padding-top: 0;
+ }
+ .navbar-fixed-top {
+ position: static;
+ margin-bottom: 18px;
+ }
+ .navbar-fixed-top .navbar-inner {
+ padding: 5px;
+ }
+ .navbar .container {
+ width: auto;
+ padding: 0;
+ }
+ .navbar .brand {
+ padding-right: 10px;
+ padding-left: 10px;
+ margin: 0 0 0 -5px;
+ }
+ .nav-collapse {
+ clear: both;
+ }
+ .nav-collapse .nav {
+ float: none;
+ margin: 0 0 9px;
+ }
+ .nav-collapse .nav > li {
+ float: none;
+ }
+ .nav-collapse .nav > li > a {
+ margin-bottom: 2px;
+ }
+ .nav-collapse .nav > .divider-vertical {
+ display: none;
+ }
+ .nav-collapse .nav .nav-header {
+ color: #999999;
+ text-shadow: none;
+ }
+ .nav-collapse .nav > li > a,
+ .nav-collapse .dropdown-menu a {
+ padding: 6px 15px;
+ font-weight: bold;
+ color: #999999;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ }
+ .nav-collapse .btn {
+ padding: 4px 10px 4px;
+ font-weight: normal;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ }
+ .nav-collapse .dropdown-menu li + li a {
+ margin-bottom: 2px;
+ }
+ .nav-collapse .nav > li > a:hover,
+ .nav-collapse .dropdown-menu a:hover {
+ background-color: #222222;
+ }
+ .nav-collapse.in .btn-group {
+ padding: 0;
+ margin-top: 5px;
+ }
+ .nav-collapse .dropdown-menu {
+ position: static;
+ top: auto;
+ left: auto;
+ display: block;
+ float: none;
+ max-width: none;
+ padding: 0;
+ margin: 0 15px;
+ background-color: transparent;
+ border: none;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .nav-collapse .dropdown-menu:before,
+ .nav-collapse .dropdown-menu:after {
+ display: none;
+ }
+ .nav-collapse .dropdown-menu .divider {
+ display: none;
+ }
+ .nav-collapse .navbar-form,
+ .nav-collapse .navbar-search {
+ float: none;
+ padding: 9px 15px;
+ margin: 9px 0;
+ border-top: 1px solid #222222;
+ border-bottom: 1px solid #222222;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ }
+ .navbar .nav-collapse .nav.pull-right {
+ float: none;
+ margin-left: 0;
+ }
+ .nav-collapse,
+ .nav-collapse.collapse {
+ height: 0;
+ overflow: hidden;
+ }
+ .navbar .btn-navbar {
+ display: block;
+ }
+ .navbar-static .navbar-inner {
+ padding-right: 10px;
+ padding-left: 10px;
+ }
+}
+
+@media (min-width: 980px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ overflow: visible !important;
+ }
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.min.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.min.css 2012-05-17 00:18:37 UTC (rev 9531)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap-responsive.min.css 2012-05-17 09:25:33 UTC (rev 9532)
@@ -1,4 +1,9 @@
-.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
-.clearfix:after{clear:both;}
-.hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:767px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12,.container{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .offset11{margin-left:702px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.762430939%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid>.span1{width:5.801104972%;} .row-fluid>.span2{width:14.364640883%;} .row-fluid>.span3{width:22.928176794%;} .row-fluid>.span4{width:31.491712705%;} .row-fluid>.span5{width:40.055248616%;} .row-fluid>.span6{width:48.618784527%;} .row-fluid>.span7{width:57.182320438000005%;} .row-fluid>.span8{width:65.74585634900001%;} .row-fluid>.span9{width:74.30939226%;} .row-fluid>.span10{width:82.87292817100001%;} .row-fluid>.span11{width:91.436464082%;} .row-fluid>.span12{width:99.999999993%;} input.span1,textarea.span1,.uneditable-input.span1{width:32px;} input.span2,textarea.span2,.uneditable-input.span2{width:94px;} input.span3,textarea.span3,.uneditable-input.span3{width:156px;} input.span4,textarea.span4,.uneditable-input.span4{width:218px;} input.span5,textarea.span5,.uneditable-input.span5{width:280px;} input.span6,textarea.span6,.uneditable-input.span6{width:342px;} input.span7,textarea.span7,.uneditable-input.span7{width:404px;} input.span8,textarea.span8,.uneditable-input.span8{width:466px;} input.span9,textarea.span9,.uneditable-input.span9{width:528px;} input.span10,textarea.span10,.uneditable-input.span10{width:590px;} input.span11,textarea.span11,.uneditable-input.span11{width:652px;} input.span12,textarea.span12,.uneditable-input.span12{width:714px;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-fixed-top .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.divider-vertical{display:none;} .navbar .nav .nav-header{color:#999999;text-shadow:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12,.container{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.564102564%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid>.span1{width:5.982905983%;} .row-fluid>.span2{width:14.529914530000001%;} .row-fluid>.span3{width:23.076923077%;} .row-fluid>.span4{width:31.623931624%;} .row-fluid>.span5{width:40.170940171000005%;} .row-fluid>.span6{width:48.717948718%;} .row-fluid>.span7{width:57.264957265%;} .row-fluid>.span8{width:65.81196581200001%;} .row-fluid>.span9{width:74.358974359%;} .row-fluid>.span10{width:82.905982906%;} .row-fluid>.span11{width:91.45299145300001%;} .row-fluid>.span12{width:100%;} input.span1,textarea.span1,.uneditable-input.span1{width:60px;} input.span2,textarea.span2,.uneditable-input.span2{width:160px;} input.span3,textarea.span3,.uneditable-input.span3{width:260px;} input.span4,textarea.span4,.uneditable-input.span4{width:360px;} input.span5,textarea.span5,.uneditable-input.span5{width:460px;} input.span6,textarea.span6,.uneditable-input.span6{width:560px;} input.span7,textarea.span7,.uneditable-input.span7{width:660px;} input.span8,textarea.span8,.uneditable-input.span8{width:760px;} input.span9,textarea.span9,.uneditable-input.span9{width:860px;} input.span10,textarea.span10,.uneditable-input.span10{width:960px;} input.span11,textarea.span11,.uneditable-input.span11{width:1060px;} input.span12,textarea.span12,.uneditable-input.span12{width:1160px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}}
+/*!
+ * Bootstrap Responsive v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}@media(max-width:767px){.visible-phone{display:inherit!important}.hidden-phone{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(min-width:768px) and (max-width:979px){.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:18px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.modal{position:absolute;top:10px;right:10px;left:10px;width:auto;margin:0}.modal.fade.in{top:auto}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:auto;margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.762430939%;*margin-left:2.709239449638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.999999993%;*width:99.9468085036383%}.row-fluid .span11{width:91.436464082%;*width:91.38327259263829%}.row-fluid .span10{width:82.87292817100001%;*width:82.8197366816383%}.row-fluid .span9{width:74.30939226%;*width:74.25620077063829%}.row-fluid .span8{width:65.74585634900001%;*width:65.6926648596383%}.row-fluid .span7{width:57.182320438000005%;*width:57.129128948638304%}.row-fluid .span6{width:48.618784527%;*width:48.5655930376383%}.row-fluid .span5{width:40.055248616%;*width:40.0020571266383%}.row-fluid .span4{width:31.491712705%;*width:31.4385212156383%}.row-fluid .span3{width:22.928176794%;*width:22.874985304638297%}.row-fluid .span2{width:14.364640883%;*width:14.311449393638298%}.row-fluid .span1{width:5.801104972%;*width:5.747913482638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:714px}input.span11,textarea.span11,.uneditable-input.span11{width:652px}input.span10,textarea.span10,.uneditable-input.span10{width:590px}input.span9,textarea.span9,.uneditable-input.span9{width:528px}input.span8,textarea.span8,.uneditable-input.span8{width:466px}input.span7,textarea.span7,.uneditable-input.span7{width:404px}input.span6,textarea.span6,.uneditable-input.span6{width:342px}input.span5,textarea.span5,.uneditable-input.span5{width:280px}input.span4,textarea.span4,.uneditable-input.span4{width:218px}input.span3,textarea.span3,.uneditable-input.span3{width:156px}input.span2,textarea.span2,.uneditable-input.span2{width:94px}input.span1,textarea.span1,.uneditable-input.span1{width:32px}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:30px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.564102564%;*margin-left:2.510911074638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145300001%;*width:91.3997999636383%}.row-fluid .span10{width:82.905982906%;*width:82.8527914166383%}.row-fluid .span9{width:74.358974359%;*width:74.30578286963829%}.row-fluid .span8{width:65.81196581200001%;*width:65.7587743226383%}.row-fluid .span7{width:57.264957265%;*width:57.2117657756383%}.row-fluid .span6{width:48.717948718%;*width:48.6647572286383%}.row-fluid .span5{width:40.170940171000005%;*width:40.117748681638304%}.row-fluid .span4{width:31.623931624%;*width:31.5707401346383%}.row-fluid .span3{width:23.076923077%;*width:23.0237315876383%}.row-fluid .span2{width:14.529914530000001%;*width:14.4767230406383%}.row-fluid .span1{width:5.982905983%;*width:5.929714493638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:1160px}input.span11,textarea.span11,.uneditable-input.span11{width:1060px}input.span10,textarea.span10,.uneditable-input.span10{width:960px}input.span9,textarea.span9,.uneditable-input.span9{width:860px}input.span8,textarea.span8,.uneditable-input.span8{width:760px}input.span7,textarea.span7,.uneditable-input.span7{width:660px}input.span6,textarea.span6,.uneditable-input.span6{width:560px}input.span5,textarea.span5,.uneditable-input.span5{width:460px}input.span4,textarea.span4,.uneditable-input.span4{width:360px}input.span3,textarea.span3,.uneditable-input.span3{width:260px}input.span2,textarea.span2,.uneditable-input.span2{width:160px}input.span1,textarea.span1,.uneditable-input.span1{width:60px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top{position:static;margin-bottom:18px}.navbar-fixed-top .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 9px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#999;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#222}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:block;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap.css 2012-05-17 00:18:37 UTC (rev 9531)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/bootstrap.css 2012-05-17 09:25:33 UTC (rev 9532)
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -7,6 +7,7 @@
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
+
article,
aside,
details,
@@ -19,45 +20,59 @@
section {
display: block;
}
-audio, canvas, video {
+
+audio,
+canvas,
+video {
display: inline-block;
*display: inline;
*zoom: 1;
}
+
audio:not([controls]) {
display: none;
}
+
html {
font-size: 100%;
-webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
}
+
a:focus {
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
-a:hover, a:active {
+
+a:hover,
+a:active {
outline: 0;
}
-sub, sup {
+
+sub,
+sup {
position: relative;
font-size: 75%;
line-height: 0;
vertical-align: baseline;
}
+
sup {
top: -0.5em;
}
+
sub {
bottom: -0.25em;
}
+
img {
max-width: 100%;
- height: auto;
+ vertical-align: middle;
border: 0;
-ms-interpolation-mode: bicubic;
}
+
button,
input,
select,
@@ -66,14 +81,19 @@
font-size: 100%;
vertical-align: middle;
}
-button, input {
+
+button,
+input {
*overflow: visible;
line-height: normal;
}
-button::-moz-focus-inner, input::-moz-focus-inner {
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
padding: 0;
border: 0;
}
+
button,
input[type="button"],
input[type="reset"],
@@ -81,29 +101,56 @@
cursor: pointer;
-webkit-appearance: button;
}
+
input[type="search"] {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
-webkit-appearance: textfield;
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
}
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
+
textarea {
overflow: auto;
vertical-align: top;
}
+
.clearfix {
*zoom: 1;
}
-.clearfix:before, .clearfix:after {
+
+.clearfix:before,
+.clearfix:after {
display: table;
content: "";
}
+
.clearfix:after {
clear: both;
}
+
+.hide-text {
+ font: 0/0 a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0;
+}
+
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -112,193 +159,282 @@
color: #333333;
background-color: #ffffff;
}
+
a {
color: #0088cc;
text-decoration: none;
}
+
a:hover {
color: #005580;
text-decoration: underline;
}
+
.row {
margin-left: -20px;
*zoom: 1;
}
-.row:before, .row:after {
+
+.row:before,
+.row:after {
display: table;
content: "";
}
+
.row:after {
clear: both;
}
+
[class*="span"] {
float: left;
margin-left: 20px;
}
-.span1 {
- width: 60px;
+
+.container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
}
-.span2 {
- width: 140px;
+
+.span12 {
+ width: 940px;
}
-.span3 {
- width: 220px;
+
+.span11 {
+ width: 860px;
}
-.span4 {
- width: 300px;
+
+.span10 {
+ width: 780px;
}
-.span5 {
- width: 380px;
+
+.span9 {
+ width: 700px;
}
-.span6 {
- width: 460px;
+
+.span8 {
+ width: 620px;
}
+
.span7 {
width: 540px;
}
-.span8 {
- width: 620px;
+
+.span6 {
+ width: 460px;
}
-.span9 {
- width: 700px;
+
+.span5 {
+ width: 380px;
}
-.span10 {
- width: 780px;
+
+.span4 {
+ width: 300px;
}
-.span11 {
- width: 860px;
+
+.span3 {
+ width: 220px;
}
-.span12, .container {
- width: 940px;
+
+.span2 {
+ width: 140px;
}
-.offset1 {
- margin-left: 100px;
+
+.span1 {
+ width: 60px;
}
-.offset2 {
- margin-left: 180px;
+
+.offset12 {
+ margin-left: 980px;
}
-.offset3 {
- margin-left: 260px;
+
+.offset11 {
+ margin-left: 900px;
}
-.offset4 {
- margin-left: 340px;
+
+.offset10 {
+ margin-left: 820px;
}
-.offset5 {
- margin-left: 420px;
+
+.offset9 {
+ margin-left: 740px;
}
-.offset6 {
- margin-left: 500px;
+
+.offset8 {
+ margin-left: 660px;
}
+
.offset7 {
margin-left: 580px;
}
-.offset8 {
- margin-left: 660px;
+
+.offset6 {
+ margin-left: 500px;
}
-.offset9 {
- margin-left: 740px;
+
+.offset5 {
+ margin-left: 420px;
}
-.offset10 {
- margin-left: 820px;
+
+.offset4 {
+ margin-left: 340px;
}
-.offset11 {
- margin-left: 900px;
+
+.offset3 {
+ margin-left: 260px;
}
+
+.offset2 {
+ margin-left: 180px;
+}
+
+.offset1 {
+ margin-left: 100px;
+}
+
.row-fluid {
width: 100%;
*zoom: 1;
}
-.row-fluid:before, .row-fluid:after {
+
+.row-fluid:before,
+.row-fluid:after {
display: table;
content: "";
}
+
.row-fluid:after {
clear: both;
}
-.row-fluid > [class*="span"] {
+
+.row-fluid [class*="span"] {
+ display: block;
float: left;
+ width: 100%;
+ min-height: 28px;
margin-left: 2.127659574%;
+ *margin-left: 2.0744680846382977%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
-.row-fluid > [class*="span"]:first-child {
+
+.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
-.row-fluid > .span1 {
- width: 6.382978723%;
+
+.row-fluid .span12 {
+ width: 99.99999998999999%;
+ *width: 99.94680850063828%;
}
-.row-fluid > .span2 {
- width: 14.89361702%;
+
+.row-fluid .span11 {
+ width: 91.489361693%;
+ *width: 91.4361702036383%;
}
-.row-fluid > .span3 {
- width: 23.404255317%;
+
+.row-fluid .span10 {
+ width: 82.97872339599999%;
+ *width: 82.92553190663828%;
}
-.row-fluid > .span4 {
- width: 31.914893614%;
+
+.row-fluid .span9 {
+ width: 74.468085099%;
+ *width: 74.4148936096383%;
}
-.row-fluid > .span5 {
- width: 40.425531911%;
+
+.row-fluid .span8 {
+ width: 65.95744680199999%;
+ *width: 65.90425531263828%;
}
-.row-fluid > .span6 {
+
+.row-fluid .span7 {
+ width: 57.446808505%;
+ *width: 57.3936170156383%;
+}
+
+.row-fluid .span6 {
width: 48.93617020799999%;
+ *width: 48.88297871863829%;
}
-.row-fluid > .span7 {
- width: 57.446808505%;
+
+.row-fluid .span5 {
+ width: 40.425531911%;
+ *width: 40.3723404216383%;
}
-.row-fluid > .span8 {
- width: 65.95744680199999%;
+
+.row-fluid .span4 {
+ width: 31.914893614%;
+ *width: 31.8617021246383%;
}
-.row-fluid > .span9 {
- width: 74.468085099%;
+
+.row-fluid .span3 {
+ width: 23.404255317%;
+ *width: 23.3510638276383%;
}
-.row-fluid > .span10 {
- width: 82.97872339599999%;
+
+.row-fluid .span2 {
+ width: 14.89361702%;
+ *width: 14.8404255306383%;
}
-.row-fluid > .span11 {
- width: 91.489361693%;
+
+.row-fluid .span1 {
+ width: 6.382978723%;
+ *width: 6.329787233638298%;
}
-.row-fluid > .span12 {
- width: 99.99999998999999%;
-}
+
.container {
- width: 940px;
+ margin-right: auto;
margin-left: auto;
- margin-right: auto;
*zoom: 1;
}
-.container:before, .container:after {
+
+.container:before,
+.container:after {
display: table;
content: "";
}
+
.container:after {
clear: both;
}
+
.container-fluid {
+ padding-right: 20px;
padding-left: 20px;
- padding-right: 20px;
*zoom: 1;
}
-.container-fluid:before, .container-fluid:after {
+
+.container-fluid:before,
+.container-fluid:after {
display: table;
content: "";
}
+
.container-fluid:after {
clear: both;
}
+
p {
margin: 0 0 9px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18px;
}
+
p small {
font-size: 11px;
color: #999999;
}
+
.lead {
margin-bottom: 18px;
font-size: 20px;
font-weight: 200;
line-height: 27px;
}
+
h1,
h2,
h3,
@@ -306,10 +442,12 @@
h5,
h6 {
margin: 0;
+ font-family: inherit;
font-weight: bold;
- color: #333333;
+ color: inherit;
text-rendering: optimizelegibility;
}
+
h1 small,
h2 small,
h3 small,
@@ -319,208 +457,280 @@
font-weight: normal;
color: #999999;
}
+
h1 {
font-size: 30px;
line-height: 36px;
}
+
h1 small {
font-size: 18px;
}
+
h2 {
font-size: 24px;
line-height: 36px;
}
+
h2 small {
font-size: 18px;
}
+
h3 {
+ font-size: 18px;
line-height: 27px;
- font-size: 18px;
}
+
h3 small {
font-size: 14px;
}
-h4, h5, h6 {
+
+h4,
+h5,
+h6 {
line-height: 18px;
}
+
h4 {
font-size: 14px;
}
+
h4 small {
font-size: 12px;
}
+
h5 {
font-size: 12px;
}
+
h6 {
font-size: 11px;
color: #999999;
text-transform: uppercase;
}
+
.page-header {
padding-bottom: 17px;
margin: 18px 0;
border-bottom: 1px solid #eeeeee;
}
+
.page-header h1 {
line-height: 1;
}
-ul, ol {
+
+ul,
+ol {
padding: 0;
margin: 0 0 9px 25px;
}
+
ul ul,
ul ol,
ol ol,
ol ul {
margin-bottom: 0;
}
+
ul {
list-style: disc;
}
+
ol {
list-style: decimal;
}
+
li {
line-height: 18px;
}
-ul.unstyled, ol.unstyled {
+
+ul.unstyled,
+ol.unstyled {
margin-left: 0;
list-style: none;
}
+
dl {
margin-bottom: 18px;
}
-dt, dd {
+
+dt,
+dd {
line-height: 18px;
}
+
dt {
font-weight: bold;
+ line-height: 17px;
}
+
dd {
margin-left: 9px;
}
+
+.dl-horizontal dt {
+ float: left;
+ width: 120px;
+ overflow: hidden;
+ clear: left;
+ text-align: right;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.dl-horizontal dd {
+ margin-left: 130px;
+}
+
hr {
margin: 18px 0;
border: 0;
border-top: 1px solid #eeeeee;
border-bottom: 1px solid #ffffff;
}
+
strong {
font-weight: bold;
}
+
em {
font-style: italic;
}
+
.muted {
color: #999999;
}
-abbr {
+
+abbr[title] {
+ cursor: help;
+ border-bottom: 1px dotted #ddd;
+}
+
+abbr.initialism {
font-size: 90%;
text-transform: uppercase;
- border-bottom: 1px dotted #ddd;
- cursor: help;
}
+
blockquote {
padding: 0 0 0 15px;
margin: 0 0 18px;
border-left: 5px solid #eeeeee;
}
+
blockquote p {
margin-bottom: 0;
font-size: 16px;
font-weight: 300;
line-height: 22.5px;
}
+
blockquote small {
display: block;
line-height: 18px;
color: #999999;
}
+
blockquote small:before {
content: '\2014 \00A0';
}
+
blockquote.pull-right {
float: right;
+ padding-right: 15px;
padding-left: 0;
- padding-right: 15px;
+ border-right: 5px solid #eeeeee;
border-left: 0;
- border-right: 5px solid #eeeeee;
}
-blockquote.pull-right p, blockquote.pull-right small {
+
+blockquote.pull-right p,
+blockquote.pull-right small {
text-align: right;
}
+
q:before,
q:after,
blockquote:before,
blockquote:after {
content: "";
}
+
address {
display: block;
margin-bottom: 18px;
+ font-style: normal;
line-height: 18px;
- font-style: normal;
}
+
small {
font-size: 100%;
}
+
cite {
font-style: normal;
}
-code, pre {
+
+code,
+pre {
padding: 0 3px 2px;
- font-family: Menlo, Monaco, "Courier New", monospace;
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 12px;
color: #333333;
-webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
+
code {
- padding: 3px 4px;
+ padding: 2px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
+
pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
- font-size: 12px;
+ font-size: 12.025px;
line-height: 18px;
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: pre;
+ white-space: pre-wrap;
background-color: #f5f5f5;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- white-space: pre;
- white-space: pre-wrap;
- word-break: break-all;
- word-wrap: break-word;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
}
+
pre.prettyprint {
margin-bottom: 18px;
}
+
pre code {
padding: 0;
color: inherit;
background-color: transparent;
border: 0;
}
+
.pre-scrollable {
max-height: 340px;
overflow-y: scroll;
}
+
form {
margin: 0 0 18px;
}
+
fieldset {
padding: 0;
margin: 0;
border: 0;
}
+
legend {
display: block;
width: 100%;
@@ -532,10 +742,12 @@
border: 0;
border-bottom: 1px solid #eee;
}
+
legend small {
font-size: 13.5px;
color: #999999;
}
+
label,
input,
button,
@@ -545,17 +757,20 @@
font-weight: normal;
line-height: 18px;
}
+
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
+
label {
display: block;
margin-bottom: 5px;
color: #333333;
}
+
input,
textarea,
select,
@@ -568,19 +783,27 @@
font-size: 13px;
line-height: 18px;
color: #555555;
- border: 1px solid #ccc;
+ background-color: #ffffff;
+ border: 1px solid #cccccc;
-webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
+
.uneditable-textarea {
width: auto;
height: auto;
}
-label input, label textarea, label select {
+
+label input,
+label textarea,
+label select {
display: block;
}
-input[type="image"], input[type="checkbox"], input[type="radio"] {
+
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
width: auto;
height: auto;
padding: 0;
@@ -590,32 +813,40 @@
line-height: normal;
cursor: pointer;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+ background-color: transparent;
border: 0 \9;
/* IE9 and down */
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
+
input[type="image"] {
border: 0;
}
+
input[type="file"] {
width: auto;
padding: initial;
line-height: initial;
- border: initial;
background-color: #ffffff;
background-color: initial;
+ border: initial;
-webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
-input[type="button"], input[type="reset"], input[type="submit"] {
+
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
width: auto;
height: auto;
}
-select, input[type="file"] {
+
+select,
+input[type="file"] {
height: 28px;
/* In IE7, the height of the select element cannot be changed by height, only font-size */
@@ -624,341 +855,527 @@
line-height: 28px;
}
+
input[type="file"] {
line-height: 18px \9;
}
+
select {
width: 220px;
background-color: #ffffff;
}
-select[multiple], select[size] {
+
+select[multiple],
+select[size] {
height: auto;
}
+
input[type="image"] {
-webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
+
textarea {
height: auto;
}
+
input[type="hidden"] {
display: none;
}
-.radio, .checkbox {
+
+.radio,
+.checkbox {
+ min-height: 18px;
padding-left: 18px;
}
-.radio input[type="radio"], .checkbox input[type="checkbox"] {
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
}
-.controls > .radio:first-child, .controls > .checkbox:first-child {
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
padding-top: 5px;
}
-.radio.inline, .checkbox.inline {
+
+.radio.inline,
+.checkbox.inline {
display: inline-block;
padding-top: 5px;
margin-bottom: 0;
vertical-align: middle;
}
-.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
margin-left: 10px;
}
-input, textarea {
+
+input,
+textarea {
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
- -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
- -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
- -o-transition: border linear 0.2s, box-shadow linear 0.2s;
- transition: border linear 0.2s, box-shadow linear 0.2s;
+ -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+ transition: border linear 0.2s, box-shadow linear 0.2s;
}
-input:focus, textarea:focus {
+
+input:focus,
+textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px...
[truncated message content] |
|
From: <ce...@us...> - 2012-05-17 00:18:46
|
Revision: 9531
http://xoops.svn.sourceforge.net/xoops/?rev=9531&view=rev
Author: cesag
Date: 2012-05-17 00:18:37 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Add news 1.67 RC3 french
Added Paths:
-----------
XoopsLanguages/french/modules/news/news 1.67 RC3/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/blocks.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/category_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newcategory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_storysubmit_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/story_approve_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/topic_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/newsletter.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/admin.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/blocks.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/help.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/help/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/category_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/global_newcategory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/global_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/global_storysubmit_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/index.html
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/story_approve_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/mail_template/topic_newstory_notify.tpl
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/main.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/modinfo.php
XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/newsletter.php
Removed Paths:
-------------
XoopsLanguages/french/modules/news/smallworld/
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/admin.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,238 @@
+<?php
+// $Id$
+// Support Francophone de Xoops (www.frxoops.org)
+//%%%%%% Admin Module Name Articles %%%%%
+define("_AM_DBUPDATED","Base de données mise à jour avec succès !");
+define("_AM_CONFIG","Configuration des articles");
+define("_AM_AUTOARTICLES","Articles automatisés");
+define("_AM_STORYID","ID de l'article");
+define("_AM_TITLE","Titre");
+define("_AM_TOPIC","Sujet");
+define("_AM_POSTER","Auteur");
+define("_AM_PROGRAMMED","Date et heure programmée");
+define("_AM_ACTION","Action");
+define("_AM_EDIT","Editer");
+define("_AM_DELETE","Effacer");
+define("_AM_LAST10ARTS","Les %d derniers articles");
+define("_AM_PUBLISHED","Publié le"); // Published Date
+define("_AM_GO","Ok");
+define("_AM_EDITARTICLE","Editer l'article");
+define("_AM_POSTNEWARTICLE","Poster un nouvel article");
+define("_AM_ARTPUBLISHED","Votre article a été publié !"); // mail
+define("_AM_HELLO","Bonjour %s,"); // mail
+define("_AM_YOURARTPUB","Votre article soumis sur notre site a été publié."); // mail
+define("_AM_TITLEC","Titre : "); // mail
+define("_AM_URLC","URL : "); // mail
+define("_AM_PUBLISHEDC","Publié le : "); // mail
+define("_AM_RUSUREDEL","Etes-vous sûr de vouloir supprimer cet article et tous ses commentaires ?");
+define("_AM_YES","Oui");
+define("_AM_NO","Non");
+define("_AM_INTROTEXT","Texte de l'introduction");
+define("_AM_EXTEXT","Suite du texte");
+define("_AM_ALLOWEDHTML","HTML autorisé :");
+define("_AM_DISAMILEY","Désactiver les émoticônes");
+define("_AM_DISHTML","Désactiver le HTML");
+define("_AM_APPROVE","Approuver");
+define("_AM_MOVETOTOP","Déplacer cet article au Top");
+define("_AM_CHANGEDATETIME","Changer la date et l'heure de publication");
+define("_AM_NOWSETTIME","L'heure est maintenant définie à : %s"); // %s is datetime of publish
+define("_AM_CURRENTTIME","Actuellement il est : %s"); // %s is the current datetime
+define("_AM_SETDATETIME","Paramétrer la date et l'heure de publication");
+define("_AM_MONTHC","Mois :");
+define("_AM_DAYC","Jour :");
+define("_AM_YEARC","Année :");
+define("_AM_TIMEC","Heure :");
+define("_AM_PREVIEW","Prévisualiser");
+define("_AM_SAVE","Sauvegarder");
+define("_AM_PUBINHOME","Publier en page d'accueil ?");
+define("_AM_ADD","Ajouter");
+
+//%%%%%% Admin Module Name Topics %%%%%
+
+define("_AM_ADDMTOPIC","Ajouter un sujet PRINCIPAL");
+define("_AM_TOPICNAME","Nom du sujet");
+// Attention, modifié de 40 à 255 caractères.
+define("_AM_MAX40CHAR","(maxi : 255 caractères)");
+define("_AM_TOPICIMG","Image du sujet");
+define("_AM_IMGNAEXLOC","nom de l'image + extension placé dans %s");
+define("_AM_FEXAMPLE","par exemple : games.gif");
+define("_AM_ADDSUBTOPIC","Ajouter un sous-sujet");
+define("_AM_IN","dans");
+define("_AM_MODIFYTOPIC","Modifier le sujet");
+define("_AM_MODIFY","Modifier");
+define("_AM_PARENTTOPIC","Sujet parent");
+define("_AM_SAVECHANGE","Sauvegarder les changements");
+define("_AM_DEL","Effacer");
+define("_AM_CANCEL","Annuler");
+define("_AM_WAYSYWTDTTAL","ATTENTION : Etes-vous sûr de vouloir supprimer ce sujet et tous ses articles et commentaires ?");
+
+
+// Added in Beta6
+define("_AM_TOPICSMNGR","Gestionnaire de sujets");
+define("_AM_PEARTICLES","Gestion des articles");
+define("_AM_NEWSUB","Nouvelles propositions");
+define("_AM_POSTED","Posté le");
+define("_AM_GENERALCONF","Configuration générale");
+
+
+// Added in RC2
+define("_AM_TOPICDISPLAY","Afficher l'image du sujet ?");
+define("_AM_TOPICALIGN","Position");
+define("_AM_RIGHT","Droite");
+define("_AM_LEFT","Gauche");
+
+define("_AM_EXPARTS","Articles expirés");
+define("_AM_EXPIRED","Expiré");
+define("_AM_CHANGEEXPDATETIME","Changer la date et l'heure d'expiration");
+define("_AM_SETEXPDATETIME","Paramétrer la date et l'heure d'expiration");
+define("_AM_NOWSETEXPTIME","L'heure est maintenant définie à : %s");
+
+// Added in RC3
+define("_AM_ERRORTOPICNAME", "Vous devez entrer un nom de sujet !");
+define("_AM_EMPTYNODELETE", "Rien à supprimer !");
+
+// Added 240304 (Mithrandir)
+define('_AM_GROUPPERM', "Permissions des groupes");
+define('_AM_SELFILE','Sélectionnez un fichier');
+
+// Added by Hervé
+define('_AM_UPLOAD_DBERROR_SAVE',"Erreur pendant le rattachement d'un fichier à un article");
+define('_AM_UPLOAD_ERROR',"Erreur pendant le téléchargement du fichier vers le serveur");
+define('_AM_UPLOAD_ATTACHFILE',"Fichier(s) attaché(s)");
+define('_AM_APPROVEFORM', "Permission d'approuver");
+define('_AM_SUBMITFORM', "Permission de soumettre");
+define('_AM_VIEWFORM', "Permission de consulter");
+define('_AM_APPROVEFORM_DESC', "Choisissez les groupes qui peuvent approuver les articles pour les sujets affichés");
+define('_AM_SUBMITFORM_DESC', "Choisissez les groupes qui peuvent soumettre des articles pour les sujets affichés");
+define('_AM_VIEWFORM_DESC', "Choisissez les groupes qui peuvent visualiser les sujets affichés");
+define('_AM_DELETE_SELFILES', "Supprimer les fichiers sélectionnés");
+define('_AM_TOPIC_PICTURE', "Télécharger l'image du sujet");
+define('_AM_UPLOAD_WARNING', "<b>Attention, n'oubliez pas d'appliquer les permissions d'écriture au répertoire suivant : %s </b>");
+
+define('_AM_NEWS_UPGRADECOMPLETE', "Mise à jour terminée");
+define('_AM_NEWS_UPDATEMODULE', "Mise à jour des thèmes des modules et des blocs");
+define('_AM_NEWS_UPGRADEFAILED', "La mise à jour a échouée");
+define('_AM_NEWS_UPGRADE', "Mise à jour");
+define('_AM_ADD_TOPIC', "Ajouter un sujet");
+define('_AM_ADD_TOPIC_ERROR',"Erreur, ce sujet existe déja !");
+define('_AM_ADD_TOPIC_ERROR1',"ERREUR : Impossible de selectionner ce sujet comme sujet parent !");
+define('_AM_SUB_MENU',"Publier ce sujet comme un sous-menu");
+define('_AM_SUB_MENU_YESNO',"Sous-menu ?");
+define('_AM_HITS', "Hits");
+define('_AM_CREATED', "Créé");
+
+define('_AM_TOPIC_DESCR', "Description du sujet");
+define('_AM_USERS_LIST', "Liste des utilisateurs");
+define('_AM_PUBLISH_FRONTPAGE', "Publier en première page ?");
+define('_AM_NEWS_UPGRADEFAILED1', "Impossible de créer la table 'stories_files'");
+define('_AM_NEWS_UPGRADEFAILED2', "Impossible de modifier la longueur du titre du sujet");
+define('_AM_NEWS_UPGRADEFAILED21', "Impossible d'ajouter les nouveaux champs dans la table 'topics'");
+define('_AM_NEWS_UPGRADEFAILED3', "Impossible de créer la table 'stories_votedata'");
+define('_AM_NEWS_UPGRADEFAILED4', "Impossible de créer les deux champs 'rating' and 'votes' dans la table 'story'");
+define('_AM_NEWS_UPGRADEFAILED0', "Veuillez noter les messages et tenter de corriger les problèmes avec phpMyadmin et le fichier de définition de sql disponible dans le dossier « sql » du module news");
+define('_AM_NEWS_UPGR_ACCESS_ERROR',"Erreur pour utiliser le script de mise à jour, vous devez être administrateur du module");
+define('_AM_NEWS_PRUNE_BEFORE',"Purger les articles qui ont été publiés avant le");
+define('_AM_NEWS_PRUNE_EXPIREDONLY',"Supprimer seulement les articles qui sont expirés");
+define('_AM_NEWS_PRUNE_CONFIRM',"Attention, vous êtes sur le point de supprimer définitivement les articles qui ont été publiés avant le %s (cette action ne peut être annulée). Cela représente %s articles.<br />En êtes-vous certain(e) ?");
+define('_AM_NEWS_PRUNE_TOPICS',"Se limiter aux sujets suivants");
+define('_AM_NEWS_PRUNENEWS', "Purger les articles");
+define('_AM_NEWS_EXPORT_NEWS', "Exporter les articles en XML");
+define('_AM_NEWS_EXPORT_NOTHING', "Désolé, il n'y a rien à exporter, merci de vérifier vos critères");
+define('_AM_NEWS_PRUNE_DELETED', "%d articles ont été supprimés");
+define('_AM_NEWS_PERM_WARNING', "<h2>Attention, il y a 3 formulaires, donc vous devez valider trois boutons</h2>");
+define('_AM_NEWS_EXPORT_BETWEEN', "Exporter les articles publiés entre le");
+define('_AM_NEWS_EXPORT_AND', " et ");
+define('_AM_NEWS_EXPORT_PRUNE_DSC', "Si vous ne sélectionnez rien, alors tous les sujets seront utilisés<br/> sinon, seuls les sujets selectionnés seront utilisés");
+define('_AM_NEWS_EXPORT_INCTOPICS', "Inclure la description des sujets ?");
+define('_AM_NEWS_EXPORT_ERROR', "Erreur pendant la création du fichier %s. Opération annulée.");
+define('_AM_NEWS_EXPORT_READY', "L'export du fichier au format xml est disponible pour téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas <a href='%s'>de le supprimer </a> une fois que vous avez terminé.");
+define('_AM_NEWS_RSS_URL', "URL du flux RSS");
+define('_AM_NEWS_NEWSLETTER', "Bulletin d'information");
+define('_AM_NEWS_NEWSLETTER_BETWEEN', "Sélectionner les articles publiés entre le");
+define('_AM_NEWS_NEWSLETTER_READY', "Votre Bulletin d'information est disponible au téléchargement. <br /><a rel='external' href='%s'>Cliquez sur ce lien pour le télécharger</a>.<br />N'oubliez pas de <a href='%s'>le supprimer</a> une fois que vous avez terminé.");
+define('_AM_NEWS_DELETED_OK',"Fichier supprimé avec succès");
+define('_AM_NEWS_DELETED_PB',"Un problème a été rencontré pendant la suppression du fichier");
+define('_AM_NEWS_STATS0',"Statistiques des sujets");
+define('_AM_NEWS_STATS',"Statistiques");
+define('_AM_NEWS_STATS1',"Auteurs");
+define('_AM_NEWS_STATS2',"Total");
+define('_AM_NEWS_STATS3',"Statistiques des articles");
+define('_AM_NEWS_STATS4',"Articles les plus lus");
+define('_AM_NEWS_STATS5',"Articles les moins lus");
+define('_AM_NEWS_STATS6',"Articles les mieux cotés");
+define('_AM_NEWS_STATS7',"Auteurs les plus lus");
+define('_AM_NEWS_STATS8',"Auteurs les mieux cotés");
+define('_AM_NEWS_STATS9',"Meilleurs contributeurs");
+define('_AM_NEWS_STATS10',"Statistiques par Auteurs");
+define('_AM_NEWS_STATS11',"Nombre d'articles");
+define('_AM_NEWS_HELP',"Aide");
+define("_AM_NEWS_MODULEADMIN"," - Administration");
+define("_AM_NEWS_GENERALSET", "Options du module" );
+define('_AM_NEWS_GOTOMOD','Aller au module');
+define('_AM_NEWS_NOTHING',"Désolé mais il n'y a rien à télécharger, vérifiez vos critères");
+define('_AM_NEWS_NOTHING_PRUNE',"Désolé, mais il n'y a rien à purger, vérifiez vos critères");
+define('_AM_NEWS_TOPIC_COLOR',"Couleur du sujet");
+define('_AM_NEWS_COLOR',"Couleur");
+define('_AM_NEWS_REMOVE_BR',"Convertir les balises html <br /> en un retour à la ligne ?");
+// Added in 1.3 RC2
+define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Veuillez mettre à jour le module s'il vous plait</font></a>");
+
+// Added in version 1.50
+define('_AM_NEWS_NEWSLETTER_HEADER', "Entête");
+define('_AM_NEWS_NEWSLETTER_FOOTER', "Pied de page");
+define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Supprimer les balises html ?");
+define('_AM_NEWS_VERIFY_TABLES',"Maintenir les tables");
+define('_AM_NEWS_METAGEN',"Metagen");
+define('_AM_NEWS_METAGEN_DESC',"Le Metagen est un système qui peut vous aider à avoir des pages mieux indexées par les moteurs de recherche.<br />Sauf si vous entrez vous-même les meta keywords et meta desriptions, le module les génèrera automatiquement pour chaque article.");
+define('_AM_NEWS_BLACKLIST',"Liste noire");
+define('_AM_NEWS_BLACKLIST_DESC',"Les mots contenus dans cette liste<br />ne seront pas utilisés lors de la création des meta keywords");
+define('_AM_NEWS_BLACKLIST_ADD',"Ajouter");
+define('_AM_NEWS_BLACKLIST_ADD_DSC',"Entrez des mots à ajouter dans la liste<br />(un mot par ligne)");
+define('_AM_NEWS_META_KEYWORDS_CNT',"Nombre maximal de meta mots clés à générer");
+define('_AM_NEWS_META_KEYWORDS_ORDER',"Ordre des mots clés");
+define('_AM_NEWS_META_KEYWORDS_INTEXT',"Ordre d'apparition dans le texte");
+define('_AM_NEWS_META_KEYWORDS_FREQ1',"Ordre de fréquence des mots");
+define('_AM_NEWS_META_KEYWORDS_FREQ2',"Ordre inverse de la fréquence des mots");
+
+// Added in version 1.67
+// About.php
+define('_AM_NEWS_ABOUT_RELEASEDATE',"Sorti : ");
+define('_AM_NEWS_ABOUT_UPDATEDATE',"Mise à jour : ");
+define('_AM_NEWS_ABOUT_AUTHOR',"Auteur : ");
+define('_AM_NEWS_ABOUT_CREDITS',"Remerciements : ");
+define('_AM_NEWS_ABOUT_LICENSE',"Licence : ");
+define('_AM_NEWS_ABOUT_MODULE_STATUS',"Statut : ");
+define('_AM_NEWS_ABOUT_WEBSITE',"Site internet : ");
+define('_AM_NEWS_ABOUT_AUTHOR_NAME',"Nom de l'auteur: ");
+define('_AM_NEWS_ABOUT_CHANGELOG',"Journal des modifications");
+define('_AM_NEWS_ABOUT_MODULE_INFO',"Informations sur le module");
+define('_AM_NEWS_ABOUT_AUTHOR_INFO',"Informations sur l'auteur");
+define('_AM_NEWS_ABOUT_DESCRIPTION',"Description : ");
+// Configuration check
+define("_AM_NEWS_CONFIG_CHECK","Vérification de la configuration");
+define("_AM_NEWS_CONFIG_PHP","Version minimum de PHP requise: %s (votre version actuelle est la %s)");
+define("_AM_NEWS_CONFIG_XOOPS","Version minimum de XOOPS requise: %s (votre version actuelle est la %s)");
+
+
+define ("_AM_NEWS_STATISTICS", "Statistiques des articles");
+define ("_AM_NEWS_THEREARE_STORIES", "Il y a <span class='red bold'>%s</span> Articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "Il y a <span class='red bold'>%s</span> Articles en ligne");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "Il y a <span class='red bold'>%s</span> Fichiers d'articles dans la base de données");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "Il y a <span class='red bold'>%s</span> Fichiers d'articles en ligne");
+define ("_AM_NEWS_THEREARE_TOPICS", "Il y a <span class='red bold'>%s</span> Catégories dans la base de données");
+define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "Il y a <span class='red bold'>%s</span> Catégories en ligne");
+define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "Il y a <span class='red bold'>%s</span> Articles visionnés");
+define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "Il y a <span class='red bold'>%s</span> Articles importés");
+define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "Il y a <span class='red bold'>%s</span> Articles exportés");
+
+define("_AM_NEWS_NOPERMSSET","L'autorisation ne peut être donnée : il n'y a aucun sujet créé encore! Veuillez d'abord créer un sujet.");
+
+/**
+ * @translation Communauté Francophone des Utilisateurs de Xoops
+ * @specification _LANGCODE: fr
+ * @specification _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version $Id $
+**/
+
+?>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/blocks.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/blocks.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/blocks.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,58 @@
+<?php
+// $Id$
+define("_MB_NEWS_NOTYET","Il n'y a pas encore d'article du jour.");
+define("_MB_NEWS_TMRSI","Aujourd'hui l'article le plus lu est :");
+define("_MB_NEWS_ORDER","Ordre");
+define("_MB_NEWS_DATE","Date de publication");
+define("_MB_NEWS_HITS","Nombre de lectures");
+define("_MB_NEWS_DISP","Affichage");
+define("_MB_NEWS_ARTCLS","articles");
+define("_MB_NEWS_CHARS","Longueur du titre");
+define("_MB_NEWS_LENGTH"," caractères");
+define("_MB_TITLE","Titre");
+define("_MB_POSTED","Posté le");
+define("_MB_POSTER","Expéditeur");
+define("_MB_ACTION","Action");
+define("_MB_TOPIC","Sujet");
+define("_MB_DELETE","Effacer");
+define("_MB_NEWS_RESTRICTTOPICS", "Restreindre les sujets visibles par utilisateur ?");
+define("_MB_NEWS_TEASER", "Longueur du texte de l'article (0 pour ne pas avoir de texte)");
+define("_MB_NEWS_SPOTLIGHT", "Utiliser l'option Spotlight ");
+define("_MB_NEWS_FIRST", "--Premier élément--");
+define("_MB_NEWS_IMAGE", "Image pour Spotlight");
+define("_MB_SPOTLIGHT_TOPIC", "Sélectioner le(s) sujet(s) à utiliser");
+define("_MB_SPOTLIGHT_ALL_TOPICS", "Tous les sujets");
+define("_MB_NEWS_SPOTLIGHT_ARTICLE", "Sélectionnez les articles:");
+define("_MB_READMORE","En savoir plus...");
+define("_MB_NEWS_RATE","Cotation");
+define("_MB_NEWS_SHOW_NEWS_COUNT","Montrer le compteur d'articles ?");
+define("_MB_NEWS_SPOTLIGHT_TITLE", "A la une");
+define("_MB_NEWS_VIEW_TYPE1", "Classique");
+define("_MB_NEWS_VIEW_TYPE2", "Par onglets");
+define("_MB_NEWS_TAB_COLOR1", "Couleur de la barre du haut (c'est la ligne qui est juste sous le nom de l'onglet)");
+define("_MB_NEWS_TAB_COLOR2", "Couleur de fond du contenu de l'onglet courant");
+define("_MB_NEWS_TAB_COLOR3", "Couleur de l'entête de l'onglet en cours");
+define("_MB_NEWS_TAB_COLOR4", "Couleur des entêtes des onglets non sélectionnés");
+define("_MB_NEWS_TAB_COLOR5", "Couleur de survol des onglets");
+define("_MB_NEWS_WHAT_PUBLISH", "Que souhaitez vous publier<br />pour l'article à la une ?");
+define("_MB_NEWS_RECENT_NEWS", "Les articles récents (n'utilisez pas la liste ci-dessous)");
+define("_MB_NEWS_RECENT_SPECIFIC", "Un article spécifique (voir en dessous)");
+define("_MB_NEWS_DEFAULT_COLORS", "Laissez les zones vides pour utiliser les couleurs par défaut");
+
+// Added in version 1.50
+define("_MB_NEWS_CAL_YEAR", "Année");
+define("_MB_NEWS_CAL_MONTH", "Mois");
+define("_MB_NEWS_STARTING_DATE", "Date de début");
+define("_MB_NEWS_ENDING_DATE", "Date de fin");
+define("_MB_NEWS_UNTIL_TODAY", "ou jusqu'à aujourd'hui");
+define("_MB_NEWS_RECENT_FIRST", "Les plus récents en premier");
+define("_MB_NEWS_OLDER_FIRST", "Les plus anciens en premier");
+
+/**
+ * @translation Communauté Francophone des Utilisateurs de Xoops
+ * @specification _LANGCODE: fr
+ * @specification _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version $Id $
+**/
+?>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/help.html 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,68 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Aide:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/news/admin/index.php"
+ title="Back to the administration of News"> News
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Back to the Administration of News"/>
+ </a></h1>
+
+ <h4 class="odd">Description</h4><br />
+ <p class="even">
+
+ <b>Possibilit\xE9s du module :</b><br /><br />
+ . G\xE9rer les sujets et sous-sujets<br />
+ . Cr\xE9er des autorisations strictes (qui peut lire, qui peut publier, qui peut
+ approuver)<br />
+ . Possibilit\xE9 de valider les articles par certains groupes d'utilisateurs<br />
+ . Vous pouvez mettre l'accent sur votre contenu avec quelques blocs<br />
+ . Possibilit\xE9 de lire les articles avec le fil RSS<br />
+ . Utiliser des articles automatis\xE9s et des articles p\xE9rim\xE9s<br />
+ . Recherche int\xE9gr\xE9e<br />
+ . Diff\xE9rentes statistiques pour l'administrateur du module<br />
+ . Possibilit\xE9 d'ajouter la publicit\xE9 \xE0 vos articles<br />
+ . Documentation (en fran\xE7ais pour le moment)<br />
+ . Articles \xE0 pages multiples, avec un titre personnalis\xE9 pour chaque page<br />
+ . Possibilit\xE9 d'utiliser les m\xE9tadonn\xE9es du Dublin Core<br />
+ . Possibilit\xE9 d'utiliser FireFox 2 "micror\xE9sum\xE9"<br />
+ . Favoris sociaux de type Web 2 tels que del.icio.us, newsvine.com,
+ yahoo<br />
+ . Liens vers l'article pr\xE9c\xE9dent et suivant (et un tableau r\xE9capitulatif)<br />
+ . Utilise un syst\xE8me int\xE9gr\xE9 d'alerte (par exemple lorsqu'un article est
+ publi\xE9)<br />
+ . Plusieurs blocs<br />
+ . etc<br /><br />
+
+ Le module vous aidera \xE9galement \xE0 avoir des pages aim\xE9es des moteurs de recherche
+ en utilisant des titres de pages significatifs (cr\xE9\xE9s \xE0 partir de votre contenu) et d'avoir
+ meta mots cl\xE9s et description meta cr\xE9\xE9es aussi \xE0 partir de votre contenu.
+
+ Le module peut \xE9galement \xEAtre utilis\xE9, comme c'est le cas sur certains sites, pour cr\xE9er un
+ blog<br /><br /></p>
+
+ <h4 class="odd">Comment installer le module "News"</h4><br />
+ <p class="even">
+
+ "News" est install\xE9 comme un module Xoops habituel, ce qui signifie que vous devez copier
+ le
+ dossier complet /news dans le r\xE9pertoire /modules de votre site Web. Puis
+ Connectez-vous \xE0 votre site en tant qu'administrateur, allez dans syst\xE8me d'Administration > Modules, recherchez
+ l'ic\xF4ne de "News" dans la liste des modules d\xE9sinstall\xE9s, puis cliquez sur l'ic\xF4ne
+ d'installation. Suivez les instructions \xE0 l'\xE9cran et vous serez pr\xEAt \xE0
+ commencer.<br /><br />
+ Des instructions d\xE9taill\xE9es sur l'installation de modules sont disponibles dans le
+ <a href="http://goo.gl/adT2i">Manuel des op\xE9rations de XOOPS</a> <br /><br />
+
+ V\xE9rifiez que le r\xE9pertoire modules\news\images\topics est accessible en \xE9criture
+ sur le
+ serveur (chmod=777).<br /><br />
+
+ Apr\xE8s avoir cr\xE9\xE9 votre premier sujet (cat\xE9gorie) et avant de cr\xE9er
+ votre premier
+ article, vous devez cliquer sur l'onglet des Permissions pour d\xE9finir les permissions
+ des groupes.<br /><br /></p>
+
+ <h4 class="odd">Tutoriel</h4><br />
+ <p class="even">
+ Pas disponible pour le moment.<br /></p>
+
+</div>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/index.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/index.html (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/help/index.html 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/index.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/index.html (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/index.html 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/category_newstory_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/category_newstory_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/category_newstory_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 l'adresse suivante :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuille mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newcategory_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newcategory_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newcategory_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouveau sujet d'articles "{TOPIC_NAME}" a \xE9t\xE9 cr\xE9\xE9 sur {X_SITENAME}.
+
+Suivez ce lien pour voir la page d'index des articles :
+{X_MODULE_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux sujets d'articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newstory_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newstory_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_newstory_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 l'adresse suivante :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuille mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_storysubmit_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_storysubmit_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/global_storysubmit_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 propos\xE9 sur {X_SITENAME} et est en attente d'\xEAtre approuv\xE9.
+
+Vous pouvez voir cette proposition d'article ici :
+{WAITINGSTORIES_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand de nouveaux articles sont propos\xE9s sur notre site.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/index.html
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/index.html (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/index.html 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/story_approve_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/story_approve_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/story_approve_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Votre proposition d'article "{STORY_NAME}" a \xE9t\xE9 approuv\xE9 sur {X_SITENAME}.
+
+Vous pouvez voir cet article \xE0 cette adresse :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message parce que vous avez choisi d'\xEAtre notifi\xE9 quand votre article aura \xE9t\xE9 approuv\xE9.
+
+Si c'est une erreur ou si vous ne voulez plus recevoir de tels avis, veuillez mettre \xE0 jour vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/topic_newstory_notify.tpl
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/topic_newstory_notify.tpl (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/mail_template/topic_newstory_notify.tpl 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,21 @@
+Bonjour {X_UNAME},
+
+Un nouvel article "{STORY_NAME}" a \xE9t\xE9 ajout\xE9 \xE0 {X_SITENAME} dans {TOPIC_NAME}.
+
+Vous pouvez visualiser cet article \xE0 cette adresse :
+{STORY_URL}
+
+-----------
+
+Vous recevez ce message car vous avez souhait\xE9 \xEAtre notifi\xE9 lorsque de nouveaux articles sont ajout\xE9s \xE0 notre site.
+
+Si c'est une erreur ou si vous ne souhaitez plus recevoir de notifications, veuillez mettre \xE0 jours vos notifications en visitant le lien ci-dessous :
+{X_UNSUBSCRIBE_URL}
+
+Merci de ne pas r\xE9pondre \xE0 ce message.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+L'Administrateur
+{X_ADMINMAIL}
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/main.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,144 @@
+<?php
+// $Id$
+//%%%%%% File Name index.php %%%%%
+define('_NW_PRINTER',"Version imprimable");
+define('_NW_SENDSTORY',"Envoyer cet article à un ami");
+define('_NW_READMORE',"Lire la suite...");
+define('_NW_COMMENTS',"Commentaires ?");
+define('_NW_ONECOMMENT',"1 commentaire");
+define('_NW_BYTESMORE',"%s octets en plus");
+define('_NW_NUMCOMMENTS',"%s commentaires");
+define('_NW_MORERELEASES', "Plus d'articles dans le sujet ");
+
+
+//%%%%%% File Name submit.php %%%%%
+define('_NW_SUBMITNEWS',"Proposer un article");
+define('_NW_TITLE',"Titre");
+define('_NW_TOPIC',"Sujet");
+define('_NW_THESCOOP',"Le Scoop");
+define('_NW_NOTIFYPUBLISH',"Notifier par mail lors de la publication");
+define('_NW_POST',"Publier");
+define('_NW_GO',"Ok");
+define('_NW_THANKS',"Merci pour votre participation."); //submission of news article
+
+define('_NW_NOTIFYSBJCT',"Des articles à publier sur le site"); // Notification mail subject
+define('_NW_NOTIFYMSG',"Hé! Vous avez de nouvelles propositions d'articles pour votre site."); // Notification mail message
+
+//%%%%%% File Name archive.php %%%%%
+define('_NW_NEWSARCHIVES',"Archives");
+define('_NW_ARTICLES',"Articles");
+define('_NW_VIEWS',"Lectures");
+define('_NW_DATE',"Date");
+define('_NW_ACTIONS',"Actions");
+define('_NW_PRINTERFRIENDLY',"Format imprimable");
+
+define('_NW_THEREAREINTOTAL',"Il y a %s article(s) au total");
+
+// %s is your site name
+define('_NW_INTARTICLE',"Article intéressant sur %s");
+define('_NW_INTARTFOUND',"Voici un article intéressant trouvé sur %s");
+
+define('_NW_TOPICC',"Sujet :");
+define('_NW_URL',"Site :");
+define('_NW_NOSTORY',"Désolé, l'article sélectionné n'existe pas.");
+
+//%%%%%% File Name print.php %%%%%
+
+define('_NW_URLFORSTORY',"L'adresse de cet article est :");
+
+// %s represents your site name
+define('_NW_THISCOMESFROM',"Cet article provient de %s");
+
+// Added by Hervé
+define('_NW_ATTACHEDFILES',"Fichiers attachés : ");
+define('_NW_ATTACHEDLIB',"Cet article a des fichiers attachés");
+define('_NW_NEWSSAMEAUTHORLINK',"Articles du même auteur");
+define('_NW_NEWS_NO_TOPICS',"Désolé, mais il n'y actuellement aucun sujet, merci de le créer avant de soumettre un article");
+define('_NW_PREVIOUS_ARTICLE',"Article précédent");
+define('_NW_NEXT_ARTICLE',"Article suivant");
+define('_NW_OTHER_ARTICLES',"Autres articles");
+
+// Added by Hervé in version 1.3 for rating
+define('_NW_RATETHISNEWS',"Noter cet article");
+define('_NW_RATEIT',"Notez-le !");
+define('_NW_TOTALRATE',"Total des votes");
+define('_NW_RATINGLTOH',"Notation (du score le plus bas au score le plus haut)");
+define('_NW_RATINGHTOL',"Notation (du score le plus haut au score le plus bas)");
+define('_NW_RATINGC',"Note: ");
+define('_NW_RATINGSCALE',"L'échelle va de 1 à 10, 1 étant Pas Terrible quand 10 est Excellent.");
+define('_NW_BEOBJECTIVE',"Merci de rester objectif, si tout le monde reçoit une note de 1 ou 10, la notation n'est pas très utile.");
+define('_NW_DONOTVOTE',"Merci de ne pas voter pour vos propres participations.");
+define('_NW_RATING',"Notation");
+define('_NW_VOTE',"Vote");
+define('_NW_NORATING',"Aucune note sélectionnée.");
+define('_NW_USERAVG',"Note moyenne");
+define('_NW_DLRATINGS',"Note des articles (nombre total de vote: %s)");
+define('_NW_ONEVOTE',"1 vote");
+define('_NW_NUMVOTES',"%s votes");
+define('_NW_CANTVOTEOWN',"Vous ne pouvez pas voter pour une ressource que vous avez proposé.<br />All votes are logged and reviewed.");
+define('_NW_VOTEDELETED',"Données de vote supprimées.");
+define('_NW_VOTEONCE',"Merci de ne pas voter pour une même ressource plus d'une fois.");
+define('_NW_VOTEAPPRE',"Merci pour votre vote.");
+define('_NW_THANKYOU',"Merci d'avoir pris le temps de voter ici sur %s"); // %s is your site name
+define('_NW_RSSFEED',"Flux RSS"); // Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes
+define('_NW_AUTHOR',"Auteur");
+define('_NW_META_DESCRIPTION',"Description Meta");
+define('_NW_META_KEYWORDS',"Meta mots clés");
+define('_NW_MAKEPDF',"Créer un fichier PDF à partir de cet article");
+define('_MD_POSTEDON',"Publiée le : ");
+define('_NW_AUTHOR_ID',"ID de l'auteur");
+define('_NW_POST_SORRY',"Désolé mais soit il n'y a pas de sujets soit vous n'avez pas le droit de créer des articles dans les sujets existants. Si vous êtes les webmaster, allez dans les permissions et définissez les permissions de 'Soumettre'.");
+
+// Added in v 1.50
+define('_NW_LINKS',"Liens");
+define('_NW_PAGE',"Page");
+define('_NW_BOOKMARK_ME',"Signets Sociaux");
+define('_AM_NEWS_TOTAL',"Total de %u articles");
+define('_AM_NEWS_WHOS_WHO',"Annuaire des Auteurs");
+define('_NW_NEWS_LIST_OF_AUTHORS',"Voici une liste des auteurs de ce site, cliquez sur leur nom pour voir leurs articles");
+define('_AM_NEWS_TOPICS_DIRECTORY',"Répertoire des sujets");
+define('_NW_PAGE_AUTO_SUMMARY',"Page %d %s");
+// Added in version 1.51
+define('_NW_BOOKMARK_TO_BLINKLIST',"Mettre en favoris dans Blinklist");
+define('_NW_BOOKMARK_TO_DELICIOUS',"Mettre en favoris dans del.icio.us");
+define('_NW_BOOKMARK_TO_DIGG',"Mettre en favoris dans Digg");
+define('_NW_BOOKMARK_TO_FARK',"Mettre en favoris dans Fark");
+define('_NW_BOOKMARK_TO_FURL',"Mettre en favoris dans Furl");
+define('_NW_BOOKMARK_TO_NEWSVINE',"Mettre en favoris dans Newsvine");
+define('_NW_BOOKMARK_TO_REDDIT',"Mettre en favoris dans Reddit");
+define('_NW_BOOKMARK_TO_SIMPY',"Mettre en favoris dans Simpy");
+define('_NW_BOOKMARK_TO_SPURL',"Mettre en favoris dans Spurl");
+define('_NW_BOOKMARK_TO_YAHOO',"Mettre en favoris dans Yahoo");
+
+// Added in version 1.56
+define('_NW_NOTYETSTORY',"Désolé, l'artcile sélectionné n'a pas encore été publié. Veuillez revenir plus tard.");
+define('_NW_SELECT_IMAGE', "Choisissez une image à joindre à l'article");
+define('_NW_CURENT_PICTURE', "Image actuelle");
+// Added in version 1.67
+define('_NW_BOOKMARK_TO_FACEBOOK', "Mettre en favoris dans Faceboom");
+define('_NW_BOOKMARK_TO_TWITTER', "Mettre en favoris dans Twitter");
+define('_NW_BOOKMARK_TO_SCRIPSTYLE', "Mettre en favoris dans Scripstyle");
+define('_NW_BOOKMARK_TO_STUMBLE', "Mettre en favoris dans Stumble");
+define('_NW_BOOKMARK_TO_TECHNORATI', "Mettre en favoris dans Technorati");
+define('_NW_BOOKMARK_TO_MIXX', "Mettre en favoris dans Mixx");
+define('_NW_BOOKMARK_TO_MYSPACE', "Mettre en favoris dans Myspace");
+define('_NW_BOOKMARK_TO_DESIGNFLOAT', "Mettre en favoris dans Designfloat");
+define('_NW_BOOKMARK_TO_BALATARIN', "Mettre en favoris dans Balatarin");
+define('_NW_BOOKMARK_TO_GOOLGEBUZZ', "Mettre en favoris dans Google Buzz");
+define('_NW_BOOKMARK_TO_GOOLGEREADER', "Mettre en favoris dans Google Reader");
+define('_NW_BOOKMARK_TO_GOOLGEBOOKMARKS', "Mettre en favoris dans Google Bookmarks");
+
+define('_NW_DELETE', "Supprimer");
+define('_NW_EDIT', "Editer");
+define('_NW_SUBTITLE', "Sous-titre : ");
+define('_NW_SELECT_IMAGE_DESC', "Description de l'image sélectionnée : ");
+
+/**
+ * @translation Communauté Francophone des Utilisateurs de Xoops
+ * @specification _LANGCODE: fr
+ * @specification _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version $Id $
+**/
+
+?>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/modinfo.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,210 @@
+<?php
+// $Id$
+// Module Info
+
+// The name of this module
+define('_MI_NEWS_NAME','Articles');
+
+// A brief description of this module
+define('_MI_NEWS_DESC',"Crée une section d'articles, où les utilisateurs peuvent poster des articles/commentaires.");
+
+// Names of blocks for this module (Not all module has blocks)
+define('_MI_NEWS_BNAME1',"Sujets d'articles");
+define('_MI_NEWS_BNAME3','Article du jour');
+define('_MI_NEWS_BNAME4','Top articles');
+define('_MI_NEWS_BNAME5','Articles récents');
+define('_MI_NEWS_BNAME6','Modération des articles');
+define('_MI_NEWS_BNAME7','Navigation dans les sujets');
+
+// Sub menus in main menu block
+define('_MI_NEWS_SMNAME1','Proposer un article');
+define('_MI_NEWS_SMNAME2','Archives');
+
+// Names of admin menu items
+define('_MI_NEWS_ADMENU2', 'Sujets');
+define('_MI_NEWS_ADMENU3', 'Articles');
+define('_MI_NEWS_GROUPPERMS', 'Permissions');
+// Added by Hervé for prune option
+define('_MI_NEWS_PRUNENEWS', 'Purge');
+// Added by Hervé
+define('_MI_NEWS_EXPORT', 'Export');
+
+// Title of config items
+define('_MI_STORYHOME', "Combien d'article(s) sur la page principale ?");
+define('_MI_NOTIFYSUBMIT', "Notifier par mail d'une nouvelle proposition ?");
+define('_MI_DISPLAYNAV', "Afficher la boîte de navigation en haut de chaque page ?");
+
+define('_MI_AUTOAPPROVE',"Approuver automatiquement les nouveaux articles sans l'intervention d'un administrateur ?");
+define("_MI_ALLOWEDSUBMITGROUPS", "Groupes pouvant soumettre des articles");
+define("_MI_ALLOWEDAPPROVEGROUPS", "Groupes pouvant approuver des articles");
+define("_MI_NEWSDISPLAY", "Mise en page des articles");
+define("_MI_NAMEDISPLAY","Nom d'auteur à utiliser");
+define("_MI_COLUMNMODE","Colonnes");
+define("_MI_STORYCOUNTADMIN","Nombre d'articles à afficher dans l'administration : ");
+define("_MI_UPLOADFILESIZE", "Taille maximale des fichiers joints en Ko (1048576 = 1 Méga)");
+define("_MI_UPLOADGROUPS","Groupes autorisés à joindre des fichiers aux articles");
+
+// Description of each config items
+define('_MI_STORYHOMEDSC', '');
+define('_MI_NOTIFYSUBMITDSC', '');
+define('_MI_DISPLAYNAVDSC', '');
+define('_MI_AUTOAPPROVEDSC', '');
+define("_MI_ALLOWEDSUBMITGROUPSDESC", "Les groupes sélectionnés seront autorisés à soumettre des articles");
+define("_MI_ALLOWEDAPPROVEGROUPSDESC", "Les groupes sélectionnés seront autorisés à approuver les nouveaux articles");
+define("_MI_NEWSDISPLAYDESC", "Le mode classique affiche tous les nouveaux articles triés par date de publication. Le mode Articles par sujets groupera les articles par sujet avec le dernier article développé et les autres avec juste le titre");
+define('_MI_ADISPLAYNAMEDSC', "Permet de choisir sous quelle forme le nom de l'auteur doit être affiché");
+define("_MI_COLUMNMODE_DESC","Choisissez le nombre de colonnes à utiliser pour afficher les articles (cette option n'est utilisable qu'avec le mode d'affichage 'classique')");
+define("_MI_STORYCOUNTADMIN_DESC","");
+define("_MI_UPLOADFILESIZE_DESC","");
+define("_MI_UPLOADGROUPS_DESC","Choisissez les groupes qui peuvent télécharger vers le serveur");
+
+
+// Name of config item values
+define("_MI_NEWSCLASSIC", "Classique");
+define("_MI_NEWSBYTOPIC", "Articles par sujets");
+define("_MI_DISPLAYNAME1", 'Pseudo');
+define("_MI_DISPLAYNAME2", 'Nom complet');
+define("_MI_DISPLAYNAME3", 'Aucun');
+define("_MI_UPLOAD_GROUP1","Editeurs et Approbateurs");
+define("_MI_UPLOAD_GROUP2","Approbateurs uniquement");
+define("_MI_UPLOAD_GROUP3","Téléchargement désactivé");
+
+
+// Text for notifications
+
+define('_MI_NEWS_GLOBAL_NOTIFY', 'Globale');
+define('_MI_NEWS_GLOBAL_NOTIFYDSC', 'Options de notification globale des articles.');
+
+define('_MI_NEWS_STORY_NOTIFY', 'Articles');
+define('_MI_NEWS_STORY_NOTIFYDSC', 'Options de notification s\'appliquant à l\'article actuel.');
+
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFY', 'Nouveau sujet');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYCAP', 'Notifiez-moi quand un nouveau sujet est créé.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYDSC', 'Recevoir une notification quand un nouveau sujet est créé.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFY', 'Nouvel article proposé');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYCAP', 'Notifiez-moi lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYDSC', 'Recevoir une notification lorsqu\'un nouvel article est proposé (attente d\'être approuvé).');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article proposé');
+
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFY', 'Nouvel article');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYCAP', 'Notifiez-moi quand un nouvel article est posté.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYDSC', 'Recevoir une notification quand un nouvel article est posté.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+define('_MI_NEWS_STORY_APPROVE_NOTIFY', 'Article approuvé');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYCAP', 'Notifiez-moi quand cet article est approuvé.');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYDSC', 'Recevoir une notification quand cet article est approuvé.');
+define('_MI_NEWS_STORY_APPROVE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Article approuvé');
+
+define('_MI_RESTRICTINDEX', "Restreindre les sujets sur la page d'index ?");
+define('_MI_RESTRICTINDEXDSC', "Si l'option est à Oui, les utilisateurs ne verront que les articles pour lesquels ils ont les permissions de lecture");
+
+define('_MI_NEWSBYTHISAUTHOR', 'Articles du même auteur');
+define('_MI_NEWSBYTHISAUTHORDSC', "Si vous mettez cette option à OUI, alors un lien 'Articles du même auteur' sera affiché");
+
+define('_MI_NEWS_PREVNEX_LINK','Afficher les liens vers les articles précédents et suivants ?');
+define("_MI_NEWS_PREVNEX_LINK_DESC","Si cette option est activée, deux nouveaux liens seront visibles en bas de chaque article. Ces liens seront utiles pour lire l'article précédent et suivant en fonction de la date de publication");
+define('_MI_NEWS_SUMMARY_SHOW','Afficher la table de sommaire ?');
+define('_MI_NEWS_SUMMARY_SHOW_DESC','Quand vous utilisez cette option, une table sommaire contenant les liens vers tous les articles récents publiés sur le même thème sera visible en bas de chaque article');
+define('_MI_NEWS_AUTHOR_EDIT',"Permettre aux auteurs d'éditer leurs articles ?");
+define('_MI_NEWS_AUTHOR_EDIT_DESC','Avec cette option, les auteurs pourront eux-même éditer leurs contributions.');
+define('_MI_NEWS_RATE_NEWS','Permettre aux utilisateurs de noter les articles ?');
+define('_MI_NEWS_TOPICS_RSS','Activer le flux RSS par sujet?');
+define('_MI_NEWS_TOPICS_RSS_DESC',"Si vous positionnez cette option sur 'Oui', alors les articles pour ce sujet seront disponibles sous la forme d'un flux RSS");
+define('_MI_NEWS_DATEFORMAT', "Format de Date");
+define('_MI_NEWS_DATEFORMAT_DESC',"S'il vous plaît se référer à la documentation de PHP (http://fr.php.net/manual/en/function.date.php) pour plus d'informations sur la façon de sélectionner le format. Notez que si vous ne tapez rien le format de date par défaut sera utilisé");
+define('_MI_NEWS_META_DATA', "Permettre la saisie des données meta (keywords et description) ?");
+define('_MI_NEWS_META_DATA_DESC', "Si vous positionnez cette option sur 'Oui', alors les approbateurs pourront entrer les données meta suivantes : keywords et description");
+define('_MI_NEWS_BNAME8','Articles Aléatoires');
+define('_MI_NEWS_NEWSLETTER','Bulletin d'information');
+define('_MI_NEWS_STATS','Statistiques');
+define("_MI_NEWS_FORM_OPTIONS","Option de formulaire");
+define("_MI_NEWS_FORM_COMPACT","Compact");
+define("_MI_NEWS_FORM_DHTML","DHTML");
+define("_MI_NEWS_FORM_SPAW","Éditeur Spaw");
+define("_MI_NEWS_FORM_HTMLAREA","Éditeur HtmlArea");
+define("_MI_NEWS_FORM_FCK","Éditeur FCK");
+define("_MI_NEWS_FORM_KOIVI","Éditeur Koivi");
+define("_MI_NEWS_FORM_OPTIONS_DESC","Sélectionnez l'éditeur à utiliser. Si vous avez une installation 'simple' (i.e vous utilisez seulement l'éditeur xoops fourni en standard), alors vous ne pouvez que sélectionner DHTML et Compact");
+define("_MI_NEWS_KEYWORDS_HIGH","Activer le surlignage des mots clefs de recherche ?");
+define("_MI_NEWS_KEYWORDS_HIGH_DESC","Si vous utilisez cette option, alors les mots clefs saisis dans le champ de Recherche seront surlignés dans les articles");
+define("_MI_NEWS_HIGH_COLOR","Couleur utilisée pour le surlignage des mots de recherche ?");
+define("_MI_NEWS_HIGH_COLOR_DES","Utilisez cette option seulement si vous avez choisi Oui à l'option précédente");
+define("_MI_NEWS_INFOTIPS","Nombre de caractères pris en compte dans les infobulles");
+define("_MI_NEWS_INFOTIPS_DES","Si vous utilisez cette option, les liens relatifs à des articles contiendront une infobulle reprennant les premiers (n) caractères de chaque article. Si vous paramétrez cette valeur à 0, alors l'infobulle sera vide");
+define("_MI_NEWS_SITE_NAVBAR","Utiliser la barre de navigation Mozilla et Opera ?");
+define("_MI_NEWS_SITE_NAVBAR_DESC","Si vous positionnez cette option à Oui, alors les visiteurs de votre site pourront utiliser la barre de navigation de site pour se déplacer entre vos articles.");
+define("_MI_NEWS_TABS_SKIN","Sélectionnez l'apparence à utiliser dans les onglets");
+define("_MI_NEWS_TABS_SKIN_DESC","Cet habillage sera utilisé dans tous les blocs qui utilisent des onglets");
+define("_MI_NEWS_SKIN_1","Style barre");
+define("_MI_NEWS_SKIN_2","Incliné");
+define("_MI_NEWS_SKIN_3","Classique");
+define("_MI_NEWS_SKIN_4","Dossiers");
+define("_MI_NEWS_SKIN_5","MacOs");
+define("_MI_NEWS_SKIN_6","Plat");
+define("_MI_NEWS_SKIN_7","Arrondi");
+define("_MI_NEWS_SKIN_8","Style ZDnet");
+
+// Added in version 1.50
+define('_MI_NEWS_BNAME9','Archives');
+define("_MI_NEWS_FORM_TINYEDITOR","Éditeur TinyEditor");
+define("_MI_NEWS_FOOTNOTES","Voir les liens sur les versions imprimables ?");
+define("_MI_NEWS_DUBLINCORE","Activer les métadonnées Dublin Core ?");
+define("_MI_NEWS_DUBLINCORE_DSC","Pour plus d'informations, <a href='http://fr.wikipedia.org/wiki/Dublin_Core' rel='external'>consultez ce lien</a>");
+define("_MI_NEWS_BOOKMARK_ME","Afficher un bloc 'Ajouter cette page sur ces sites' ?");
+define("_MI_NEWS_BOOKMARK_ME_DSC","Ce bloc sera visible sur la page des articles");
+define("_MI_NEWS_FF_MICROFORMAT","Activer les 'microrésumés' de Firefox 2 ?");
+define("_MI_NEWS_FF_MICROFORMAT_DSC","Pour plus d'informations, voir <a href='https://developer.mozilla.org/fr/Création_d'un_générateur_de_microrésumé' rel='external'>cette page</a>");
+define("_MI_NEWS_WHOS_WHO","Annuaire des auteurs");
+define("_MI_NEWS_METAGEN","Metagen");
+define("_MI_NEWS_TOPICS_DIRECTORY","Répertoire des sujets");
+define("_MI_NEWS_ADVERTISEMENT","Publicité");
+define("_MI_NEWS_ADV_DESCR","Entrez un texte ou du code javascript à afficher dans vos articles");
+define("_MI_NEWS_MIME_TYPES","Entrez les types mime autorisés pour le téléchargement des pièces jointes dans les articles (séparez les par un retour à la ligne)");
+define("_MI_NEWS_ENHANCED_PAGENAV","Utiliser le séparateur de pages amélioré ?");
+define("_MI_NEWS_ENHANCED_PAGENAV_DSC","Avec cette option vous pouvez séparer vos pages avec quelque chose comme cela [pagrebreak:Titre page], les liens vers les pages sont remplacés par une liste déroulante et vous pouvez utiliser [summary] pour créer un sommaire automatique des pages");
+
+// Added in version 1.54
+define('_MI_NEWS_CATEGORY_NOTIFY','Catégorie');
+define('_MI_NEWS_CATEGORY_NOTIFYDSC',"Options de notification pour la catégorie en cours");
+
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY', "Nouvel article publié");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP', "Notifiez-moi lorsqu'un nouvel article est publié dans cette catégorie.");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC', "Recevoir une notification lorsqu'un article est publié dans cette catégorie.");
+define('_MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} notification automatique : Nouvel article');
+
+// Added in version 1.63
+define('_MI_NEWS_TAGS', "Utiliser le système de tags ?");
+define('_MI_NEWS_TAGS_DSC', "Ceci est basé sur le module Xoops 'Tag' de phppp");
+define("_MI_NEWS_BNAME10", "Nuage de Tags");
+define("_MI_NEWS_BNAME11", "Top Tags");
+define("_MI_NEWS_INTRO_TEXT", "Texte d'introduction à afficher sur la page de soumission d'un article");
+define("_MI_NEWS_IMAGE_MAX_WIDTH", "Largeur maximale de l'image lorsqu'elle est redimensionnée");
+define("_MI_NEWS_IMAGE_MAX_HEIGHT", "Hauteur maximale de l'image lorsqu'elle est redimensionnée");
+
+//Added in 1.67
+define("_MI_NEWS_HELP","Aide");
+define("_MI_NEWS_ABOUT","A propos");
+define("_MI_NEWS_HOME","Accueil");
+define("_MI_NEWS_UPGRADE","Mise à jour");
+define("_MI_NEWS_DESCRIPTION","Avec ce module Xoops, vous pouvez créer un nombre illimité d'articles sur votre site. <br /> <br />
+Vous pouvez créer tous les articles que vous voulez et les organiser dans les sujets. <br /> <br />Avec une gestion des autorisations très puissant, vous pouvez créer des groupes autorisés à soumettre des articles et un groupe autorisé à les approuver et de décider qui peut voir quoi. ");
+
+define("_MI_NEWS_SHARE_ME","Afficher les icônes partagées ?");
+define("_MI_NEWS_SHARE_ME_DSC","Partager les icônes sur Facebook, Twitter, Google Buzz");
+define("_MI_NEWS_SHOWICONS","Afficher les icônes des articles ?");
+define("_MI_NEWS_SHOWICONS_DSC","Afficher les icônes d'impression, du PDF et du courrier électronique en bas de chaque article");
+//1.67
+define("_MI_NEWS_FACEBOOKCOMMENTS","Utiliser les commentaires Facebook ?");
+define("_MI_NEWS_FACEBOOKCOMMENTS_DSC","Laisser vos utilisateurs utiliser Facebook pour ajouter des commentaires à vos articles");
+/**
+ * @translation Communauté Francophone des Utilisateurs de Xoops
+ * @specification _LANGCODE: fr
+ * @specification _CHARSET: UTF-8 sans Bom
+ * Mis à jour par Cesag le 16 Mai 2012
+ * @version $Id $
+**/
+
+?>
\ No newline at end of file
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/newsletter.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/newsletter.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french/newsletter.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,25 @@
+<?php
+$newslettertemplate=<<<contentend
+Titre : %title%
+Sujet : %topic_title%
+Auteur : %publisher%
+Date de Publication : %published%
+Note : %rating%
+Nombre de lectures : %reads%
+
+Contenu :
+%hometext%
+
+En savoir plus : %link%
+ ----------------------------------------------------------------------------
+
+contentend;
+
+/**
+ * @translation Communauté Francophone des Utilisateurs de Xoops
+ * @specification _LANGCODE: fr
+ * @specification _CHARSET: UTF-8 sans Bom
+ *
+ * @version $Id $
+**/
+?>
Added: XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/admin.php
===================================================================
--- XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/admin.php (rev 0)
+++ XoopsLanguages/french/modules/news/news 1.67 RC3/news/language/french_iso/admin.php 2012-05-17 00:18:37 UTC (rev 9531)
@@ -0,0 +1,238 @@
+<?php
+// $Id$
+// Support Francophone de Xoops (www.frxoops.org)
+//%%%%%% Admin Module Name Articles %%%%%
+define("_AM_DBUPDATED","Base de donn\xE9es mise \xE0 jour avec succ\xE8s !");
+define("_AM_CONFIG","Configuration des articles");
+define("_AM_AUTOARTICLES","Articles automatis\xE9s");
+define("_AM_STORYID","ID de l'article");
+define("_AM_TITLE","Titre");
+define("_AM_TOPIC","Sujet");
+define("_AM_POSTER","Auteur");
+define("_AM_PROGRAMMED","Date et heure programm\xE9e");
+define("_AM_ACTION","Action");
+define("_AM_EDIT","Editer");
+define("_AM_DELETE","Effacer");
+define("_AM_LAST10ARTS","Les %d derniers articles");
+define("_AM_PUBLISHED","Publi\xE9 le"); // Published Date
+define("_AM_GO","Ok");
+define("_AM_EDITARTICLE","Editer l'article");
+define("_AM_POSTNEWARTICLE","Poster un nouvel article");
+define("_AM_ARTPUBLISHED","Votre article a \xE9t\xE9 publi\xE9 !"); // mail
+define("_AM_HELLO","Bonjour %s,"); // mail
+define("_AM_YOURARTPUB","Votre article soumis sur notre site a \xE9t\xE9 publi\xE9."); // mail
+define("_AM_TITLEC","Titre : "); // mail
+define("_AM_URLC","URL : "); // mail
+define("_AM_PUBLISHEDC","Publi\xE9 le : "); // mail
+define("_AM_RUSUREDEL","Etes-vous s\xFBr de vouloir supprimer cet article et tous ses commentaires ?");
+define("_AM_YES","Oui");
+define("_AM_NO","Non");
+define("_AM_INTROTEXT","Texte de l'introduction");
+define("_AM_EXTEXT","Suite du texte");
+define("_AM_ALLOWEDHTML","HTML autoris\xE9 :");
+define("_AM_DISAMILEY","D\xE9sactiver les \xE9motic\xF4nes");
+define("_AM_DISHTML","D\xE9sactiver le HTML");
+define("_AM_APPROVE","Approuver");
+define("_AM_MOVETOTOP","D\xE9placer cet article au Top");
+define("_AM_CHANGEDATETIME","Changer la date et l'heure de publication");
+define("_AM_NOWSETTIME","L'heure est maintenant d\xE9finie \xE0 : %s"); // %s is datetime of publish
+define("_AM_CURRENTTIME","Actuellement il est : %s"); // %s is the current datetime
+define("_AM_SETDATETIME","Param\xE9trer la date et l'heure de publication");
+define("_AM_MONTHC","Mois :");
+define("_AM_DAYC","Jour :");
+define("_AM_YEARC","Ann\xE9e :");
+define("_AM_TIMEC","Heure :");
+define("_AM_PREVIEW","Pr\xE9visualiser");
+define("_AM_SAVE","Sauvegarder");
+define("_AM_PUBINHOME","Publier en page d'accueil ?");
+define("_AM_ADD","Ajouter");
+
+//%%%%%% Admin Module Name Topics %%%%%
+
+define("_AM_ADDMTOPIC","Ajouter un sujet PRINCIPAL");
+define("_AM_TOPICNAME","Nom du sujet");
+// Attention, modifi\xE9 de 40 \xE0 255 caract\xE8res.
+define("_AM_MAX40CHAR","(maxi : 255 caract\xE8res)");
+...
[truncated message content] |
|
From: <ce...@us...> - 2012-05-17 00:12:00
|
Revision: 9530
http://xoops.svn.sourceforge.net/xoops/?rev=9530&view=rev
Author: cesag
Date: 2012-05-17 00:11:54 +0000 (Thu, 17 May 2012)
Log Message:
-----------
news module french place
Added Paths:
-----------
XoopsLanguages/french/modules/news/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-16 19:51:24
|
Revision: 9529
http://xoops.svn.sourceforge.net/xoops/?rev=9529&view=rev
Author: beckmi
Date: 2012-05-16 19:51:17 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fixing bugs reported by Cesag
Modified Paths:
--------------
XoopsModules/news/branches/mamba/news/admin/groupperms.php
XoopsModules/news/branches/mamba/news/archive.php
XoopsModules/news/branches/mamba/news/language/english/admin.php
Modified: XoopsModules/news/branches/mamba/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/admin/groupperms.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -66,7 +66,18 @@
foreach ($alltopics as $topic_id => $topic) {
$permform->addItem($topic_id, $topic['title'], $topic['pid']);
}
-echo $permform->render();
-echo "<br /><br /><br /><br />\n";
+//echo $permform->render();
+//echo "<br /><br /><br /><br />\n";
+
+//check if topics exist before rendering the form
+$result_view = $xoopsDB->query("SELECT topic_id, topic_title FROM " . $xoopsDB->prefix("topics") . " ");
+if ($xoopsDB->getRowsNum($result_view)) {
+ echo $permform->render();
+} else {
+ //echo _AM_XFAQ_NOPERMSSET;
+redirect_header("index.php?op=topicsmanager", 5, _AM_NEWS_NOPERMSSET, false);
+}
+
+
unset($permform);
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/news/branches/mamba/news/archive.php
===================================================================
--- XoopsModules/news/branches/mamba/news/archive.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/archive.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -83,6 +83,7 @@
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
$lastyear = 0;
$lastmonth = 0;
+$this_year = 0;
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php 2012-05-16 19:51:17 UTC (rev 9529)
@@ -175,7 +175,7 @@
// Added in 1.3 RC2
define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
-// Added in verisn 1.50
+// Added in version 1.50
define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
@@ -192,7 +192,7 @@
define('_AM_NEWS_META_KEYWORDS_FREQ1',"Words frequency's order");
define('_AM_NEWS_META_KEYWORDS_FREQ2',"Reverse order of words frequency");
-// Added in verisn 1.67
+// Added in version 1.67
// About.php
define('_AM_NEWS_ABOUT_RELEASEDATE', "Released: ");
define('_AM_NEWS_ABOUT_UPDATEDATE', "Updated: ");
@@ -215,12 +215,15 @@
define ("_AM_NEWS_STATISTICS", "Statistics News");
define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database");
define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online");
-define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database");
-define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories in the database");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories online");
define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database");
define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online");
define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed");
define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
+define("_AM_NEWS_NOPERMSSET","Permission cannot be set: There are no Topics created yet! Please create a Topic first.");
+
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-16 19:02:43
|
Revision: 9528
http://xoops.svn.sourceforge.net/xoops/?rev=9528&view=rev
Author: beckmi
Date: 2012-05-16 19:02:36 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fixing English translation (Cesag)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/upgrade/cnt-2.2.x-to-2.3.0/language/english.php
Modified: XoopsCore/branches/2.5.x/2.5.5/upgrade/cnt-2.2.x-to-2.3.0/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/upgrade/cnt-2.2.x-to-2.3.0/language/english.php 2012-05-16 14:16:03 UTC (rev 9527)
+++ XoopsCore/branches/2.5.x/2.5.5/upgrade/cnt-2.2.x-to-2.3.0/language/english.php 2012-05-16 19:02:36 UTC (rev 9528)
@@ -7,7 +7,7 @@
define( "_CONFIRM_UPGRADE_220", "
The upgrade scripts will migrate data from existent 'profile' module.<br />
Please don't uninstall the existent 'profile' module manually, otherwise corresponding data won't be migrated.<br /><br />
-Once the upgrade process is fully completed please <stong>go to module administration area to updade 'profile' module</strong>, by which profile data will be migrated completely.<br /><br />
+Once the upgrade process is fully completed please <strong>go to module administration area to update 'profile' module</strong>. Once this is done, profile data will be migrated completely.<br /><br />
To cancel the upgrade, <a href='index.php'>click here</a>.<br /><br />
Or to <a style='color:green; font-size:1.3em;' href='index.php?action=next&upd220=ok'>proceed</a>.
");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
