From d11922d2c2afae20f5d70bedbba0257159bd2867 Mon Sep 17 00:00:00 2001 From: lmh <> Date: Mon, 25 Sep 2006 06:02:43 +0000 Subject: [PATCH] Some working stuff added. git-svn-id: file:///home/svn/framework3/trunk@3950 4d416f70-5f16-0410-b530-b9f4589650da --- data/msfweb/app/helpers/application_helper.rb | 10 ++++++++ data/msfweb/app/views/layouts/msfweb.rhtml | 12 +++++++-- data/msfweb/app/views/payloads/list.rhtml | 25 +++++++++++-------- data/msfweb/public/javascripts/application.js | 1 + data/msfweb/public/stylesheets/msfweb.css | 7 ++++-- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/data/msfweb/app/helpers/application_helper.rb b/data/msfweb/app/helpers/application_helper.rb index 22a7940eb2..a72313d9c7 100644 --- a/data/msfweb/app/helpers/application_helper.rb +++ b/data/msfweb/app/helpers/application_helper.rb @@ -1,3 +1,13 @@ +# Copyright (c) 2006 L.M.H +# All Rights Reserved. + # Methods added to this helper will be available to all templates in the application. module ApplicationHelper + + # Updates a node (ex. div container) by it's ID with content from + # specified URL. + def dojo_node_update(node_id, target_url) + return "dojo.io.updateNode('"+ node_id +"',{url:'"+ target_url +"'}" + end + end diff --git a/data/msfweb/app/views/layouts/msfweb.rhtml b/data/msfweb/app/views/layouts/msfweb.rhtml index 230c74d05a..e0f4197206 100644 --- a/data/msfweb/app/views/layouts/msfweb.rhtml +++ b/data/msfweb/app/views/layouts/msfweb.rhtml @@ -12,12 +12,20 @@ <%= javascript_include_tag "application" %> @@ -25,7 +33,7 @@
-
+
@@ -78,7 +86,7 @@ -
+
<%= @content_for_layout %>
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml index cbc08f15b1..71ccf2b999 100644 --- a/data/msfweb/app/views/payloads/list.rhtml +++ b/data/msfweb/app/views/payloads/list.rhtml @@ -1,10 +1,15 @@ -
-
Module - Title
-
    - <% $framework.payloads.each_module do |path, pcls| - m = pcls.new - %> -
  • <%= link_to_remote path, :url => {:controller => "payloads", :action => "view", :id => path}, :update => 'mainmenu' %> - <%= m.name %>
    • - <% end %> -
-
\ No newline at end of file + \ No newline at end of file diff --git a/data/msfweb/public/javascripts/application.js b/data/msfweb/public/javascripts/application.js index 1d74703fca..449e6e75e2 100644 --- a/data/msfweb/public/javascripts/application.js +++ b/data/msfweb/public/javascripts/application.js @@ -4,6 +4,7 @@ */ var about_dlg; +var main_Pane = dojo.widget.byId("maincontent"); function help_functions(e) { about_dlg = dojo.widget.byId("AboutDialog"); diff --git a/data/msfweb/public/stylesheets/msfweb.css b/data/msfweb/public/stylesheets/msfweb.css index 33206b938a..0a9dea0f9c 100644 --- a/data/msfweb/public/stylesheets/msfweb.css +++ b/data/msfweb/public/stylesheets/msfweb.css @@ -13,6 +13,7 @@ body { } #maincontent { + margin-top: 2em; position: relative; min-height: 100%; height: 100%; @@ -20,10 +21,12 @@ body { #maintaskbar { bottom: 0; - position: absolute; height: 32px; overflow: hidden; - width: 101%; + width: 600px; + text-align: center; + left: 50%; + margin-left: -300px; } .dojoDialog {