Skip to content

Commit

Permalink
Simplified hose to one line
Browse files Browse the repository at this point in the history
  • Loading branch information
Weston Moran committed Mar 1, 2007
1 parent 17716bf commit fa0af0e
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 130 deletions.
201 changes: 76 additions & 125 deletions plugins/FireHose/firehose.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
/* Options */
.firemenu { position: relative; }
.firemenu h3 { margin-right: 120px; }
.firemenu h3 img {margin: .1em 0 0 .2em !important; padding: 0; position: absolute;}
.options
{
width: 140px;
position: absolute;
top: 0px !important;
right: .5em;
}

.options span
{
position: relative;
width: 20px;
margin: 0 0 0 30px !important;
}

#colorsliderbg { background: url('//images.slashdot.org/colorscale.png') no-repeat 0px -3px; }

input
Expand All @@ -18,62 +34,32 @@ input
#colorsliderthumb { display: inline; }
#colorsliderthumb img { margin: 0 0 -5px 0px; }
#fhtablist li { font-size: 130%; }

#fhtablist li, #fhtablist a
{
color: #fff;
padding: 0;
margin: 0;
}

#fhtablist li, #fhtablist a { color: #fff; padding:0; margin: 0; }
#fhtablist li.active { font-weight: bold; }
#fhtablist a { padding: 0 .3em; }
#fhtablist { margin: 0; }
#fhtablist a {padding: 0 .3em;}
#fhtablist {margin: 0;}

.options
{
width: 140px;
position: absolute;
top: 0px !important;
right: .5em;
}

.options span
{
position: relative;
width: 20px;
margin: 0 0 0 30px !important;
}

.options a
.options a
{
color: #fff;
text-decoration: none;
font-weight: bold;
padding: 6px 0 4px 25px;
background: url('//images.slashdot.org/sic_controls.png') no-repeat;
_background: url('//images.slashdot.org/sic_controls.gif') no-repeat;
text-indent: -7000em;
position: absolute;
top: 0;
width: 20px !important;
}

.advpref {
background: url('//images.slashdot.org/sic_controls.png') no-repeat;
_background: url('//images.slashdot.org/sic_controls.gif') no-repeat;
padding-bottom: 25px;
padding-left: 15px;
padding-right: 15px;
}

#play a, #advplay { background-position: 0px 1px; }
#pause a, #advpause { background-position: 0px -200px; }
#desc a, #advdesc { background-position: 0px -400px; }
#asc a, #advasc { background-position: 0px -600px; }
#full a, #advfull { background-position: 0px -800px; }
#abbrev a, #advabbrev { background-position: 0px -1000px; }
#time a, #advtime { background-position: 0px -1200px; }
#popularity a, #advpop { background-position: 0px -1400px; }
#play a { background-position: 0px 1px; }
#pause a { background-position: 0px -200px; }
#desc a { background-position: 0px -400px; }
#asc a { background-position: 0px -600px; }
#full a { background-position: 0px -800px; }
#abbrev a { background-position: 0px -1000px; }
#time a { background-position: 0px -1200px; }
#popularity a { background-position: 0px -1400px; }
.article .firehosetag { background: #fff; }

ul.menu
Expand Down Expand Up @@ -122,7 +108,7 @@ ul.menu#fhtablist li.active:before { content: ""; }
background: #666 url('//images.slashdot.org/block-title-bg.png') repeat-x;
}

