Hello community,
here is the log from the commit of package webyast-licenses-ui for
openSUSE:Factory
checked in at Wed May 4 11:13:26 CEST 2011.
--------
--- webyast-licenses-ui/webyast-licenses-ui.changes 2010-08-30
11:41:53.000000000 +0200
+++
/mounts/work_src_done/STABLE/webyast-licenses-ui/webyast-licenses-ui.changes
2011-05-02 16:38:34.000000000 +0200
@@ -1,0 +2,12 @@
+Mon May 2 14:35:55 UTC 2011 - vle...@novell.com
+
+- uniform appearance for all modules in basesystem setup workflow
+- 0.2.4
+
+-------------------------------------------------------------------
+Tue Apr 12 14:15:04 UTC 2011 - sch...@novell.com
+
+- new caching
+- 0.2.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-licenses-ui.spec ++++++
--- /var/tmp/diff_new_pack.Mm4L6N/_old 2011-05-04 11:11:09.000000000 +0200
+++ /var/tmp/diff_new_pack.Mm4L6N/_new 2011-05-04 11:11:09.000000000 +0200
@@ -26,7 +26,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.2
+Version: 0.2.4
Release: 1
Summary: WebYaST - license management UI
Source: www.tar.bz2
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/controllers/eulas_controller.rb
new/www/app/controllers/eulas_controller.rb
--- old/www/app/controllers/eulas_controller.rb 2010-05-28 09:52:16.000000000
+0200
+++ new/www/app/controllers/eulas_controller.rb 2011-04-11 16:48:55.000000000
+0200
@@ -42,7 +42,7 @@
end
def ensure_id
- redirect_to :action => :show, :id => 1 and return if params[:id].nil?
+ redirect_to :action => :show, :id => 1 and return if params[:id].nil? #
RORSCAN_ITL
@eula_id = [1,params[:id].to_i].max
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/views/eulas/show.html.erb
new/www/app/views/eulas/show.html.erb
--- old/www/app/views/eulas/show.html.erb 2010-08-17 13:53:02.000000000
+0200
+++ new/www/app/views/eulas/show.html.erb 2011-04-28 14:21:06.000000000
+0200
@@ -1,61 +1,82 @@
<!--
# Copyright (c) 2009-2010 Novell, Inc.
-#
+#
# All Rights Reserved.
-#
+#
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License
# as published by the Free Software Foundation.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
-#
+#
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
-->
<% disabled = ! @permissions[:accept] %>
-<div class='plugin-icon'><img src='/icons/yast-product-registration.png'
alt="eula module"/>
+<!--<div class='plugin-icon'><img src='/icons/yast-product-registration.png'
alt="eula module"/>
<%=_("Licence Agreement")-%> - <%= @eula.name -%>
-</div>
+</div> -->
+
+<div id="eula" class="plugin-content plugin-border">
+
+<% form_for(:eula, :url => { :action => :update, :id => @eula_id }, :html=> {
:method => :put, :class=>"webyast_form"}) do |f| -%>
+
+ <div class="plugin-header">
+ <div class="left">
+ <label class="plugin-icon-container"><img class="plugin-icon"
src="/icons/registration.png"></label>
+ <label class="plugin-name"><%=_("Licence Agreement")-%> - <%= @eula.name
-%></label>
+ </div>
-<div class="plugin-content" id="eula">
-<% form_for(:eula,
- :url => { :action => :update, :id => @eula_id },
- :html=> { :method => :put}
- ) do |f| -%>
-<fieldset>
- <div class="eula-text-area">
- <%= @eula.text.gsub(%r{^[\n\n$]}, '<p
class="eula_paragraph">').gsub(%r{[\n]}, ' ')%>
+ <div class="clearfix"></div>
+ </div>
+
+ <div class="clearfix"> </div>
+
+ <fieldset class="webyast_fieldset eula_fieldset">
+ <div class="eula-text-area">
+ <%= @eula.text.gsub(%r{^[\n\n$]}, '<p
class="eula_paragraph">').gsub(%r{[\n]}, ' ')%>
+ </div>
+
+ <div class="clearfix"> </div>
+
+ <% if @eula.only_show %>
+ <%= hidden_field_tag :accepted, "true" %>
+ <% else %>
+ <div class="fieldset_body eula_fieldset_body">
+ <div class="row">
+ <%= f.radio_button :accepted, :true, :checked => @eula.accepted,
:readonly => disabled, :disabled => disabled %>
+ <%= _("Yes, I agree to the license agreement.") %>
+ </div>
+ <div class="row">
+ <%= f.radio_button :accepted, :false, :checked => (!
@eula.accepted), :readonly => disabled, :disabled => disabled %>
+ <%= _("No, I do not agree.") %>
+ </div>
+ <% end -%>
+ <% unless @eula.text_lang == 'en' then %>
+ <%= f.hidden_field :text_lang %>
+ <% end %>
+ </fieldset>
+
+ <div class="clearfix"></div>
+
+ <div class="button_container">
+ <div class="hr"> </div>
+ <div class="nav-buttons">
+ <%= form_next_button :disabled => disabled %>
+ <%= if @first_eula
+ @first_basesystem_step ? "" : (form_str_spacer + form_back_button )
+ else
+ form_str_spacer + (link_to _("Back"), :action => :show, :id =>
@prev_id)
+ end %>
+ </div>
</div>
-
- <% if @eula.only_show %>
- <%= hidden_field_tag :accepted, "true" %>
- <% else %>
- <p>
- <%= f.radio_button :accepted, :true, :checked => @eula.accepted, :readonly
=> disabled, :disabled => disabled %>
- <%= _("Yes, I agree to the license agreement.") %>
- <p></p>
- <%= f.radio_button :accepted, :false, :checked => (! @eula.accepted),
:readonly => disabled, :disabled => disabled %>
- <%= _("No, I do not agree.") %>
- </p>
- <% end -%>
- <% unless @eula.text_lang == 'en' then %>
- <%= f.hidden_field :text_lang %>
- <% end %>
-</fieldset>
-<div class="nav-buttons">
- <%= form_next_button :disabled => disabled %>
- <%= if @first_eula
- @first_basesystem_step ? "" : (form_str_spacer + form_back_button )
- else
- form_str_spacer + (link_to _("Back"), :action => :show, :id =>
@prev_id)
- end %>
-</div>
<% end -%>
</div>
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
