Permalink
Browse files

Updates to bookmark view

  • Loading branch information...
1 parent f296209 commit 261e947d4ab75ba0c7957602cb804f37f099f3ec @tvroom tvroom committed Dec 17, 2008
Showing with 4 additions and 5 deletions.
  1. +1 −1 plugins/FireHose/mysql_dump.sql
  2. +2 −3 plugins/FireHose/templates/data;firehose;default
  3. +1 −1 sql/mysql/upgrades
@@ -52,7 +52,7 @@ INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby,
INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "usersubmission", "no", '"author:{nickname}" submission', "createtime", "DESC", "black", "-1", "full", "0", "no", "no", 20, 20, 0,"1");
-INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "userbookmark", "no", '"user:{nickname}" bookmark', "createtime", "DESC", "black", "-1", "full", "0", "no", "no", 20, 20, 0,"1");
+INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "userbookmark", "no", '"user:{nickname}" bookmark', "createtime", "DESC", "black", "-1", "fulltitle", "0", "no", "no", 20, 20, 0,"1");
INSERT INTO firehose_view (id, uid, viewname, useparentfilter, filter, orderby, orderdir, color, duration, mode, mixedmode, tab_display, options_edit, admin_maxitems, maxitems, seclev, pause) VALUES (NULL, 0, "userfirehose", "no", '"user:{nickname}"', "createtime", "DESC", "black", "-1", "full", "0", "no", "no", 20, 20, 0,"1");
@@ -29,16 +29,15 @@ __template__
[% ELSIF item.type == "story" %]
Posted
[% ELSIF item.type == "bookmark" %]
- Bookmark
[% ELSIF item.type == "feed" %]
From feed
[% ELSIF item.type != "comment" %]
Submitted
[% END %]
[%- IF adminmode && item.type == "submission" %]</a>[% END -%]
- by [% IF adminmode && item.type != "story" %]
+ [% IF item != "bookmark %]by [% END %][% IF adminmode && item.type != "story" && item.type != "bookmark" %]
[% IF Slash.isAnon(the_user.uid) %][% the_user.nickname | strip_literal %]
- [% ELSE %]<a href="[% constants.real_rootdir %]/~[% the_user.nickname | strip_paramattr %]">[% the_user.nickname | strip_literal %] ([% the_user.uid %])</a>
+ [% ELSIF item.type != "bookmark" %]<a href="[% constants.real_rootdir %]/~[% the_user.nickname | strip_paramattr %]">[% the_user.nickname | strip_literal %] ([% the_user.uid %])</a>
[% END %]
[% END %]
[% IF extras && num_from_uid != '0' %]
View
@@ -5727,4 +5727,4 @@ UPDATE vars SET value = 'T_2_5_0_235' WHERE name = 'cvs_tag_currentcode';
# PUDGE LAST UPDATED HERE
# SLASHCODE/USEPERL LAST UPDATED HERE
-
+UPDATE firehose_view SET mode="fulltitle" WHERE viewname="userbookmark";

0 comments on commit 261e947

Please sign in to comment.