deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed the correct display of authors per web. added singular/plural for authors and pages. css optimizations

Browse source
This commit is contained in:
Matthias Tarasiewicz 2007-01-18 13:33:52 +00:00
parent 4eefc3c979
commit 2e558d5222
3 changed files with 301 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/web.rb
View file

@ -22,7 +22,9 @@ class Web < ActiveRecord::Base
'SELECT DISTINCT r.author AS author ' + 'SELECT DISTINCT r.author AS author ' +
'FROM revisions r ' + 'FROM revisions r ' +
'JOIN pages p ON p.id = r.page_id ' + 'JOIN pages p ON p.id = r.page_id ' +
'ORDER by 1').collect { |row| row['author'] } 'WHERE p.web_id = ' + self.id.to_s +
'ORDER by 1 '
).collect { |row| row['author'] }
end end
def categories def categories

9
app/views/wiki/web_list.rhtml
View file

@ -1,10 +1,10 @@
<% @title = "Wiki webs" %> <% @title = "Wiki webs" %>
<br/>
<% @webs.each do |web| %> <% @webs.each do |web| %>
<% if web.password %> <div style="padding: 4px; background-image: url(/images/bg_protected.gif)"> <% if web.password %> <div class="web_protected">
<% else %> <div style="padding: 4px;"> <% end %> <% else %> <div class="web_normal"> <% end %>
<span> <span>
<%= link_to_page 'HomePage', web, web.name, :mode => 'show' %> <%= link_to_page 'HomePage', web, web.name, :mode => 'show' %>
<% if web.published? %> <% if web.published? %>
@ -12,9 +12,8 @@
<% end %> <% end %>
<div class="byline" style="margin-bottom: 0px"> <div class="byline" style="margin-bottom: 0px">
<%= web.pages.length %> pages by <%= web.authors.length %> authors <%= web.pages.length %> page<% if web.pages.length != 1 %>s<% end %> by <%= web.authors.length %> author<% if web.authors.length != 1 %>s<% end %>
</div> </div>
</span> </span>
</div><br> </div><br>
<% end %> <% end %>

355
public/stylesheets/instiki.css
View file

