@@ -286,6 +286,7 @@ END_MSG if !File.exists?(url) || params[:rebuild] # no template ---> render # clear : + # TODO: we should remove info in cached_page for _main FileUtils::rmtree(File.dirname(url)) # set the places to search for the included templates @@ -309,13 +310,41 @@ END_MSG if session[:dev] && mode != '*popupLayout' # add template edit buttons - used_nodes = @expire_with_nodes.merge(@renamed_assets) - div = "<div id='dev'><ul>" + used_nodes.map do |k,n| "<li>#{skin_helper.send(:node_actions, :node=>n)} #{skin_helper.send(:link_to,k,zen_path(n))}</li>" - end.join("") + - "<li><span class='actions'><a href='?rebuild=true'>#{_('rebuild')}</a></li>" + - "<li><span class='actions'><a href='/users/#{visitor[:id]}/swap_dev'>#{_('turn dev off')}</a></span></li>" + - "<li>(#{@skin_names.join(', ')})</li>" - res.sub!('</body>', "#{div}</body>") + used_nodes = [] + zafu_nodes = [] + image_nodes = [] + asset_nodes = [] + @expire_with_nodes.merge(@renamed_assets).each do |k, n| + if n.kind_of?(Image) + image_nodes << [k,n] + elsif n.kind_of?(Template) + zafu_nodes << [k,n] + else + asset_nodes << [k,n] + end + end + used_nodes << ['zafu', zafu_nodes] unless zafu_nodes.empty? + used_nodes << ['images', image_nodes] unless image_nodes.empty? + used_nodes << ['assets', asset_nodes] unless asset_nodes.empty? + + dev_box = "<div id='dev'><ul>\n" + used_nodes.each do |name, nodes| + dev_box << " <li><a class='group' onclick='$(\"_dev_#{name}\").toggle();' href='#'>#{name}</a>\n" + dev_box << " <table id='_dev_#{name}'#{name == 'images' ? " style='display:none;'" : ''}>\n" + nodes.each do |k,n| + dev_box << " <tr><td class='actions'>#{skin_helper.send(:node_actions, :node=>n)}</td><td>#{skin_helper.send(:link_to,k,zen_path(n))}</td></tr>\n" + end + dev_box << " </table>\n" + dev_box << " </li>\n" + end + + dev_box << " <li><a class='group' onclick='$(\"_dev_tools\").toggle();' href='#'>tools</a>\n" + dev_box << " <ul id='_dev_tools'>\n" + dev_box << " <li><a href='?rebuild=true'>#{_('rebuild')}</a></li>\n" + dev_box << " <li><a href='/users/#{visitor[:id]}/swap_dev'>#{_('turn dev off')}</a></li>\n" + dev_box << " <li>skins used: #{@skin_names.join(', ')}</li>\n" + dev_box << " <ul>\n </li>\n</ul></div>" + res.sub!('</body>', "#{dev_box}</body>") end secure!(CachedPage) { CachedPage.create( app/controllers/application.rb @@ -623,7 +623,7 @@ latex_template = %q{ def calendar(options={}) if template_url = options[:template_url] - opts = eval_parameters_from_template_url(template_url).merge(options) + opts = (eval_parameters_from_template_url(template_url) || {}).merge(options) else opts = options end app/helpers/application_helper.rb @@ -19,7 +19,7 @@ <li><label><%= _('publishers') %></label><%= select('node', 'pgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li> <li><label><%= _('writers') %></label><%= select('node', 'wgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li> <li><label><%= _('readers') %></label><%= select('node', 'rgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li> - <li><label><%= _('skin') %></label><%= select('node', 'skin', form_skins,{}, {:disabled=>(@node[:inherit] != 0)}) %></li> + <li><label><%= _('skin') %></label><%= select('node', 'skin', form_skins,{}, {:disabled=>(@node[:inherit] == 1)}) %></li> <li class='submit'><%= submit_tag _('change') %></li> </form> <% else %> app/views/nodes/_groups.rhtml @@ -14,7 +14,7 @@ Assumed: 1. Copy the file 'deploy_config_example.rb' to 'deploy_config.rb' and edit the entries in this new file. 2. Run => cap initial_setup -3. Run => cap mksite -s host='example.com' -s pass='secret' +3. Run => cap mksite -s host='example.com' -s pass='secret' -s lang='en' If anything goes wrong, ask the mailing list (lists.zenadmin.org) or read the content of this file to understand what went wrong... @@ -115,7 +115,7 @@ end #========================== MANAGE HOST =========================# desc "create a new site" task :mksite, :roles => :app do - run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:default_lang] || 'en'}'" + run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:lang] || 'en'}'" create_vhost set_permissions end config/deploy.rb @@ -10,7 +10,7 @@ config.cache_classes = true # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true +config.action_view.cache_template_loading = false # or zafu will not work ! Cache.perform_caching = true CachedPage.perform_caching = true config/environments/production.rb @@ -1,6 +1,6 @@ = Welcome to Zena -Zena is a CMS. (c) teti.ch 2007 +Zena is a CMS. (c) Gaspard Bucher, teti.ch 2007 This documentation is being massively cleaned up before release. doc/README_FOR_APP @@ -45,6 +45,10 @@ ul.errors li { margin-left:0.4em; background:inherit; line-height:1.2em;} /* dev */ #dev { background:#CABFA6; font-size:10px; position:fixed; bottom:5px; right:5px; -padding:5px; border:1px solid #714D3D; } +padding:5px; border:1px solid #714D3D; text-align:left; color:#444;} #dev a { color:inherit; } -#dev ul { margin:0; } \ No newline at end of file +#dev ul, #dev li { margin:0; padding:0; list-style:none; background:none; list-style-image:none;} +#dev a.group { font-weight:bold; color:#222; display:block;} +#dev td.actions {width:40px;} +#dev li img { border:0; } +#dev li li { clear:both;} \ No newline at end of file public/stylesheets/zena.css ec173e0cfc54ba87485a1f5f297d10185a852452 Gaspard Bucher gaspard@teti.ch http://github.com/zena/zena/commit/36c50ee608aa8e08bf4336caeea4c116066bb925 36c50ee608aa8e08bf4336caeea4c116066bb925 2008-03-10T05:53:45-07:00 2008-03-10T05:53:45-07:00 Fixed a bug in ApplicationHelper preventing calendar from showing if there were no options. Better 'dev box' to show used templates (easier to read, grouped by type, groups can be closed) git-svn-id: svn://svn.zenadmin.org/zena/trunk@895 aaa19a3b-e121-0410-9d45-962fd44e537e 8aa3f4cba5950f366811464e81d0ffe976dd3ba8 Gaspard Bucher gaspard@teti.ch