instiki 0.9.2 → 0.10.0

data/{app/views/static_style_sheet.rhtml → public/stylesheets/instiki.css}

@@ -1,199 +1,222 @@
-#Container {
-	float: none;
-	margin: 0 auto;
-	text-align: center;
-}
-
-#Content {
-	margin: 0;
-	padding: 5px;
-	text-align: left;
-	border-top: none;
-	float: left;
-}
-
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size:   13px;
-	line-height: 18px;
-}
-
-a { color: #000; }
-
-.newWikiWord { background-color: #eee; }
-.newWikiWord a:hover { background-color: white; }
-
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-/* a.edit:link, a.edit:visited { color: #DA0006; } */
-
-
-h1, h2, h3 { color: #333; font-family: georgia, verdana; }
-h1 { font-size: 28px }
-h2 { font-size: 19px }
-h3 { font-size: 16px }
-
-h1#pageName {
-	margin: 5px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-	line-height: 28px;
-}
-
-h1#pageName small {
-  color: grey;
-	line-height: 10px;
-  font-size: 10px;
-  padding: 0px;
-}
-
-a.nav, a.nav:link, a.nav:visited { color: #000; }
-a.nav:hover { color: #fff; background-color:#000; }
-
-li { margin-bottom: 7px }
-
-.navigation {
-  margin-top: 5px;
-	font-size : 12px;
-  color: #999;
-}
-
-.navigation a:hover { color: #fff; background-color:#000; }
-
-.navigation a {
-	font-size: 11px;
-	color: black;
-	font-weight: bold;
-}
-
-.navigation small a {
-  font-weight: normal;
-  font-size: 11px;
-}
-  
-.navOn{
-	font-size: 11px;
-	color: grey;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.help {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-}
-
-.inputBox {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-  background-color: #eee;
-  padding: 5px;
-  margin-bottom: 20px;
-}
-
-blockquote {
-	display: block;
-	margin: 0px 0px 20px 0px;
-	padding: 0px 30px;
-	font-size:11px;
-	line-height:17px;
-  font-style: italic;  
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-ol.setup {
-  font-size: 19px;
-  font-family: georgia, verdana;
-  padding-left: 25px;
-}
-
-ol.setup li {
-  margin-bottom: 20px
-}
-
-.byline {
-  font-size: 10px;
-  font-style: italic;  
-  margin-bottom: 10px;
-  color: #999;
-}
-
-.references {
-  font-size: 10px;
-}
-
-.diffdel {
-  background: pink;
-}
-
-.diffins {
-  background: lightgreen;
-}
-
-#TextileHelp table {
-	margin-bottom: 0;
-}
-
-#TextileHelp table+h3 {
-	margin-top: 11px;
-}
-
-#TextileHelp table td {
-	font-size: 11px;
-	padding: 3px;
-	vertical-align: top;
-	border-top: 1px dotted #ccc;
-}
-
-#TextileHelp table td.arrow {
-	padding-right: 5px;
-	padding-left: 10px;
-	color: #999;
-}
-
-#TextileHelp table td.label {
-	font-weight: bold;
-	white-space: nowrap;
-	font-size: 10px;
-	padding-right: 15px;
-	color: #000;
-}
-
-#TextileHelp h3 {
-	font-size: 11px;
-	font-weight: bold;
-	font-weight: normal;
-	margin: 0 0 5px 0;
-	padding: 5px 0 0 0;
-}
-
-#TextileHelp p {
-	font-size: 10px;
-}
-
-.rightHandSide {
-   float: right;
-   width: 147px;
-   margin-left: 10px;
-   padding-left: 20px;
-   border-left: 1px dotted #ccc;
-}
-
-.rightHandSide p {
-   font-size: 10px;
-}
- 
-.newsList {
-   margin-top: 20px;
-}
-
-.newsList p {
-  margin-bottom:30px
+#Container {
+	float: none;
+	margin: 0 auto;
+	text-align: center;
+}
+
+#Content {
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+	border-top: none;
+	float: left;
+}
+
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size:   13px;
+	line-height: 18px;
+}
+
+a { color: #000; }
+
+.newWikiWord { background-color: #eee; }
+.newWikiWord a:hover { background-color: white; }
+
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+h1, h2, h3 { color: #333; font-family: georgia, verdana; }
+h1 { font-size: 28px }
+h2 { font-size: 19px }
+h3 { font-size: 16px }
+
+h1#pageName {
+	margin: 5px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+	line-height: 28px;
+}
+
+h1#pageName small {
+  color: grey;
+	line-height: 10px;
+  font-size: 10px;
+  padding: 0px;
+}
+
+a.nav, a.nav:link, a.nav:visited { color: #000; }
+a.nav:hover { color: #fff; background-color:#000; }
+
+li { margin-bottom: 7px }
+
+.navigation {
+  margin-top: 5px;
+	font-size : 12px;
+  color: #999;
+}
+
+.navigation a:hover { color: #fff; background-color:#000; }
+
+.navigation a {
+	font-size: 11px;
+	color: black;
+	font-weight: bold;
+}
+
+.navigation small a {
+  font-weight: normal;
+  font-size: 11px;
+}
+  
+.navOn{
+	font-size: 11px;
+	color: grey;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.help {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+}
+
+.inputBox {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+  background-color: #eee;
+  padding: 5px;
+  margin-bottom: 20px;
+}
+
+blockquote {
+	display: block;
+	margin: 0px 0px 20px 0px;
+	padding: 0px 30px;
+	font-size:11px;
+	line-height:17px;
+  font-style: italic;  
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+ol.setup {
+  font-size: 19px;
+  font-family: georgia, verdana;
+  padding-left: 25px;
+}
+
+ol.setup li {
+  margin-bottom: 20px
+}
+
+.byline {
+  font-size: 10px;
+  font-style: italic;  
+  margin-bottom: 10px;
+  color: #999;
+}
+
+.references {
+  font-size: 10px;
+}
+
+.diffdel, del.diffmod {
+  background: pink;
+}
+
+.diffins, ins.diffmod {
+   background: lightgreen;
+}
+
+#footer {
+  height: 14px;
+  padding: .25em 0;
+}
+
+#footer p {
+  font-size: 10px;
+  color: gray;
+  font-style: italic;
+  margin: 0;
+  float: right;
+  text-align: right;
+}
+
+#error {
+  color: darkred;
+  font-style: italic;
+  width: 600px;
+}
+
+#info {
+  color: darkgreen;
+  font-style: italic;
+  width: 600px;
+}
+
+#TextileHelp table {
+	margin-bottom: 0;
+}
+
+#TextileHelp table+h3 {
+	margin-top: 11px;
+}
+
+#TextileHelp table td {
+	font-size: 11px;
+	padding: 3px;
+	vertical-align: top;
+	border-top: 1px dotted #ccc;
+}
+
+#TextileHelp table td.arrow {
+	padding-right: 5px;
+	padding-left: 10px;
+	color: #999;
+}
+
+#TextileHelp table td.label {
+	font-weight: bold;
+	white-space: nowrap;
+	font-size: 10px;
+	padding-right: 15px;
+	color: #000;
+}
+
+#TextileHelp h3 {
+	font-size: 11px;
+	font-weight: bold;
+	font-weight: normal;
+	margin: 0 0 5px 0;
+	padding: 5px 0 0 0;
+}
+
+#TextileHelp p {
+	font-size: 10px;
+}
+
+.rightHandSide {
+   float: right;
+   width: 147px;
+   margin-left: 10px;
+   padding-left: 20px;
+   border-left: 1px dotted #ccc;
+}
+
+.rightHandSide p {
+   font-size: 10px;
+}
+ 
+.newsList {
+   margin-top: 20px;
+}
+
+.newsList p {
+  margin-bottom:30px
 }

