summaryrefslogtreecommitdiffabout
authorWojciech Polak <polak@gnu.org>2014-02-09 16:57:17 (GMT)
committer Wojciech Polak <polak@gnu.org>2014-02-09 16:57:17 (GMT)
commit4bfca38dd3eaf92a868390ac51ff85b54a6c2c90 (patch) (side-by-side diff)
tree1e4793791204f5b9cf610d6ae8f5be61ccd2e61d
parenta5cc6e30ec0f31e64769c317b368f51d9d4ab808 (diff)
downloadcheetah-4bfca38dd3eaf92a868390ac51ff85b54a6c2c90.tar.gz
cheetah-4bfca38dd3eaf92a868390ac51ff85b54a6c2c90.tar.bz2
Fix notes list order.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/xnotes.php9
-rw-r--r--js/v2/notes.js25
2 files changed, 18 insertions, 16 deletions
diff --git a/frontend/xnotes.php b/frontend/xnotes.php
index 5f2865d..7432666 100644
--- a/frontend/xnotes.php
+++ b/frontend/xnotes.php
@@ -2,7 +2,7 @@
/*
Cheetah News xnotes.php
- Copyright (C) 2005, 2006, 2007 Wojciech Polak.
+ Copyright (C) 2005, 2006, 2007, 2014 Wojciech Polak.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -122,9 +122,10 @@ function getNoteList ()
$i = 1; $end = $db->num_rows ();
if ($end > 0) {
- echo "cheetahNoteList = {\n";
+ echo "cheetahNoteList = [\n";
while ($db->next_record ()) {
- echo " '".$db->f ('id')."' : ['".encodeJsEntities ($db->f ('color')).
+ echo "['".$db->f ('id').
+ "', '".encodeJsEntities ($db->f ('color')).
"', '".encodeJsEntities ($db->f ('title')).
"', '".encodeJsEntities ($db->f ('date')).
"', '".encodeJsEntities ($db->f ('public')).
@@ -132,7 +133,7 @@ function getNoteList ()
if ($i++ < $end) echo ',';
echo "\n";
}
- echo "};\n";
+ echo "];\n";
}
else {
echo "cheetahNoteList = null;\n";
diff --git a/js/v2/notes.js b/js/v2/notes.js
index 3fcf8a7..73f2b82 100644
--- a/js/v2/notes.js
+++ b/js/v2/notes.js
@@ -1,6 +1,6 @@
/*
Cheetah News JS/v2 Notes
- Copyright (C) 2005, 2006, 2008 Wojciech Polak.
+ Copyright (C) 2005, 2006, 2008, 2014 Wojciech Polak.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -255,39 +255,40 @@ Modules.Notes = new function () {
countNoteList ();
if (cheetahNoteList) {
- for (var n in cheetahNoteList) {
+ for (var n = 0; n < cheetahNoteList.length; n++) {
- var row_rem = DCE ('span', {id: 'noteRowRem_' + n},
- ['<span class="link" id="removeNote_' + n +
+ var noteId = cheetahNoteList[n][0];
+ var row_rem = DCE ('span', {id: 'noteRowRem_' + noteId},
+ ['<span class="link" id="removeNote_' + noteId +
'"action="rem"><img class="img-10-remove iremove" src="images/t.gif" width="10" height="10" alt="'
+ _('rem') + '" /></span>']);
row_rem.onmouseover = selectRow;
row_rem.onmouseout = unselectRow;
- var row_pstatus = DCE ('span', {id: 'notePStatus' + n},
- [cheetahNoteList[n][3] == 'yes' ?
+ var row_pstatus = DCE ('span', {id: 'notePStatus' + noteId},
+ [cheetahNoteList[n][4] == 'yes' ?
'<img class="img-16-world" src="images/t.gif" width="16" height="16" alt="P" title="'
+ _('Publicly visible')+'" />' :
'<img class="img-16-world-i" src="images/t.gif" width="16" height="16" alt="NP" title="'
+ _('Not publicly visible')+'" />']);
- var tags = '<span class="nb_tags">' + cheetahNoteList[n][4].replace (/,/g, ', ') + '</span>';
+ var tags = '<span class="nb_tags">' + cheetahNoteList[n][5].replace (/,/g, ', ') + '</span>';
- var row = DCE ('div', {id: 'note_' + n, className: 'nbRow pointer'},
+ var row = DCE ('div', {id: 'note_' + noteId, className: 'nbRow pointer'},
[DCE ('div', {className: 'nb_tls'},
- [cheetahNoteList[n][1] + ' ' + tags,
+ [cheetahNoteList[n][2] + ' ' + tags,
DCE ('div', {className: 'nb_tld'},
- [cheetahNoteList[n][2].substr (0, 16),
+ [cheetahNoteList[n][3].substr (0, 16),
row_pstatus,
row_rem])])
]);
- row.setAttribute ('noteid', n);
+ row.setAttribute ('noteid', noteId);
row.onclick = openINote;
row.rgbColor = '#ffffff';
tbody.appendChild (row);
- var rem = GID ('removeNote_' + n);
+ var rem = GID ('removeNote_' + noteId);
if (rem) {
rem.title = _('Remove');
rem.onclick = removeINote;

Return to:

Send suggestions and report system problems to the System administrator.