[geeklog-cvs] journal functions.inc,1.1.1.1,1.2
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Sun Jul 27 05:12:26 EDT 2003
Update of /usr/cvs/geeklog/journal
In directory geeklog_prod:/tmp/cvs-serv18695
Modified Files:
functions.inc
Log Message:
Added title attributes for the moods in the journal editor.
Some HTML cleanup.
Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/journal/functions.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** functions.inc 14 Jul 2003 20:42:50 -0000 1.1.1.1
--- functions.inc 27 Jul 2003 09:12:24 -0000 1.2
***************
*** 316,332 ****
$retval .= "\n<tr><td align=right><b>{$LANG_JOURNAL[summary]}</b>:</td><td><input type=text size=48 maxlength=255 name=je_summary value=\"" . stripslashes($A["je_summary"]) . "\"></td></tr>";
$retval .= "\n<tr><td align=right><b>{$LANG_JOURNAL[mood]}</b>:</td><td>";
! $retval .= "<img alt=confused src={$_CONF["site_url"]}/journal/images/confused_phpbb.gif> <input type=radio name=je_mood value=confused ";
! if ($A["je_mood"] == 'confused') $retval .= "CHECKED";
! $retval .= "> <img alt=embarassed src={$_CONF["site_url"]}/journal/images/embarassed_phpbb.gif> <input type=radio name=je_mood value=embarassed ";
! if ($A["je_mood"] == 'embarassed') $retval .= "CHECKED";
! $retval .= "> <img alt=happy src={$_CONF["site_url"]}/journal/images/happy_phpbb.gif> <input type=radio name=je_mood value=happy ";
! if ($A["je_mood"] == 'happy') $retval .= "CHECKED";
! $retval .= "> <img alt=mad src={$_CONF["site_url"]}/journal/images/mad_phpbb.gif> <input type=radio name=je_mood value=mad ";
! if ($A["je_mood"] == 'mad') $retval .= "CHECKED";
! $retval .= "> <img alt=sad src={$_CONF["site_url"]}/journal/images/sad_phpbb.gif> <input type=radio name=je_mood value=sad ";
! if ($A["je_mood"] == 'sad') $retval .= "CHECKED";
! $retval .= "> <img alt=surprised src={$_CONF["site_url"]}/journal/images/surprised_phpbb.gif> <input type=radio name=je_mood value=surprised ";
! if ($A["je_mood"] == 'surprised') $retval .= "CHECKED";
! $retval .= "></td><tr>";
$retval .= "\n<tr><td valign=top align=right><b>{$LANG_JOURNAL[text]}<b>:</td><td><textarea name=je_text cols=75 rows=20 wrap=virtual>" . stripslashes($A["je_text"]) . "</textarea></td></tr>";
if ($JOURNAL["jrn_public"] == 1) {
--- 316,332 ----
$retval .= "\n<tr><td align=right><b>{$LANG_JOURNAL[summary]}</b>:</td><td><input type=text size=48 maxlength=255 name=je_summary value=\"" . stripslashes($A["je_summary"]) . "\"></td></tr>";
$retval .= "\n<tr><td align=right><b>{$LANG_JOURNAL[mood]}</b>:</td><td>";
! $retval .= '<img alt="confused" title="confused" src="' . $_CONF['site_url'] . '/journal/images/confused_phpbb.gif"> <input type="radio" name="je_mood" value="confused" ';
! if ($A['je_mood'] == 'confused') $retval .= 'checked="checked"';
! $retval .= '> <img alt="embarassed" title="embarassed" src="' . $_CONF['site_url'] . '/journal/images/embarassed_phpbb.gif"> <input type="radio" name="je_mood" value="embarassed" ';
! if ($A['je_mood'] == 'embarassed') $retval .= 'checked="checked"';
! $retval .= '> <img alt="happy" title="happy" src="' . $_CONF['site_url'] . '/journal/images/happy_phpbb.gif"> <input type="radio" name="je_mood" value="happy" ';
! if ($A['je_mood'] == 'happy') $retval .= 'checked="checked"';
! $retval .= '> <img alt="mad" title="mad" src="' . $_CONF['site_url'] . '/journal/images/mad_phpbb.gif"> <input type="radio" name="je_mood" value="mad" ';
! if ($A['je_mood'] == 'mad') $retval .= 'checked="checked"';
! $retval .= '> <img alt="sad" title="sad" src="' . $_CONF['site_url'] . '/journal/images/sad_phpbb.gif"> <input type="radio" name="je_mood" value="sad" ';
! if ($A['je_mood'] == 'sad') $retval .= 'checked="checked"';
! $retval .= '> <img alt="surprised" title="surprised" src="' . $_CONF['site_url'] . '/journal/images/surprised_phpbb.gif"> <input type="radio" name="je_mood" value="surprised" ';
! if ($A['je_mood'] == 'surprised') $retval .= 'checked="checked"';
! $retval .= '></td><tr>';
$retval .= "\n<tr><td valign=top align=right><b>{$LANG_JOURNAL[text]}<b>:</td><td><textarea name=je_text cols=75 rows=20 wrap=virtual>" . stripslashes($A["je_text"]) . "</textarea></td></tr>";
if ($JOURNAL["jrn_public"] == 1) {
***************
*** 730,734 ****
}
! function printjournalentry($je_id) {
global $_USER,$LANG01,$LANG_JOURNAL,$_CONF,$_TABLES;
--- 730,735 ----
}
! function printjournalentry($je_id)
! {
global $_USER,$LANG01,$LANG_JOURNAL,$_CONF,$_TABLES;
***************
*** 772,817 ****
$image = "";
}
! $retval .= "<table border=0 cellpadding=0 cellspacing=0 width=100%>\n";
! $retval .= "<tr><td class=storytitle>" . stripslashes($A["je_summary"]) . " $image</TD></TR>\n";
! $retval .= "<tr><td height=1 class=storyunderline><IMG SRC={$_CONF["site_url"]}/images/speck.gif width=1 height=1></td></tr>\n"; $retval .= "<tr><td class=storybyline>{$thedate[0]}<br>";
! $retval .= "{$LANG_JOURNAL[journal]}: <a class=storybyline href={$_CONF["site_url"]}/journal/index.php?mode=user&jrn_id={$A["jrn_id"]}>".stripslashes($A["jrn_name"])."</a><br>\n";
! $retval .= "{$LANG_JOURNAL[owner]}: <a class=storybyline href={$_CONF["site_url"]}/users.php?mode=profile&uid={$A["jrn_uid"]}>" . DB_getItem($_TABLES["users"],"username","uid = {$A["jrn_uid"]}") . "</a></td></tr>\n";
! if ($A["je_hits"] > 0) {
! $retval .= "<tr><td class=storybyline>";
! $retval .= "Hits: " . $A["je_hits"] . "</td></tr>\n";
} else {
! $retval .= "<br>";
}
! $retval .= "<tr><td> <br>";
! $retval .= nl2br(stripslashes($A["je_text"]));
! $commentCount = DB_count($_TABLES['comments'],'sid',$A['je_id']);
if ($commentCount == 0) {
! $retval .= "\n</td></tr><tr><td><a href='" .$_CONF[site_url] ."/comment.php?type=journal&cid=" .$A['je_id']. "'>" . $LANG01[60] . "</a>";
} else {
! $retval .= "\n</td></tr><tr><td><a href='" .$_CONF[site_url] ."/comment.php?type=journal&cid=" .$A['je_id']. "'>" .$commentCount. ' ' .$LANG01[03] . "</a>";
}
! $retval .= "\n</td></tr><tr><td>\n<div align=right>\n";
!
! if ($A["prev"]) {
! $retval .= "<a href={$_CONF["site_url"]}/journal/index.php?mode=read&je_id={$A["prev"]}>{$LANG_JOURNAL[previous]}</a> ";
} else {
! $retval .= "{$LANG_JOURNAL[previous]} ";
}
! if ($A["next"]) {
! $retval .= "<a href={$_CONF["site_url"]}/journal/index.php?mode=read&je_id={$A["next"]}>{$LANG_JOURNAL[next]}</a> ";
} else {
! $retval .= "{$LANG_JOURNAL[next]} ";
}
! $retval .= " <a href={$_CONF["site_url"]}/journal/index.php?mode=user&jrn_id={$A["jrn_id"]}>" . $LANG_JOURNAL[backto] . stripslashes($A["jrn_name"]) . "</a> ";
// $retval .= "<a href={$_CONF["site_url"]}/journal/index.php?mode=print&je_id=$je_id><img border=0 src={$_CONF["site_url"]}/images/print.gif alt=\"{$LANG01[65]}\"></a>";
if ($isadmin) {
! $retval .= "<br><a href={$_CONF["site_url"]}/journal/index.php?mode=edit&type=entry&je_id=$je_id>{$LANG_JOURNAL[edit]}</a>";
}
! $retval .= "</div></td>\n</tr>\n";
! $retval .= "</table><br>\n";
!
return $retval;
}
--- 773,841 ----
$image = "";
}
! $retval .= '<table border="0" cellpadding="0" cellspacing="0" width="100%">'
! . LB;
! $retval .= '<tr><td class="storytitle">' . stripslashes ($A['je_summary'])
! . ' ' . $image . '</td></tr>' . LB;
! $retval .= '<tr><td height="1" class="storyunderline"><img src="'
! . $_CONF['site_url'] . '/images/speck.gif" width="1" height="1">'
! . '</td></tr>' . LB;
! $retval .= '<tr><td class="storybyline">' . $thedate[0] . '<br>';
! $retval .= $LANG_JOURNAL['journal'] . ': <a class="storybyline" href="'
! . $_CONF['site_url'] . '/journal/index.php?mode=user&jrn_id='
! . $A['jrn_id'] . '">' . stripslashes ($A['jrn_name'])
! . '</a><br>' . LB;
! $retval .= $LANG_JOURNAL['owner'] . ': <a class="storybyline" href="'
! . $_CONF['site_url'] . '/users.php?mode=profile&uid='
! . $A['jrn_uid'] . '">' . DB_getItem ($_TABLES['users'], 'username',
! "uid = {$A['jrn_uid']}") . '</a></td></tr>' . LB;
! if ($A['je_hits'] > 0) {
! $retval .= '<tr><td class="storybyline">';
! $retval .= 'Hits: ' . $A['je_hits'] . '</td></tr>' . LB;
} else {
! $retval .= '<br>';
}
! $retval .= '<tr><td> <br>';
! $retval .= nl2br (stripslashes ($A['je_text']));
! $commentCount = DB_count ($_TABLES['comments'], 'sid', $A['je_id']);
if ($commentCount == 0) {
! $retval .= LB . '</td></tr><tr><td><a href="' .$_CONF['site_url']
! . '/comment.php?type=journal&cid=' . $A['je_id']. '">'
! . $LANG01[60] . '</a>';
} else {
! $retval .= LB . '</td></tr><tr><td><a href="' . $_CONF['site_url']
! . '/comment.php?type=journal&cid=' . $A['je_id'] . '">'
! . $commentCount . ' ' . $LANG01[03] . '</a>';
}
! $retval .= LB . '</td></tr><tr><td>' . LB . '<div align="right">' . LB;
! if ($A['prev']) {
! $retval .= '<a href="' . $_CONF['site_url']
! . '/journal/index.php?mode=read&je_id=' . $A['prev']
! . '">' . $LANG_JOURNAL['previous'] . '</a> ';
} else {
! $retval .= $LANG_JOURNAL['previous'] . ' ';
}
! if ($A['next']) {
! $retval .= '<a href="' . $_CONF['site_url']
! . '/journal/index.php?mode=read&je_id=' . $A['next']
! . '">' . $LANG_JOURNAL['next'] . '</a> ';
} else {
! $retval .= $LANG_JOURNAL['next'] . ' ';
}
! $retval .= ' <a href="' . $_CONF['site_url']
! . '/journal/index.php?mode=user&jrn_id=' . $A['jrn_id'] . '">'
! . $LANG_JOURNAL['backto'] . stripslashes ($A['jrn_name'])
! . '</a> ';
// $retval .= "<a href={$_CONF["site_url"]}/journal/index.php?mode=print&je_id=$je_id><img border=0 src={$_CONF["site_url"]}/images/print.gif alt=\"{$LANG01[65]}\"></a>";
if ($isadmin) {
! $retval .= '<br><a href="' . $_CONF['site_url']
! . '/journal/index.php?mode=edit&type=entry&je_id='
! . $je_id . '">' . $LANG_JOURNAL['edit'] . '</a>';
}
! $retval .= '</div></td>' . LB . '</tr>' . LB;
! $retval .= '</table><br>' . LB;
!
return $retval;
}
More information about the geeklog-cvs
mailing list