# HG changeset patch
# User bsw
# Date 1289226659 -3600
# Node ID c0835d7074650a4552a79580afb5744376ba65f7
# Parent  86931dcee1fd37db715c240b7147ce4fe12c4ea1
Area module refactored

diff -r 86931dcee1fd -r c0835d707465 app/main/area/list.lua
--- a/app/main/area/list.lua	Mon Nov 08 15:11:56 2010 +0100
+++ b/app/main/area/list.lua	Mon Nov 08 15:30:59 2010 +0100
@@ -1,9 +1,13 @@
+local areas_selector = Area:build_selector{ active = true }
+
+
 if app.session.member_id then
   slot.put_into("title", _'Area list')
 else
   slot.put_into("title", encode.html(config.app_title))
 end
 
+
 if not app.session.member_id and config.motd_public then
   local help_text = config.motd_public
   ui.container{
@@ -16,17 +20,9 @@
 
 util.help("area.list", _"Area list")
 
-local areas_selector = Area:new_selector():add_where("active")
 
 execute.view{
   module = "area",
   view = "_list",
   params = { areas_selector = areas_selector }
 }
-
---[[
-execute.view{
-  module = "delegation",
-  view = "_show_box"
-}
---]]
diff -r 86931dcee1fd -r c0835d707465 app/main/area/show.lua
--- a/app/main/area/show.lua	Mon Nov 08 15:11:56 2010 +0100
+++ b/app/main/area/show.lua	Mon Nov 08 15:30:59 2010 +0100
@@ -1,14 +1,20 @@
-local area = Area:new_selector():add_where{ "id = ?", param.get_id() }:single_object_mode():exec()
+local area = Area:by_id(param.get_id())
+
 
 app.html_title.title = area.name
 app.html_title.subtitle = _("Area")
 
+util.help("area.show")
+
+
 if config.feature_rss_enabled then
   util.html_rss_head{ title = _"Initiatives in this area (last created first)", module = "initiative", view = "list_rss", params = { area_id = area.id } }
   util.html_rss_head{ title = _"Initiatives in this area (last updated first)", module = "initiative", view = "list_rss", params = { area_id = area.id } }
 end
 
-slot.put_into("title", encode.html(_"Area '#{name}'":gsub("#{name}", area.name)))
+
+slot.put_into("title", encode.html(_("Area '#{name}'", { name = area.name })))
+
 
 ui.container{
   attr = { class = "vertical"},
@@ -17,7 +23,9 @@
   end
 }
 
+
 if app.session.member_id then
+
   slot.select("actions", function()
     ui.link{
       content = function()
@@ -29,11 +37,7 @@
       params = { area_id = area.id }
     }
   end)
-end
 
-util.help("area.show")
-
-if app.session.member_id then
   execute.view{
     module = "membership",
     view = "_show_box",
@@ -48,100 +52,6 @@
 
 end
 
---[[
-for i, issue in ipairs(area.issues) do
-  local head_name = "issue_head_content_" .. tostring(issue.id)
-  local name = "issue_content_" .. tostring(issue.id)
-  local icon_name = "issue_icon_" .. tostring(issue.id)
-  ui.container{
-    attr = { class = "ui_tabs" },
-    content = function()
-      local onclick = 
-        'if (ui_tabs_active["' .. name .. '"]) {' ..
-          'el=document.getElementById("' .. name .. '");' ..
-          'el.innerHTML="";' ..
-          'el.style.display="none";' ..
-          'ui_tabs_active["' .. name .. '"]=false' ..
-        '} else {' ..
-          'ui_tabs_active["' .. name .. '"]=true;' ..
-          'document.getElementById("' .. name .. '").style.display="block"; ' ..
-          'var hourglass_el = document.getElementById("' .. icon_name .. '");' ..
-          'var hourglass_src = hourglass_el.src;' ..
-          'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
-          'partialMultiLoad(' ..
-            '{ trace: "trace", system_error: "system_error", ' .. name .. '_title: "title", ' .. name .. '_actions: "actions", ' .. name .. '_content: "default" },' ..
-            '{},' ..
-            '"error",' ..
-            '"' .. request.get_relative_baseurl() .. 'issue/show/' .. tostring(issue.id) .. '.html?&_webmcp_json_slots[]=title&_webmcp_json_slots[]=actions&_webmcp_json_slots[]=default&_webmcp_json_slots[]=trace&_webmcp_json_slots[]=system_error&dyn=1",' ..
-            '{},' ..
-            '{},' ..
-            'function() {' ..
-              'hourglass_el.src = hourglass_src;' ..
-            '},' ..
-            'function() {' ..
-              'hourglass_el.src = hourglass_src;' ..
-            '}' ..
-          '); ' ..
-        '}' ..
-        'return(false);'
-      ui.link{
-        attr = {
-          name = name,
-          class = "ui_tabs_accordeon_head",
-          id = head_name,
-          onclick = onclick,
-        },
-        module  = "issue",
-        view    = "show",
-        id      = issue.id,
-        params  = params,
-        anchor  = name,
-        content = function()
-          ui.image{
-            attr = { id = icon_name },
-            static = "icons/16/script.png"
-          }
-          ui.container{
-            attr = { style = "float: right;" },
-            content = function()
-              
-            end
-          }
-          slot.put(tostring(issue.id))
-        end
-      }
-    end
-  }
-
-  ui.container{
-    attr = {
-      id = name,
-      class = "ui_tabs_accordeon_content",
-    },
-    content = function()
-      ui.container{ attr = { id = name .. "_title",   }, content = function() slot.put(" ") end }
-      ui.container{ attr = { id = name .. "_actions", }, content = function() slot.put(" ") end }
-      ui.container{ attr = { id = name .. "_content", }, content = function() 
-        execute.view{
-          module = "initiative",
-          view = "_list",
-          params = {
-            issue = issue,
-            initiatives_selector = issue:get_reference_selector("initiatives"),
-            limit = 3,
-            per_page = 3,
-            no_sort = true,
-          }
-        }
-      end }
-    end
-  }
-
-  if config.user_tab_mode == "accordeon_all_expanded" then
-    ui.script{ script = 'document.getElementById("' .. head_name .. '").onclick();' }
-  end
-end
---]]
 
 execute.view{
   module = "area",
diff -r 86931dcee1fd -r c0835d707465 app/main/area/show_tab.lua
--- a/app/main/area/show_tab.lua	Mon Nov 08 15:11:56 2010 +0100
+++ b/app/main/area/show_tab.lua	Mon Nov 08 15:30:59 2010 +0100
@@ -1,4 +1,4 @@
-local area = param.get("area", "table") or Area:by_id(param.get("area_id", atom.integer))
+local area = param.get("area", "table") or Area:by_id(param.get_id())
 
 local issues_selector = area:get_reference_selector("issues")
 local members_selector = area:get_reference_selector("members")