.paginate ul.menu { background: url('//images.slashdot.org/slcb.png') right bottom no-repeat; }
.paginate ul.menu { background: url('/images/corner_w_br.png') right bottom no-repeat; }
.paginate a { color: #fff !important; }

/* Articles */
Expand All @@ -137,41 +123,29 @@ ul.menu#fhtablist li.active:before { content: ""; }

.storylinks li.more { margin-left: -1.8em !important; }
#firehose div.article div.firehose .title { background: #666 url('//images.slashdot.org/slc.gif') top left no-repeat; }

#firehose div.article div.firehose .title h3
{
margin-top: .3em;
background: transparent;
}

#firehose div.article div.firehose .title h3 { background: transparent; }
#firehose div.article div.firehose .title a { color: #fff; }
#firehoselist { padding: 1em 0 0 0; }
#firehoselist, #firehose #message, .firemenu { margin-right: 18.5em; }
.admin #firehoselist, .admin #firehose #message, .admin .firemenu { margin-right: 0; }

.article .generaltitle .title h3
{
padding-left: 80px !important;
padding-right: 50px;
}

.article .generaltitle .title .date,
.article .generaltitle .title .nickname { display: none; }
.article .firehosetag { background: #fff; }
.article div.tags div.tagtitleopen { margin-top: 2.3em !important; }

/* Voting */
.article .vote { color: #cee; }

.up
{
background: url('//images.slashdot.org/sic_icons.png') no-repeat 0px -1px;
_background: url('//images.slashdot.org/sic_icons.gif') no-repeat 0px -1px;
left: 8px;
}

.down
{
background: url('//images.slashdot.org/sic_icons.png') no-repeat 0px -195px;
_background: url('//images.slashdot.org/sic_icons.gif') no-repeat 0px -195px;
left: 26px;
}

Expand All @@ -182,40 +156,48 @@ ul.menu#fhtablist li.active:before { content: ""; }
text-indent: -7000em;
position: absolute;
}

.usermode.briefarticle .vote,
.usermode.article .vote {left: 10px !important}
.vote
{
position: absolute;
top: .8em;
left: 18px;
top: .5em;
left: 22px;
width: 50px;
text-align: center;
font-size: 80%;
}

.article .vote { top: .6em; }
.article .vote {color: #cee; }

/* Tagging */
div.tags
#firehose .briefarticle div.tags {margin: 0 !important; padding: 0 !important;}
div.tags div.tagtitleclosed { background: transparent !important; position: absolute !important; overflow: hidden; right: 60px; top: .5em; font-size: 95%;}
.usermode div.tags div.tagtitleclosed {right: 10px;}
div.tags div.tagtitleclosed input:first-child {width: 30% !important;}
div.tags div.tagtitleclosed input {font-size: 80%;}
.whitewash div.tagtitleclosed , .whitewash div.tagtitleclosed a {color: #fff !important}
.whitewash div.tagtitleclosed span.tagsheader {background: url('/images/arrow_w_closed.png') no-repeat !important;}
div.tags table
{
padding: 0;
margin-bottom: 2px !important;
background: transparent;
margin-top: .3em;
}

div.tags div.tagtitleclosed,
div.tags div.tagtitleopen
div.tags table th
{
position: static !important;
margin: 2px 0 0 0 !important;
border-top: 1px solid #aaa;
border-left: 1px solid #aaa;
border-right: 1px solid #fff;
padding-top: .5em !important;
}

div.tags div.tagtitleclosed, div.tags div.tagtitleclosed a
div.tags table.data td
{
padding-top: 0px !important;
font-size: 98%;
color: #777;
padding: .1em .5em;
line-height: 120%;
}


/* Icons and imagery for articles */
.edit
{
Expand All @@ -227,6 +209,7 @@ div.tags div.tagtitleclosed, div.tags div.tagtitleclosed a
.edit a
{
background: url('//images.slashdot.org/sic_icons.png') no-repeat 27px -398px !important;
_background: url('//images.slashdot.org/sic_icons.gif') no-repeat 1px -398px !important;
width: 20px;
}

Expand All @@ -235,40 +218,43 @@ div.tags div.tagtitleclosed, div.tags div.tagtitleclosed a
.external a
{
z-index: 1000;
width: 16px;
width: 10px;
padding: 5px;
background: url('//images.slashdot.org/sic_icons.png') no-repeat 0px -799px;
_background: url('//images.slashdot.org/sic_icons.gif') no-repeat 0px -600px;
text-indent: -7000em;
position: absolute;
}

.reject
{
z-index: 1000;
padding: 0 0 0 10px;
padding: 5px;
width: 10px;
position: absolute;
right: 5px;
top: .5em;
background: url('//images.slashdot.org/sic_icons.png') no-repeat 0px -602px;
_background: url('//images.slashdot.org/sic_icons.gif') no-repeat 0px -600px;
}

.reject input { visibility: hidden; }

.soda
{
padding: .7em 10px 0 6px;
padding: .5em 7px .65em 7px;
color: #999;
left: 0;
top: 0;
top: 1px;
font-size: 90%;
position: absolute;
font-weight: normal;
cursor: pointer;
}

.article .soda
{
padding: 1.1em 10px 0 6px;
padding-bottom: .5em;
top: 0;
font-size: 70%;
}

Expand All @@ -287,36 +273,21 @@ div.tags div.tagtitleclosed, div.tags div.tagtitleclosed a
#firehose div.briefarticle a span { float: none; }
#firehose div.briefarticle div.future .title { background: #700; }
#firehose div.briefarticle div.story .title { background: #066; }
#firehose div.briefarticle div.future .title a, #firehose div.briefarticle div.future .title .date,
#firehose div.briefarticle div.story .title a, #firehose div.briefarticle div.story .title .date { color: #fff; }

.briefarticle .soda
{
top: 1px;
padding-bottom: .8em;
}

.briefarticle div.tags, .briefarticle div.tags div.tagtitleopen, .briefarticle div.tags div.tagtitleclosed
{
margin-top: -1.4em !important;
margin-left: 70px;
}

.briefarticle div.tags, .briefarticle div.tags div.tagtitleopen, .briefarticle div.tags div.tagtitleclosed, .briefarticle .tags span.tagsheader { margin-left: 70px; }
.briefarticle div.tags, .briefarticle div.tags div.tagtitleclosed { background: transparent; }
.briefarticle div.tags div.tagtitleopen { background: #6a6a6a url('//images.slashdot.org/block-title-bg.png') repeat-x; }

#firehose div.briefarticle div.future .title a,
#firehose div.briefarticle div.story .title a { color: #fff; }
#firehose div.briefarticle div.future .title .date, #firehose div.briefarticle div.story .title .date { color: #fff; opacity: 0.5; }
#firehose .briefarticle {position: relative !important}
.adminmode .briefarticle .generaltitle .title h3 {padding-left: 80px !important;}
.briefarticle .generaltitle .title h3
{
padding-top: 2px;
padding-right: 50px;
padding-left: 80px;
padding-bottom: 1.2em !important;
padding-top: .5em;
padding-right: 30%;
padding-left: 70px;
font-size: 100%;
border-top: 1px solid #fff;
background: url('//images.slashdot.org/gen-slc.gif') no-repeat left top;
}

.article .generaltitle .title h3 {padding-left: 70px;}
.briefarticle .generaltitle .title { background: #e6e6e6 url('//images.slashdot.org/sections-bg.png') repeat-x left bottom; }
.briefarticle .generaltitle .title h3 a { color: #066; }

Expand All @@ -338,24 +309,4 @@ div.tags div.tagtitleclosed, div.tags div.tagtitleclosed a
right: 28px;
}

.briefarticle div.tags div.tagtitleclosed { margin-bottom: -1.5em !important; }

div.tags table
{
background: transparent;
margin-top: .3em;
}

div.tags table th
{
border-top: 1px solid #aaa;
border-left: 1px solid #aaa;
border-right: 1px solid #fff;
padding-top: .5em !important;
}

div.tags table.data td
{
padding: .1em .5em;
line-height: 120%;
}
4 changes: 3 additions & 1 deletion plugins/FireHose/templates/dispFireHose;firehose;default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ END %]
[% the_user = Slash.db.getUser(item.uid) %]
[% IF full %]
[% IF divwrapper %]
[% IF future || item.type=="story" %]<div class="whitewash">[% END %]
<div id="firehose-[% item.id %]" class="[% IF mode == "full" %]article[% ELSE %]briefarticle[% END %][% IF adminmode == 1 %] adminmode[% ELSE %] usermode[% END %]">
[% END %]
[% PROCESS formatHoseTitle the_user = the_user item = item url = url adminmode=adminmode %]
Expand All @@ -63,7 +64,7 @@ END %]
Slash.getData('byline', { adminmode => adminmode, item => item, the_user => the_user }, 'firehose');
%]

<div class="[% IF bodycontent %]body[% ELSE %]empty[% END %]" id="fhbody-[% item.id %]" [% IF !topic.image %]style="min-height: 100% !important; "[% END %]>
<div class="[% IF bodycontent %]body[% ELSE %]empty[% END %]" id="fhbody-[% item.id %]" [% IF !topic.image %]style="min-height: 100% !important; "[% END %]>
[% END %]
[% IF item.tid %]
<div class="topic">
Expand Down Expand Up @@ -127,6 +128,7 @@ END %]
</div>
</div>
</div>
[% IF future || item.type=="story" %]</div>[% END %]
[% END %]
[% END %]
__version__
Expand Down
7 changes: 3 additions & 4 deletions plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@ tagsfirehosedivtagbox
__template__
[% IF user.tags_canread_stories %]
<div id="tagbox-[% id %]" class="tags">
<span id="updown-[% item.id %]" class="vote">[% IF vote %]Voted[% ELSE %]<a href="javascript:firehose_up_down('[% item.id %]','+')" class="up" title="Vote this item up">+</a> <a href="javascript:firehose_up_down('[% item.id %]','-')" class="down" title="Vote this item down">-</a>[% END %]</span>
<div id="tagbox-title-[% id %]" class="tagtitleclosed">&nbsp;[% IF user.tags_canwrite_stories %]<a href="javascript:tagsToggleStoryDiv('[% id %]','[% user.is_admin && !user.firehose_usermode %]','firehose');">[% ELSIF user.is_anon %]<a href="[% gSkin.rootdir %]/login.pl">[% ELSE %]<a href="[% gSkin.rootdir %]/subscribe.pl">[% END %]<span class="tagsheader" id="toggletags-button-[% id %]">[+]</span></a>
<span id="updown-[% item.id %]" class="vote">[% IF vote %]Voted [% vote %][% ELSE %]<a href="javascript:firehose_up_down('[% item.id %]','+')" class="up" title="Vote this item up">+</a> <a href="javascript:firehose_up_down('[% item.id %]','-')" class="down" title="Vote this item down">-</a>[% END %]</span>
<span id="tags-top-[% id %]">
[% PROCESS firehose_tags_top id = id tags_top = tags_top -%]
</span>
[%- IF user.tags_canwrite_stories && (user.firehose_usermode || !user.is_admin) %], <span class="tagmenu"><a onClick="attachCompleter(this,'[% id %]','[% user.is_admin && !user.firehose_usermode %]','firehose', 4, {action1:completer_setTag})">feedback</a></span>[% END %]
<i>([% IF user.is_admin && !user.firehose_usermode -%]<span id="note-form-[% item.id %]" class="hide"><input type="text" id="note-input-[% item.id %]" value="[% item.note | strip_attribute %]" size="30" onkeyup="handleEnter(event, firehose_save_note, '[% id %]')"> <input type="button" value="note" onclick="firehose_save_note('[% item.id %]')"></span><a id="note-text-[% item.id %]" onclick="firehose_open_note('[% item.id %]')">[% IF !item.note %]Note[% END %][% item.note | strip_literal %]</a>
[%- ELSE -%]<a href="/faq/tags.shtml">tagging beta</a>
[%- END -%])</i>
[% IF user.is_admin && !user.firehose_usermode -%]<i>(<span id="note-form-[% item.id %]" class="hide"><input type="text" id="note-input-[% item.id %]" value="[% item.note | strip_attribute %]" size="30" onkeyup="handleEnter(event, firehose_save_note, '[% id %]')"> <input type="button" value="note" onclick="firehose_save_note('[% item.id %]')"></span><a id="note-text-[% item.id %]" onclick="firehose_open_note('[% item.id %]')">[% IF !item.note %]Note[% END %][% item.note | strip_literal %]</a>)</i>
[%- END -%]
<br>
<br>
</div>
Expand Down

0 comments on commit fa0af0e

Please sign in to comment.