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

Syntax Colouring

Browse source 
New syntax colouring modes.
In addition to the existing
  html, xml, ruby
we now support
  yaml, ansic, javascript, sqlite, css
This commit is contained in:
Jacques Distler 2009-12-24 00:45:45 -06:00
parent 1d32d45944
commit af0f607e75
11 changed files with 627 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,10 @@
color: #<%= @web ? @web.color : "393" %>;
}
<%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
<%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
</style>
<%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %>
<%= stylesheet_link_tag 'syntax', :media => 'all' unless @inline_style %>
<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style : '' %>

3
app/views/wiki/s5.rhtml
View file

@ -13,6 +13,7 @@
<meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" />
<!-- style sheet links -->
<%= stylesheet_link_tag "/stylesheets/syntax.css", :media => 'all', :id => 'syntaxStyle' %>
<%= stylesheet_link_tag "/s5/ui/core/outline.css", :media => 'screen', :id => 'outlineStyle' %>
<%= stylesheet_link_tag "/s5/ui/core/print.css", :media => 'print', :id => 'slidePrint' %>
<%= stylesheet_link_tag "/s5/ui/core/opera.css", :media => 'projection', :id => 'operaFix' %>
@ -20,8 +21,8 @@
<%= stylesheet_link_tag "/s5/themes/#{@s5_theme}/slides.css", :media => 'projection', :id => 'slideProj' %>
<!-- S5 JS -->
<%= javascript_include_tag "/s5/ui/core/slides.js" %>
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag "/s5/ui/core/slides.js" %>
</head>
<body>