data/script/breakpointer

@@ -0,0 +1,4 @@
+#!e:/ruby/bin/ruby
+require 'rubygems'
+require_gem 'rails'
+require 'breakpoint_client'

data/script/server

@@ -0,0 +1,93 @@
+#!/usr/bin/ruby
+
+require 'webrick'
+require 'optparse'
+require 'fileutils'
+
+pwd = File.expand_path(File.dirname(__FILE__) + "/..")
+
+OPTIONS = {
+  # Overridable options
+  :port        => 2500,
+  :ip          => '0.0.0.0',
+  :environment => 'production',
+  :server_root => File.expand_path(File.dirname(__FILE__) + '/../public/'),
+  :server_type => WEBrick::SimpleServer,
+  :storage     => "#{File.expand_path(FileUtils.pwd)}/storage",
+}
+
+ARGV.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = "Usage: ruby #{script_name} [options]"
+
+  opts.separator ''
+
+  opts.on('-p', '--port=port', Integer,
+          'Runs Instiki on the specified port.',
+          'Default: 2500') { |OPTIONS[:port]| }
+  opts.on('-b', '--binding=ip', String,
+          'Binds Rails to the specified ip.',
+          'Default: 0.0.0.0') { |OPTIONS[:ip]| }
+  opts.on('-e', '--environment=name', String,
+          'Specifies the environment to run this server under (test/development/production).',
+          'Default: production') { |OPTIONS[:environment]| }
+  opts.on('-d', '--daemon',
+          'Make Instiki run as a Daemon (only works if fork is available -- meaning on *nix).'
+          ) { OPTIONS[:server_type] = WEBrick::Daemon }
+  opts.on('-s', '--simple', '--simple-server',
+          '[deprecated] Forces Instiki not to run as a Daemon if fork is available.',
+          'Since version 0.10.0 this option is ignored.'
+          ) { puts "Warning: -s (--simple) option is deprecated. See instiki --help for details." }
+  opts.on('-t', '--storage=storage', String,
+          'Makes Instiki use the specified directory for storage.',
+          'Default: ./storage/[port]') { |OPTIONS[:storage]| }
+  opts.on('-x', '--notex',
+          'Blocks wiki exports to TeX and PDF, even when pdflatex is available.'
+          ) { |OPTIONS[:notex]| }
+  opts.on('-v', '--verbose', 
+          'Enables debug-level logging'
+          ) { OPTIONS[:verbose] = true }
+
+  opts.separator ''
+
+  opts.on('-h', '--help',
+          'Show this help message.') { puts opts; exit }
+
+  opts.parse!
+end
+
+if OPTIONS[:environment] == 'production'
+  storage_path = "#{OPTIONS[:storage]}/#{OPTIONS[:port]}"
+else
+  storage_path = "#{OPTIONS[:storage]}/#{OPTIONS[:environment]}/#{OPTIONS[:port]}"
+end
+FileUtils.mkdir_p(storage_path)
+
+ENV['RAILS_ENV'] = OPTIONS[:environment]
+INSTIKI_DEBUG_LOG = OPTIONS[:verbose]
+require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
+WikiService.storage_path = storage_path
+
+if OPTIONS[:notex]
+  OPTIONS[:pdflatex] = false
+else
+  begin
+    OPTIONS[:pdflatex] = system "pdflatex -version"
+  rescue Errno::ENOENT
+    OPTIONS[:pdflatex] = false
+  end
+end
+
+if  defined? INSTIKI_BATCH_JOB
+  require 'application'
+else
+  puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
+  puts "=> Data files are stored in #{storage_path}"
+
+  require 'webrick_server'
+  require_dependency 'application'
+
+  OPTIONS[:index_controller] = 'wiki'
+  ApplicationController.wiki = WikiService.instance
+  DispatchServlet.dispatch(OPTIONS)
+end