@ -1,87 +1,320 @@
body { background-color: white; color: #333; } body {
body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; line-height: 1.3em; } background-color:#FFF;
color:#333;
font-family:Verdana, Arial, Helvetica, sans-serif;
font-size:90%;
line-height:1.3em;
}
#Container { float: none; margin: 0 15%; text-align: center; } #Container {
#Content { margin: 0; padding: 0.3em; text-align: left; border-top: none; float: left; width: 100%; } float:none;
margin:0 15%;
text-align:center;
}
a { color: #000; } #Content {
a:visited { color: #666; } border-top:none;
a:hover { color: white; background-color:#000; } float:left;
margin:0;
padding:0.3em;
text-align:left;
width:100%;
}
h1, h2, h3 { color: #333; font-family: georgia, verdana, sans-serif; } a:visited {
h1 { font-size: 200%; } color:#666;
h2 { font-size: 130%; } }
h3 { font-size: 120%; }
h1#pageName { margin: 0.2em 0 0; line-height: 1em; padding: 0; } h1,h2,h3 {
h1#pageName small { color: #444; font-size: 35%; line-height: 1em; padding: 0; } color:#333;
font-family:georgia, verdana, sans-serif;
}
a.nav, a.nav:link, a.nav:visited { color: #000; background-color: #FFF; } h1 {
a.nav:hover { color: #FFF; background-color: #000; } font-size:200%;
}
table { border: double black; border-collapse: collapse; } h2 {
td { border: thin solid #888; } font-size:130%;
}
li { margin-bottom: 0.5em; } h3 {
font-size:120%;
}
.newWikiWord { background-color: #DDD; } h1#pageName {
.newWikiWord a:hover { background-color: #FFF; } line-height:1em;
margin:0.2em 0 0;
padding:0;
}
form#navigationSearchForm { display: inline; } h1#pageName small {
form#navigationSearchForm input { font-size: 80%; } color:#444;
font-size:35%;
line-height:1em;
padding:0;
}
.navigation { margin-top: 0.3em; font-size : 90%; color: #999; } a.nav,a.nav:link,a.nav:visited {
.navigation a:hover { color: white; background-color: #000; text-decoration: none; } background-color:#FFF;
.navigation a { color: #000; font-weight: bold; } color:#000;
.navigation small a { font-weight: normal; font-size: 90%; } }
.navOn { color: #444; font-weight: bold; text-decoration: none; } table {
border:double #000;
border-collapse:collapse;
}
div.help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; } td {
border:thin solid #888;
}
div.inputBox { font-family: verdana, arial, helvetica, sans-serif; font-size: 80%; background-color: #EEE; padding: 0.3em; margin-bottom: 1.5em; } li {
margin-bottom:0.5em;
}
blockquote { display: block; font-size: 90%; margin: 0 0 1.5em 0; padding: 0 2.5em; line-height: 1.5em; font-style: italic; } .newWikiWord {
background-color:#DDD;
}
pre { font-size: 90%; padding: 1em; overflow: auto; background-color: #DDD; } .newWikiWord a:hover {
background-color:#FFF;
}
ol.setup { font-size: 110%; font-family: georgia, verdana, sans-serif; padding-left: 1.5em; margin-top: 1em; } form#navigationSearchForm {
display:inline;
}
.byline { padding-top: 1em; font-size: 60%; font-style: italic; margin-bottom: 1em; color: #999; } form#navigationSearchForm input {
font-size:80%;
}
.diffdel, del.diffmod { background-color: #FAA;} .navigation {
.diffins, ins.diffmod { background-color: #AFA;} color:#999;
font-size:90%;
margin-top:0.3em;
}
#footer { font-size: 60%; line-height: 1.2em; color: #999; font-style: italic; text-align: right; padding-top: 2em; } .navigation a:hover {
#footer a:link, #footer a:visited { color: #888; font-style: italic; } background-color:#000;
color:#FFF;
text-decoration:none;
}
div.inputFieldWithPrompt { margin: 0.75em 0; } .navigation a {
color:#000;
font-weight:bold;
}
div.errorExplanation { color: #900; background-color: #FFA; font-style: italic; font-weight: bold; margin: 1.5em 0; padding: 1em; width: 100%; } .navigation small a {
div.errorExplanation h2 { display: none; } font-size:90%;
div.errorExplanation p { padding: 0; margin: 0; border: none; } font-weight:normal;
div.errorExplanation ul { padding: 0; margin: 0.5em 0 0 2em; border: none; } }
div.errorExplanation li { padding: 0; margin: 0; border: none; }
div.fieldWithErrors input { border: 1px solid #900; }
div.info { color: #060; background-color: #DDD; padding: 0.5em; margin-top: 0.5em; font-weight: bold; width: 100%; }
div#editFormButtons { margin: 0.5em 0 0 0; } .navOn {
div#editFormButtons span { white-space: nowrap; } color:#444;
div#editForm textarea#content { width: 70%; height: 400px; } font-weight:bold;
text-decoration:none;
}
div#MarkupHelp { float: right; width: 25%; margin-top: 0.5em; } div.help {
div#MarkupHelp table { margin-bottom: 0; border-top: 3px solid #999; border-left: 3px solid #999; font-family:verdana, arial, helvetica, sans-serif;
border-right: 3px solid #BBB; border-bottom: 3px solid #BBB} font-size:70%;
div#MarkupHelp td { font-size: 80%; padding: 0.2em; margin: 0; border: 1px solid #999; border-width: 1px 0 1px 0; }
vertical-align: top; white-space: nowrap; }
div#MarkupHelp td.arrow { padding-right: 5px; padding: 0 0.75em; color: #999; }
div#MarkupHelp h3 { font-size: 90%; font-weight: bold; margin: 0 0 5px 0; padding: 5px 0 0 0; }
div#MarkupHelp p { font-size: 70%; }
div.rightHandSide { float: right; width: 25%; margin-left: 0.7em; padding-left: 1.5em; border-left: 1px dotted #ccc; font-size: 80%; } div.inputBox {
background-color:#EEE;
font-family:verdana, arial, helvetica, sans-serif;
font-size:80%;
margin-bottom:1.5em;
padding:0.3em;
}
.newsList { margin-top: 1.5em; } blockquote {
.newsList p { margin-bottom: 2.5em; } display:block;
font-size:90%;
font-style:italic;
line-height:1.5em;
margin:0 0 1.5em;
padding:0 2.5em;
}
/* Affects the display of "category: ..." */ pre {
.property { color: #999; font-size: 80%; } background-color:#DDD;
font-size:90%;
overflow:auto;
padding:1em;
}
ol.setup {
font-family:georgia, verdana, sans-serif;
font-size:110%;
margin-top:1em;
padding-left:1.5em;
}
.byline {
color:#999;
font-size:60%;
font-style:italic;
margin-bottom:1em;
padding-top:1em;
}
.diffdel,del.diffmod {
background-color:#FAA;
}
.diffins,ins.diffmod {
background-color:#AFA;
}
#footer {
color:#999;
font-size:60%;
font-style:italic;
line-height:1.2em;
padding-top:2em;
text-align:right;
}
#footer a:link,#footer a:visited {
color:#888;
font-style:italic;
}
div.web_normal {
padding:4px;
}
div.web_protected {
padding:4px;
background-color:#DDD;
}
div.inputFieldWithPrompt {
margin:0.75em 0;
}
div.errorExplanation {
background-color:#FFA;
color:#900;
font-style:italic;
font-weight:bold;
margin:1.5em 0;
padding:1em;
width:100%;
}
div.errorExplanation h2 {
display:none;
}
div.errorExplanation ul {
border:none;
margin:0.5em 0 0 2em;
padding:0;
}
div.fieldWithErrors input {
border:1px solid #900;
}
div.info {
background-color:#DDD;
color:#060;
font-weight:bold;
margin-top:0.5em;
padding:0.5em;
width:100%;
}
div#editFormButtons {
margin:0.5em 0 0;
}
div#editFormButtons span {
white-space:nowrap;
}
div#editForm textarea#content {
height:400px;
width:70%;
}
div#MarkupHelp {
float:right;
margin-top:0.5em;
width:25%;
}
div#MarkupHelp table {
border-bottom:3px solid #BBB;
border-left:3px solid #999;
border-right:3px solid #BBB;
border-top:3px solid #999;
margin-bottom:0;
}
div#MarkupHelp td {
border:1px solid #999;
border-width:1px 0;
font-size:80%;
margin:0;
padding:0.2em;
vertical-align:top;
white-space:nowrap;
}
div#MarkupHelp td.arrow {
color:#999;
padding:0 0.75em;
}
div#MarkupHelp h3 {
font-size:90%;
font-weight:bold;
margin:0 0 5px;
padding:5px 0 0;
}
div#MarkupHelp p {
font-size:70%;
}
div.rightHandSide {
border-left:1px dotted #ccc;
float:right;
font-size:80%;
margin-left:0.7em;
padding-left:1.5em;
width:25%;
}
.newsList {
margin-top:1.5em;
}
.newsList p {
margin-bottom:2.5em;
}
.property {
color:#999;
font-size:80%;
}
a,li span {
color:#000;
}
a:hover,a.nav:hover {
background-color:#000;
color:#FFF;
}
div.errorExplanation p,div.errorExplanation li {
border:none;
margin:0;
padding:0;
}