Code: Alles auswählen
Index: contenido/includes/include.con_art_overview.php
===================================================================
RCS file: /usr/local/cvsroot/59/contenido_sources/contenido/includes/include.con_art_overview.php,v
retrieving revision 1.61
diff -u -r1.61 include.con_art_overview.php
--- contenido/includes/include.con_art_overview.php 28 Oct 2006 21:51:13 -0000 1.61
+++ contenido/includes/include.con_art_overview.php 10 Dec 2006 22:33:44 -0000
@@ -469,10 +469,10 @@
{
if ($idlang != $lang)
{
- $tmp_alink = $sess->url("main.php?area=con_editcontent&action=con_editart&changeview=prev&idartlang=$idartlang&idart=$idart&idcat=$idcat&frame=$frame&tmpchangelang=$idlang&next=$next");
+ $tmp_alink = $sess->url("main.php?area=con_editcontent&action=con_editart&changeview=prev&idartlang=$idartlang&idart=$idart&idcat=$idcat&frame=$frame&tmpchangelang=$idlang");
$titlelink = '<a href="'.$tmp_alink.'" title="'.$alttitle.'">'.$title.'</a>';
} else {
- $tmp_alink = $sess->url("main.php?area=con_editcontent&action=con_editart&changeview=edit&idartlang=$idartlang&idart=$idart&idcat=$idcat&frame=$frame&next=$next");
+ $tmp_alink = $sess->url("main.php?area=con_editcontent&action=con_editart&changeview=edit&idartlang=$idartlang&idart=$idart&idcat=$idcat&frame=$frame");
$titlelink = '<a href="'.$tmp_alink.'" title="'.$alttitle.'">'.$title.'</a>';
}
} else {
@@ -844,8 +844,10 @@
$sBrowseLinks .= '<a href="'.$tmp_alink.'">'.$i.'</a>'."\n";
}
}
+ $tpl->set('s', 'NEXT', $next);
$tpl->set('s', 'BROWSE', sprintf(i18n("Go to page: %s"), $sBrowseLinks));
} else {
+ $tpl->set('s', 'NEXT', "0");
$tpl->set('s', 'BROWSE', sprintf(i18n("Go to page: %s"), "1"));
}
@@ -991,7 +993,6 @@
$tpl->set("d", "SORTKEY", " ");
$tpl->next();
-
}
# Kategorie anzeigen und Konfigurieren button
@@ -1003,54 +1004,40 @@
$perm->have_perm_area_action( "con", "con_tplcfg_edit" )) && $foreignlang == false) {
if ( 0 != $idcat ) {
-
$tmp_link = '<a href="'.$sess->url("main.php?area=con_tplcfg&action=tplcfg_edit&idcat=$idcat&frame=4&mode=art").'">'.i18n("Configure Category").'</a>';
$tmp_img = '<a href="'.$sess->url("main.php?area=con_tplcfg&action=tplcfg_edit&idcat=$idcat&frame=4&mode=art").'"><img src="'.$cfg["path"]["images"].'but_cat_conf2.gif" border="0" title="'.i18n("Configure Category").'" alt="'.i18n("Configure Category").'"></a>';
$tpl->set('s', 'CATEGORY', $cat_name);
$tpl->set('s', 'CATEGORY_CONF', $tmp_img);
$tpl->set('s', 'CATEGORY_LINK', $tmp_link);
-
- } else {
-
+ } else {
$tpl->set('s', 'CATEGORY', $cat_name);
$tpl->set('s', 'CATEGORY_CONF', ' ');
$tpl->set('s', 'CATEGORY_LINK', ' ');
-
- }
-
+ }
} else {
-
- $tpl->set('s', 'CATEGORY', $cat_name);
+ $tpl->set('s', 'CATEGORY', $cat_name);
$tpl->set('s', 'CATEGORY_CONF', ' ');
$tpl->set('s', 'CATEGORY_LINK', ' ');
-
}
# SELF_URL (Variable für das javascript);
- $tpl->set('s', 'SELF_URL', $sess->url("main.php?area=con&frame=4&idcat=$idcat&next=$next"));
+ $tpl->set('s', 'SELF_URL', $sess->url("main.php?area=con&frame=4&idcat=$idcat"));
# Neuer Artikel link
if (($perm->have_perm_area_action("con_editart", "con_newart") ||
$perm->have_perm_area_action_item("con_editart", "con_newart", $idcat)) && $foreignlang == false) {
if ( $idcat != 0 && $cat_idtpl != 0) {
-
$tpl->set('s', 'NEWARTICLE_TEXT', '<a href="'.$sess->url("main.php?area=con_editart&frame=$frame&action=con_newart&idcat=$idcat").'">'.i18n("Create new article").'</a>');
$tpl->set('s', 'NEWARTICLE_IMG', '<a href="'.$sess->url("main.php?area=con_editart&frame=$frame&action=con_newart&idcat=$idcat").'" title="'.i18n("Create new article").'"><img src="images/but_art_new.gif" border="0" alt="'.i18n("Create new article").'"></a>');
-
} else {
-
$tpl->set('s', 'NEWARTICLE_TEXT', ' ');
$tpl->set('s', 'NEWARTICLE_IMG', ' ');
-
}
-
} else {
-
$tpl->set('s', 'NEWARTICLE_TEXT', ' ');
$tpl->set('s', 'NEWARTICLE_IMG', ' ');
-
}
$str = "";
@@ -1063,12 +1050,9 @@
# Generate template
$tpl->generate($cfg['path']['templates'] . $cfg['templates']['con_art_overview']);
-
} else {
$notification->displayNotification("error", i18n("Permission denied"));
-
}
-
} else {
$tpl->reset();
$tpl->set('s', 'CONTENTS', '');
Index: contenido/scripts/articleObject.js.php
===================================================================
RCS file: /usr/local/cvsroot/59/contenido_sources/contenido/scripts/articleObject.js.php,v
retrieving revision 1.18
diff -u -r1.18 articleObject.js.php
--- contenido/scripts/articleObject.js.php 28 Oct 2006 21:51:15 -0000 1.18
+++ contenido/scripts/articleObject.js.php 10 Dec 2006 22:33:48 -0000
@@ -14,7 +14,6 @@
include_once ('../includes/startup.php');
-
include_once ($cfg["path"]["contenido"].$cfg["path"]["includes"] . 'functions.i18n.php');
header("Content-Type: text/javascript");
@@ -39,7 +38,6 @@
$aTabs = array_merge($aTabs, $aTmpArray);
}
}
-
?>
/**
@@ -68,6 +66,9 @@
/* Contenido session name -
defaults to 'contenido' */
this.sessionName = "contenido"
+
+ /* Current page selection (first shown article number) */
+ this.next = 0;
/* Global Vars */
this.sessid = 0;
@@ -83,7 +84,7 @@
this.idlang = 0;
/* Menu visible / invisible */
- this.vis = 1;
+ this.vis = 1;
this.customTabs = new Array();
@@ -108,7 +109,6 @@
echo 'this.customTabs[\''.$sTab.'\'][\'action\'] = "'.$aTmpArray[1].'";'."\n";
echo 'this.customTabs[\''.$sTab.'\'][\'custom\'] = "'.$aTmpArray[2].'";'."\n";
}
-
?>
}
@@ -166,12 +166,10 @@
*/
articleObject.prototype.doAction = function(str)
{
- /* Flag if action will be
- executed. */
+ /* Flag if action will be executed. */
var doAction = false;
- /* create messageBox
- instance */
+ /* create messageBox instance */
var box = new messageBox("", "", "", 0, 0);
/* Notify Headline */
@@ -184,18 +182,14 @@
{
/* Article overview mask */
case 'con':
-
- /* Cehck if required parameters
- are set */
+ /* Check if required parameters are set */
if ( 0 != this.idcat ) {
- url_str = this.sessUrl(this.filename + "area=" + str + "&idcat=" + this.idcat);
+ url_str = this.sessUrl(this.filename + "area=" + str + "&idcat=" + this.idcat + "&next=" + this.next);
doAction = true;
} else {
- /* This ERROR should never happen,
- i.e. the property idcat will not
+ /* This ERROR should never happen, i.e. the property idcat will not
be reseted once set. */
err_str = "<?php echo i18n("Overview cannot be displayed"); ?>";
-
}
break;
@@ -211,8 +205,7 @@
parent.parent.frames["right"].frames["right_top"].sub.click(menuItem);
}
} else {
- /* Check if required parameters
- are set */
+ /* Check if required parameters are set */
if ( 0 != this.idart && 0 != this.idcat ) {
url_str = this.sessUrl(this.filename + "area=" + str + "&action=con_edit&idart=" + this.idart + "&idcat=" + this.idcat);
doAction = true;
@@ -234,8 +227,7 @@
/* Template configuration */
case 'con_tplcfg':
- /* Check if required parameters
- are set */
+ /* Check if required parameters are set */
if (this.lang != 0 && this.idlang != 0 && this.lang != this.idlang)
{
err_str = "<?php echo i18n("Editor can't be displayed")."<br>".i18n("Can't edit articles in foreign languages."); ?>";
@@ -275,8 +267,7 @@
}
} else {
- /* Check if required parameters
- are set */
+ /* Check if required parameters are set */
if ( 0 != this.idart && 0 != this.idartlang && 0 != this.idcat ) {
url_str = this.sessUrl(this.filename + "area=" + str + "&action=con_editart&changeview=edit&idart=" + this.idart + "&idartlang=" + this.idartlang + "&idcat=" + this.idcat);
doAction = true;
@@ -297,8 +288,7 @@
/* Preview article */
case 'con_preview':
- /* Check if required parameters
- are set */
+ /* Check if required parameters are set */
if ( 0 != this.idart && 0 != this.idartlang && 0 != this.idcat ) {
url_str = this.sessUrl(this.filename + "area=con_editcontent&action=con_editart&changeview=prev&idart=" + this.idart + "&idartlang=" + this.idartlang + "&idcat=" + this.idcat + "&tmpchangelang="+ this.idlang);
doAction = true;
@@ -338,16 +328,13 @@
if (doAction) {
this.actionFrame.location.href = url_str;
return true;
-
} else {
box.notify(headline, err_str);
}
return false;
-
}
-
/**
* Define article and category related properties
*
@@ -398,7 +385,6 @@
} // end function
-
/**
* Enables the navigation
*
@@ -426,5 +412,4 @@
}
this.vis = 1;
-
} // end function
\ No newline at end of file
Index: contenido/templates/standard/template.con_art_overview.html
===================================================================
RCS file: /usr/local/cvsroot/59/contenido_sources/contenido/templates/standard/template.con_art_overview.html,v
retrieving revision 1.28
diff -u -r1.28 template.con_art_overview.html
--- contenido/templates/standard/template.con_art_overview.html 25 Oct 2006 12:13:42 -0000 1.28
+++ contenido/templates/standard/template.con_art_overview.html 10 Dec 2006 22:33:49 -0000
@@ -14,15 +14,12 @@
instance */
box = new messageBox("", "", "", 0, 0);
- /* Function for deleting
- articles */
+ /* Function for deleting articles */
function deleteArticle(idart, idcat, next) {
-
var url = "main.php?area=con&action=con_deleteart&frame=4&idcat="+idcat+"&idart="+idart+"&next="+next+"&contenido="+sid;
window.location.href = url;
-
}
-
+
</script>
</head>
<body style="margin:10px">
@@ -102,6 +99,9 @@
if ( artObj ) {
artObj.reset();
artObj.enable();
+
+ /* Save current page selection */
+ artObj.next = {NEXT};
}
/* Timeout to call the function afer 250ms */
@@ -119,6 +119,9 @@
{
artObj.reset();
artObj.enable();
+
+ /* Save current page selection */
+ artObj.next = {NEXT};
}
}
@@ -128,7 +131,6 @@
}
}
-
/* Extract data from
the article grid and
@@ -147,8 +149,6 @@
}
}
-
-
var datastring = obj.id;
var data = datastring.split( "-" );
@@ -162,10 +162,8 @@
5: idcatart */
artObj.setProperties(data[0], data[1], data[2], data[3], data[4], data[5]);
-
}
-
return true;
}
@@ -197,6 +195,5 @@
{ROWMARKSCRIPT};
</script>
-
</body>
</html>