ref: refs/heads/master commit e4bd3e3d468a5306a9a7ec236c0b0a757c88d49d Author: Robert Lihm Date: Tue Nov 3 17:18:40 2009 +0100 unified position of module-headlines --- .../app/views/administrator/index.html.erb | 6 ++++-- plugins/language/app/views/language/index.rhtml | 2 +- plugins/network/app/views/network/index.html.erb | 2 +- .../app/views/patch_updates/index.html.erb | 2 +- .../app/views/registration/index.rhtml | 4 ++-- .../app/views/samba_server/edit.html.erb | 2 +- .../app/views/samba_server/index.html.erb | 2 +- .../app/views/samba_server/new.html.erb | 2 +- plugins/security/app/views/security/create.erb | 3 +-- plugins/security/app/views/security/update.erb | 3 +-- plugins/services/app/views/services/index.rhtml | 4 +--- plugins/status/app/views/status/index.html.erb | 2 +- .../systemtime/app/views/systemtime/index.rhtml | 2 +- plugins/users/app/views/users/index.html.erb | 3 +-- webclient/public/stylesheets/style.css | 3 ++- 15 files changed, 20 insertions(+), 22 deletions(-) diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb index 7f63e4d..c0129cd 100644 --- a/plugins/administrator/app/views/administrator/index.html.erb +++ b/plugins/administrator/app/views/administrator/index.html.erb @@ -1,5 +1,7 @@ <div class='plugin-icon'><img src='/icons/yast-users.png' alt='<%= _("Administrator Settings") %>'/></div> +<h2><%=_("Administrator Settings")%></h2> +<div class="plugin-content grid_12"> <% content_for :head do %> <%= javascript_include_tag :defaults %> @@ -45,8 +47,6 @@ <% end %> -<h2><%=_("Administrator Settings")%></h2> - <% disabled = ! @permissions[:write] %> <% form_for(:administrator, @administrator, :url => { :action => "update" }, :html => { :method => :put, :id => "adminForm" } ) do |f| %> @@ -69,3 +69,5 @@ <p><%= form_send_buttons :onclick=>"alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;" %> </p> <% end %> + +</div> \ No newline at end of file diff --git a/plugins/language/app/views/language/index.rhtml b/plugins/language/app/views/language/index.rhtml index 2bbef54..1c67b33 100644 --- a/plugins/language/app/views/language/index.rhtml +++ b/plugins/language/app/views/language/index.rhtml @@ -1,6 +1,6 @@ <div class='plugin-icon'>"/></div> -<div class='plugin-content'> <h2><%=_("Language")%></h2> +<div class='plugin-content grid_12'> <br/> <% form_tag '/language/update' do -%> diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb index aa29aca..3e48c16 100644 --- a/plugins/network/app/views/network/index.html.erb +++ b/plugins/network/app/views/network/index.html.erb @@ -60,7 +60,7 @@ <% end %> <div class='plugin-icon'><img src='/icons/yast-network.png' alt=''/></div> <h2><%=_("Network")%></h2> -<div class='plugin-content'> +<div class='plugin-content grid_12'> <% form_tag("/network", :method => "get") do %> <!-- (collection, value, text, selected) --> diff --git a/plugins/patch_updates/app/views/patch_updates/index.html.erb b/plugins/patch_updates/app/views/patch_updates/index.html.erb index bc0ebae..bbc21b0 100644 --- a/plugins/patch_updates/app/views/patch_updates/index.html.erb +++ b/plugins/patch_updates/app/views/patch_updates/index.html.erb @@ -9,8 +9,8 @@ </style> <div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div> - <div class='plugin-content'> <h2><%=_("Updates") %></h2> + <div class='plugin-content grid_12'> <div class="loading"></div> <% if @patch_updates.empty? %> <h3><%=_("Your system is up to date.") %></h3> diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index 07e7795..4fa518c 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -1,7 +1,7 @@ <div class='plugin-icon'>"/></div> -<div class='plugin-content'> <h2><%=_("Registration")%></h2> -<br/> + +<div class='plugin-content grid_12'> <% form_tag '/registration/update' do -%>

