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

css updates

Browse source
This commit is contained in:
Michal Wlodkowski 2007-02-27 21:56:13 +00:00
parent 552cf4cff0
commit 8fb8517156
8 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/edit_web.rhtml
View file

@ -63,8 +63,7 @@
</small> </small>
</p> </p>
<a href="#" <a href="#" onClick="toggleView('additionalStyle');return false;">
onClick="document.getElementById('additionalStyle').style.display='block';return false;">
Stylesheet tweaks &gt;&gt;</a> Stylesheet tweaks &gt;&gt;</a>
<small><em> <small><em>
- add or change styles used by this web; styles defined here take precedence over - add or change styles used by this web; styles defined here take precedence over
@ -72,7 +71,6 @@
tags.</em></small> tags.</em></small>
<br/> <br/>
<textarea id="additionalStyle" class="disableAutoComplete" <textarea id="additionalStyle" class="disableAutoComplete"
style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px"
name="additional_style"><%= @web.additional_style %> name="additional_style"><%= @web.additional_style %>
</textarea> </textarea>
</div> </div>

2
app/views/layouts/default.rhtml
View file

@ -30,7 +30,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<%= @style_additions %> <%= @style_additions %>
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>
</style> </style>
<%= javascript_include_tag :defaults %>
<% if @web %> <% if @web %>
<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %> <%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>
<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %> <%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %>

4
app/views/wiki/edit.rhtml
View file

@ -3,7 +3,7 @@
@content_width = 720 @content_width = 720
@hide_navigation = true @hide_navigation = true
%> %>
<div>
<div id="MarkupHelp"> <div id="MarkupHelp">
<%= render("#{@web.markup}_help") %> <%= render("#{@web.markup}_help") %>
<%= render 'wiki_words_help' %> <%= render 'wiki_words_help' %>
@ -29,7 +29,7 @@
</div> </div>
<%= end_form_tag %> <%= end_form_tag %>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
function cleanAuthorName() { function cleanAuthorName() {
if (document.getElementById('authorName').value == "") { if (document.getElementById('authorName').value == "") {

2
app/views/wiki/new.rhtml
View file

@ -12,7 +12,7 @@
<div id="editForm"> <div id="editForm">
<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name }, <%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
{ 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) %> { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) %>
<div class="hidden"><textarea name="content1" id="content1">iam empty</textarea></div>
<textarea name="content" id="content"><%= h(@flash[:content] || '') %></textarea> <textarea name="content" id="content"><%= h(@flash[:content] || '') %></textarea>
<div id="editFormButtons"> <div id="editFormButtons">
<input type="submit" value="Submit" accesskey="s"/> as <input type="submit" value="Submit" accesskey="s"/> as

2
app/views/wiki_words_help.rhtml
View file

@ -1,3 +1,4 @@
<div style="width:254px;">
<h3>Wiki words</h3> <h3>Wiki words</h3>
<p style="border-top: 1px dotted #ccc; margin-top: 0px"> <p style="border-top: 1px dotted #ccc; margin-top: 0px">
Two or more uppercase words stuck together (camel case) or any phrase surrounded by double Two or more uppercase words stuck together (camel case) or any phrase surrounded by double
@ -7,3 +8,4 @@
Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/> Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
Not wiki words: <i>IBM, School</i> Not wiki words: <i>IBM, School</i>
</p> </p>
</div>

2
config/database.yml
View file

@ -3,7 +3,7 @@
development: development:
adapter: sqlite3 adapter: sqlite3
database: db/development.db.sqlite3 database: db/development.db
test: test:
adapter: sqlite3 adapter: sqlite3

4
public/javascripts/application.js
View file

@ -1,2 +1,6 @@
// Place your application-specific JavaScript functions and classes here // Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults // This file is automatically included by javascript_include_tag :defaults
function toggleView(id)
{
(document.getElementById(id).style.display == 'block') ? document.getElementById(id).style.display='none' : document.getElementById(id).style.display='block';
}

33
public/stylesheets/instiki.css
View file

@ -139,6 +139,17 @@ margin:0 0 1.5em;
padding:0 2.5em; padding:0 2.5em;
} }
/* Affects the display of "category: ..." */
.property {
color: #999;
font-size: 80%;
}
.hidden {
display: none;
}
pre { pre {
background-color:#DDD; background-color:#DDD;
font-size:90%; font-size:90%;
@ -237,19 +248,23 @@ div#editFormButtons span {
white-space:nowrap; white-space:nowrap;
} }
div#editForm {
float:left;
width:65%;
}
div#editForm textarea#content { div#editForm textarea#content {
height:400px; height:400px;
width:70%; width:97%;
} }
div#MarkupHelp { div#MarkupHelp {
float:right; float:right;
margin-top:0.5em; width:34%;
width:25%;
} }
div#MarkupHelp table { div#MarkupHelp table {
border-bottom:3px solid #BBB; border:3px solid #BBB;
border-left:3px solid #999; border-left:3px solid #999;
border-right:3px solid #BBB; border-right:3px solid #BBB;
border-top:3px solid #999; border-top:3px solid #999;
@ -272,7 +287,7 @@ padding:0 0.75em;
} }
div#MarkupHelp h3 { div#MarkupHelp h3 {
font-size:90%; font-size:100%;
font-weight:bold; font-weight:bold;
margin:0 0 5px; margin:0 0 5px;
padding:5px 0 0; padding:5px 0 0;
@ -317,4 +332,12 @@ div.errorExplanation p,div.errorExplanation li {
border:none; border:none;
margin:0; margin:0;
padding:0; padding:0;
}
.disableAutoComplete {
display: none;
margin-top: 10px;
margin-bottom: 5px;
width: 99%;
height: 200px
} }