structure.css -> default.css

Themes are optional, a theme overrides style in default.css

lib/fraisier/README.txt

@@ -10,9 +10,8 @@ Package content:
      My_design.zip
      - info.json
      - layout.html
-     - structure.css
+     - default.css
      - themes
-          - default.css
           - blue.css
           - red.css
      - javascripts

lib/parser.rb

@@ -65,7 +65,7 @@ module Parser
       end
       c.define_tag 'stylesheets' do |tag|
         res = ''
-        res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' /> "
+        res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' /> "
         theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
         res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
       end
@@ -173,7 +173,7 @@ module Parser
       end
       c.define_tag 'stylesheets' do |tag|
         res = ''
-        res << "<link href='#{page.design.structure_css.url}' rel='stylesheet' type='text/css' />"
+        res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' />"
         theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
         res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />"
       end
@@ -226,7 +226,7 @@ module Parser
       res << menu.values["class_#{current}"]
       res << ">"
       i = nil
-      i = 1 if menu.values["li_recursive_#{current}"]
+      i = 1 if menu.values["li_incremental_#{current}"]
       if current == 1 && menu.values['home'].eql?('true')
         res << menu_li(page, current, menu, i)
         i += 1 if i
@@ -267,7 +267,7 @@ module Parser
         layout.build_menu(:levels => 0, :values => {}) unless layout.menu
         layout.menu.levels = i = tag.attr['level'].to_i
         layout.menu.values.merge!({'home' => tag.attr['home']}) if i == 1
-        layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_recursive_#{i}" => tag.attr['li_recursive']})
+        layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']})
         layout.menu.save
         tag.expand
       end