"> diff --git a/plugins/samba_server/app/views/samba_server/edit.html.erb b/plugins/samba_server/app/views/samba_server/edit.html.erb index a53ec0f..29f9e84 100644 --- a/plugins/samba_server/app/views/samba_server/edit.html.erb +++ b/plugins/samba_server/app/views/samba_server/edit.html.erb @@ -1,4 +1,4 @@ -<h1><%=_("Edit Samba Share")%></h1> +<h3><%=_("Edit Samba Share")%></h3> <br> <% disabled = ! @permissions[:editshare] %> diff --git a/plugins/samba_server/app/views/samba_server/index.html.erb b/plugins/samba_server/app/views/samba_server/index.html.erb index fed4065..4e500a3 100644 --- a/plugins/samba_server/app/views/samba_server/index.html.erb +++ b/plugins/samba_server/app/views/samba_server/index.html.erb @@ -1,6 +1,6 @@ <div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div> -<div class='plugin-content'> <h2><%=_("Exported Samba Shares")%></h2> +<div class='plugin-content grid_12'> <%= html_simple_table([_("Samba Shares")], @shares, [:id], {:add => @permissions[:addshare], :edit => @permissions[:editshare], :delete => @permissions[:deleteshare], :id => :id})%> </div> diff --git a/plugins/samba_server/app/views/samba_server/new.html.erb b/plugins/samba_server/app/views/samba_server/new.html.erb index 3fa5725..82cb155 100644 --- a/plugins/samba_server/app/views/samba_server/new.html.erb +++ b/plugins/samba_server/app/views/samba_server/new.html.erb @@ -1,4 +1,4 @@ -<h1><%=_("New Samba Share")%></h1> +<h3><%=_("New Samba Share")%></h3> <% form_for :share, :url => { :action => "create"} do |f| %> <%= f.error_messages %> diff --git a/plugins/security/app/views/security/create.erb b/plugins/security/app/views/security/create.erb index 57778f3..a4f9736 100644 --- a/plugins/security/app/views/security/create.erb +++ b/plugins/security/app/views/security/create.erb @@ -1,7 +1,6 @@ <div class='plugin-icon'><img src='/icons/yast-security.png'/></div> -<div class='plugin-content'> - <h2><%=_("Security")%></h2> +<div class="plugin-content grid_12"> <% form_tag '/security/update' do %> diff --git a/plugins/security/app/views/security/update.erb b/plugins/security/app/views/security/update.erb index b408dd6..3ee7d24 100644 --- a/plugins/security/app/views/security/update.erb +++ b/plugins/security/app/views/security/update.erb @@ -1,7 +1,6 @@ <div class='plugin-icon'><img src='/icons/yast-security.png'/></div> -<div class='plugin-content'> - <h2><%=_("Security")%></h2> +<div class="plugin-content grid_12"> <% form_tag '/security/update' do %> <span> diff --git a/plugins/services/app/views/services/index.rhtml b/plugins/services/app/views/services/index.rhtml index 1d0ed0c..2830ec5 100644 --- a/plugins/services/app/views/services/index.rhtml +++ b/plugins/services/app/views/services/index.rhtml @@ -6,8 +6,6 @@ <!-- end: dialog box --> <div class='plugin-icon'><img src='/icons/yast-online_update.png' alt=''/></div> -<div class='plugin-content'> - <h2><%= if params.has_key?("custom") @@ -17,7 +15,7 @@ else end %></h2> -<br/> +<div class="plugin-content grid_12"> <% unless @permissions[:execute] %> <p><%=_("You do not have permission to execute the services. The links are disabled.")%></p> diff --git a/plugins/status/app/views/status/index.html.erb b/plugins/status/app/views/status/index.html.erb index 84301c5..619d594 100644 --- a/plugins/status/app/views/status/index.html.erb +++ b/plugins/status/app/views/status/index.html.erb @@ -21,8 +21,8 @@ $(document).ready(function() { <% end %> <div class='plugin-icon'><img src='/images/monitoring.png'/></div> -<div class='plugin-content'> <h2><%=_("Status")%></h2> +<div class="plugin-content grid_12"> <h3><%= _("Events") %></h3> diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 431ce67..a45ba0c 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -48,7 +48,7 @@ <div class='plugin-icon'><img src='/icons/yast-ntp-client.png' alt="time module"/></div> <h2><%=_("Time")%></h2> - <div class='plugin-content'> + <div class="plugin-content grid_12"> <% form_tag '/systemtime/update', {:class => 'container', :onsubmit => "submitTime();"} do %> <% #TODO tooltip for form <div> _("Table for settings timezone for target machine.") </div> %> diff --git a/plugins/users/app/views/users/index.html.erb b/plugins/users/app/views/users/index.html.erb index 4b95317..6f4fe8e 100644 --- a/plugins/users/app/views/users/index.html.erb +++ b/plugins/users/app/views/users/index.html.erb @@ -1,7 +1,6 @@ <div class='plugin-icon'><img src='/icons/yast-users.png'/></div> -<div class='plugin-content'> - <h2><%=_("Local User")%></h2> +<div class="plugin-content grid_12"> <table class="list"> <tr> diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index a703092..d94b7a5 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -534,6 +534,8 @@ input[type="submit"] { clear: left; + min-height: 5em; + -moz-border-radius: 5px; -webkit-border-radius: 5px; -khtml-border-radius: 5px; @@ -596,7 +598,6 @@ th.checkbox { } .flash-message { margin-top: 20px; - padding: 0.7em; } .flash-message span { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org

Show replies by date