Vous venez de créer un site nanoc.
+
diff --git a/layouts/default.html b/layouts/default.html
index 98950f580..1344d3423 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -1,16 +1,9 @@
-----
-
-# # les representations (une par langue + une multi)
-# reps:
-# default: {}
-# en: {}
-# fr: {}
-
-----
<%
# -- init variables --
class LocalConf
- attr_accessor :multi, :blog, :article, :languages, :language, :indent
+ attr_accessor :blog, :article, :languages, :language, :indent
def to_s
instance_variables.map{ |x|
if instance_variable_get(x).class == Array
@@ -24,26 +17,26 @@ end
conf=LocalConf.new
-# the current rep is the multi one
-multi= ( @item_rep.name == :default )
-conf.multi=multi
-# the current item is an article
-article= ( ( not @item[:kind].nil? ) && @item[:kind] == 'article' )
-conf.article=article
-# the current rep language (if not multi)
-language= ( @item_rep.name )
+language=@item_rep.path
+language.sub!(/\/Scratch\//,'').sub!(/\/.*$/,'')
conf.language=language
+
+# the current item is an article
+article=( ( not @item[:kind].nil? ) && @item[:kind] == 'article' )
+conf.article=article
+
# the current item is a blog entry page
-blog= ( ( not @item[:kind].nil? ) && @item[:kind] == 'blog' )
+blog=( ( not @item[:kind].nil? ) && @item[:kind] == 'blog' )
conf.blog=blog
+
# all supported languages
languages=@config[:languages]
conf.languages=languages
self.instance_variable_set(:@conf, conf)
-puts '---'
-# puts conf.to_s
+puts '--- conf ---'
+puts conf.to_s
%>
<%= puts %{tradOf(:langue)} %>
- <%= puts %{generateLanguageChoice} %>
+
+
+ <% languages.each do |l| %>
+ - <%= l %>
+ <% end %>
+
+
<% if article %>
- <%= puts %{generateMultiMenuForBlog} %>
+ <%= puts %{generateMenuForBlog} %>
<% else %>
- <%= puts %{generateMultiMenu} %>
+ <%= puts %{generateMenu} %>
<% end %>
- <% if multi %>
-
- <% end %>
-
- <%= multiTitle %>
+ <%= @item[:title] %>
- <% unless @item[:multiSubTitle].nil? %>
+ <% unless @item[:subtitle].nil? %>
- <%= multiSubTitleFor(@page) %>
+ <%= @item[:subtitle] %>
<% end %>
@@ -155,7 +118,7 @@ puts '---'
<% end %>
- <%= puts %{generateMultiSubMenuFor(@page)} %>
+ <%= puts %{generateSubMenuFor} %>
- <%= previousFor(@page) %>
- <%= nextFor(@page) %>
-
-
+ <%= previousFor(@item) %>
+ <%= nextFor(@item) %>
+
+
diff --git a/lib/multi.rb b/lib/multi.rb
index e6191ec92..9955212df 100644
--- a/lib/multi.rb
+++ b/lib/multi.rb
@@ -1,30 +1,5 @@
-def multiPageTitle
- if @conf.multi
- @item.title
- else
- @item[:multiTitle][@conf.language]
- end
-end
-
-def multiTitle
- multiTitleFor(@item)
-end
-
-def multiTitleFor(item)
- begin
- if @conf.multi
- @conf.languages.map{ |l| %{#{item[:multiTitle][l.intern]}} }.join("\n")
- else
- item[:multiTitle][@conf.language]
- end
- rescue
- puts "ERROR (lib/multi.rb) certainement pas d'attribut multiTitle"
- return item[:title]
- end
-end
-
def tradOf(keyword)
-
+ tradOfKeywordIn(keyword, @conf.language )
end
def tradOfKeywordIn(keyword, language)
@@ -46,3 +21,8 @@ def tradOfKeywordIn(keyword, language)
return '[Sorry Translation Error]'
end
end
+
+def item_of_language(language)
+ puts %{lib/multi::item_of_language not implemented yet}
+ return @item
+end
diff --git a/output/style.css b/output/style.css
deleted file mode 100644
index f955a9b4a..000000000
--- a/output/style.css
+++ /dev/null
@@ -1,99 +0,0 @@
-* {
- margin: 0;
- padding: 0;
-
- font-family: Georgia, Palatino, Times, 'Times New Roman', sans-serif;
-}
-
-body {
- background: #fff;
-}
-
-a {
- text-decoration: none;
-}
-
-a:link,
-a:visited {
- color: #f30;
-}
-
-a:hover {
- color: #f90;
-}
-
-#main {
- position: absolute;
-
- top: 40px;
- left: 280px;
-
- width: 500px;
-}
-
-#main h1 {
- font-size: 40px;
- font-weight: normal;
-
- line-height: 40px;
-
- letter-spacing: -1px;
-}
-
-#main p {
- margin: 20px 0;
-
- font-size: 15px;
-
- line-height: 20px;
-}
-
-#main ul {
- margin: 20px;
-}
-
-#main li {
- list-style-type: square;
-
- font-size: 15px;
-
- line-height: 20px;
-}
-
-#sidebar {
- position: absolute;
-
- top: 40px;
- left: 20px;
- width: 200px;
-
- padding: 20px 20px 0 0;
-
- border-right: 1px solid #ccc;
-
- text-align: right;
-}
-
-#sidebar h2 {
- text-transform: uppercase;
-
- font-size: 13px;
-
- color: #333;
-
- letter-spacing: 1px;
-
- line-height: 20px;
-}
-
-#sidebar ul {
- list-style-type: none;
-
- margin: 20px 0;
-}
-
-#sidebar li {
- font-size: 14px;
-
- line-height: 20px;
-}
- <% end %>
+ 
-
-
- <%= tradOf('whatsthis') %>
-
-
- <% end %>
- <% else %>
-
+