commit webyast-firewall-ui for openSUSE:Factory
Hello community, here is the log from the commit of package webyast-firewall-ui for openSUSE:Factory checked in at Wed May 4 11:39:45 CEST 2011. -------- --- webyast-firewall-ui/webyast-firewall-ui.changes 2010-09-06 14:10:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-firewall-ui/webyast-firewall-ui.changes 2011-04-12 16:19:37.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Apr 12 14:18:27 UTC 2011 - schubi@novell.com + +- new caching +- 0.2.9 + +------------------------------------------------------------------- +Fri Apr 8 08:05:28 UTC 2011 - vlewin@novell.com + +- fixed failed functional test in webyast-firewal-ui +- 0.2.8 + +------------------------------------------------------------------- +Mon Dec 13 10:45:50 UTC 2010 - vgorobets@novell.com + +- New Firewall design +- added short description for firewall services +- sorted services list +- vertical aligment of services containers +- new ON/OFF switcher with visual indicator +- 0.2.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-firewall-ui.spec ++++++ --- /var/tmp/diff_new_pack.nFNb12/_old 2011-05-04 11:39:29.000000000 +0200 +++ /var/tmp/diff_new_pack.nFNb12/_new 2011-05-04 11:39:29.000000000 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.6 +Version: 0.2.9 Release: 1 Summary: WebYaST - Firewall settings UI Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/firewall/index.rhtml new/www/app/views/firewall/index.rhtml --- old/www/app/views/firewall/index.rhtml 2010-09-06 13:59:42.000000000 +0200 +++ new/www/app/views/firewall/index.rhtml 2011-04-12 11:29:23.000000000 +0200 @@ -19,31 +19,117 @@ # you may find current contact information at www.novell.com --> +<% content_for :head do %> + <% unless JSMIN == true %> + <%= javascript_include_tag "webyast-firewall" %> + <%= stylesheet_link_tag "webyast-firewall" %> + <% end %> +<% end %> + <% disabled = !@permissions[:write] %> -<% content_for :head do %> -<!-- <%= javascript_include_tag :defaults %> --> - <% javascript_tag do -%> - $(document).ready(function(){ +<!-- <div class='plugin-icon'><img src='/icons/yast-firewall.png' alt="firewall module"/><%=_("Firewall")%><span id="questionMark">?</span></div> --> - $("#blocked_services div").click( function(){ - $(this).hide(); - $("#fw_services_values input."+$(this).attr("value")).attr("value", "true"); - $("#allowed_services div[value='"+$(this).attr("value")+"']").show(); - }); - - $("#allowed_services div").click( function(){ - $(this).hide(); - $("#fw_services_values input."+$(this).attr("value")).attr("value", "false"); - $("#blocked_services div[value='"+$(this).attr("value")+"']").show(); - }); +<div class="plugin-content plugin-border"> + <%= render :partial => 'shared/missing_write_permissions' if disabled %> + <% form_tag '/firewall/update', {:id=>'firewallForm', :class => 'container', :onsubmit => "return validateNeededServices()" } do %> + + <div id="firewallbar" class="plugin-header"> + <div class="left" style="float:left"> + <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/firewall.png"></label> + <label class="plugin-name">Firewall</label><span id="questionMark" style="margin:0px 15px; float:none;">?</span> + </div> + + <div class="right" > + <span class="right" style="padding:2px; background:#f5f5f5; -moz-border-radius:2px; -webkit-border-radius:2px;"> + <% if @firewall.use_firewall %> + <button id="on" class="active" value="on"><%=_("Enabled")%></button> + <button id="off" value="off"><%=_("Disabled")%></button> + <% else %> + <button id="on" value="on"><%=_("Enabled")%></button> + <button id="off" class="active" value="off"><%=_("Disabled")%></button> + <% end %> + </span> + </div> + <div class="clearfix"></div> + </div> + + <div id="fw_services_values"> + <% @firewall.fw_services.each do |service| %> + <input type="hidden" + name="<%= service.input_name %>" + class="<%= service.css_class %>" + value="<%= service.allowed ? 'true' : 'false' %>" + /> + <% end %> + </div> + + <input type="checkbox" name="use_firewall" id="use_firewall" value="true" <%= "checked=\"checked\"" if @firewall.use_firewall %> <%= "disabled=\"disabled\"" if disabled %> /> - $("#blocked_services div").filter( function(index) { - return $("#fw_services_values input."+$(this).attr("value")).attr("value") == "true"; +<!-- <div id="firewall" class="border"> + <% if @firewall.use_firewall %> + <img id="indicator" src="images/firewall-on-led.png"> + <% else %> + <img id="indicator" src="images/firewall-off-grey.png"> + <% end %> + <label id="indicatorLabel" for="use_firewall"><%=_("Use Firewall")%></label> + <% if @firewall.use_firewall %> + <a id="on" class="btn leftBtn selected"> ON </a> + <a id="off" class="btn rightBtn">OFF</a> + <% else %> + <a id="on" class="btn leftBtn"> ON </a> + <a id="off" class="btn rightBtn selected">OFF</a> + <% end %> + </div>--> + + <div class="clearfix"></div> + + <div id="firewall-wrapper"> + <div id="allowedContainer"> + <label><span class="icon-border"><img class="label-image" src="images/locko.png"></span><%= _("Allowed services") %></label> + <% if @firewall.use_firewall %> + <script type="text/javascript">jQuery(function($){ enableFirewallForm() })</script> + <div id="allowed_services" class="services round10"> + <% else %> + <div id="allowed_services" class="services round10 firewallForm_disabled"> + <% end %> + + <% @firewall.fw_services.each do |service| %> + <span value="<%= service.css_class %>" class="firewall-service" original-title="<%= service.description if service.respond_to? :description %>"><%= service.name %></span> + <% end %> + </div> + </div> + + <div id="blockedContainer"> + <label><span class="icon-border"><img class="label-image" src="images/lock.png"></span><%= _("Blocked services") %></label> + <% if @firewall.use_firewall %> + <div id="blocked_services" class="services round10"> + <% else %> + <div id="blocked_services" class="services round10 firewallForm_disabled"> + <% end %> + <% @firewall.fw_services.each do |service| %> + <span value="<%= service.css_class %>" class="firewall-service" original-title="<%= service.description if service.respond_to? :description %>"><%= service.name %></span> + <% end %> + </div> + </div> + + <div class="clearfix"></div> + + <div class="nav-buttons"> + <%= form_send_buttons :disabled => disabled, :class => "button", :id=>"firewallSubmitButton" %> + </div> + <% end %> + </div> +</div> + +<script> + $(document).ready(function(){ + $("#blocked_services span").filter( function(index) { + return $("#fw_services_values input."+$(this).attr("value")).attr("value") == "true"; }).hide(); - $("#allowed_services div").filter( function(index) { - return $("#fw_services_values input."+$(this).attr("value")).attr("value") == "false"; + $("#allowed_services span").filter( function(index) { + return $("#fw_services_values input."+$(this).attr("value")).attr("value") == "false"; }).hide(); }); @@ -51,16 +137,16 @@ var use_firewall_old = <%= @firewall.use_firewall ? "true" : "false" %>; var needed_services = <%= @needed_services_js %>; var confirm_text = <%= jss _("Some of needed services (%s) are going to be blocked. WebYaST may not be usable anymore. Do you really want to block them?") %>; + function isBlockedAndWasAllowed(service) { var is_blocked = ( $("#fw_services_values input[name='"+service.input_name+"']")[0].value == 'false' ); return is_blocked && (service.allowed || ! use_firewall_old); } + function blockedNames(services) { return services.filter( isBlockedAndWasAllowed ).map( function(s) { return s.name }); } - var message = <%= jss _("Please wait") -%>; - if ( $("#use_firewall")[0].checked ) { if ( needed_services.some( isBlockedAndWasAllowed ) ) { if (!confirm( confirm_text.replace("%s", blockedNames(needed_services).join(", ")) ) ){ @@ -68,72 +154,14 @@ } } } - disableFormOnSubmit(message); + + var message = <%= jss _("Please wait") -%>; + $.modalDialog.wait( {message: message}); return true; } - <% end -%> - <style> - div.firewall-service { - float: left; - width: 10em; - margin: 3px 0 3px 3px; - } - </style> -<% end %> - -<div class='plugin-icon'><img src='/icons/yast-firewall.png' alt="firewall module"/><%=_("Firewall")%></div> - -<div class="plugin-content"> - - <%= render :partial => 'shared/missing_write_permissions' if disabled %> - - <% form_tag '/firewall/update', {:class => 'container', :onsubmit => "return validateNeededServices()" } do %> - <div id="fw_services_values"> - <% @firewall.fw_services.each do |service| %> - <input type="hidden" - name="<%= service.input_name %>" - class="<%= service.css_class %>" - value="<%= service.allowed ? 'true' : 'false' %>" - /> - <% end %> - </div> + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'firewall', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); - <fieldset id="firewall"> - <legend><%= _("General settings") %></legend> - <% #don't use check_box helper as it generate also hidden opposite value - %> - <label for="use_firewall"><%=_("Use Firewall")%></label> - <input type="checkbox" name="use_firewall" id="use_firewall" value="true" - <%= "checked=\"checked\"" if @firewall.use_firewall %> - <%= "disabled=\"disabled\"" if disabled %> - /> - - <% #don't use check_box helper as it generate also hidden opposite value - %> - </fieldset> - <fieldset> - <legend><%= _("Allowed services") %></legend> - <div id="allowed_services"> - <% @firewall.fw_services.each do |service| %> - <div value="<%= service.css_class %>" class="firewall-service"> - <a><%= service.name %></a> - </div> - <% end %> - </div> - </fieldset> - <fieldset> - <legend><%= _("Blocked services") %></legend> - <div id="blocked_services"> - <% @firewall.fw_services.each do |service| %> - <div value="<%= service.css_class %>" class="firewall-service"> - <a><%= service.name %></a> - </div> - <% end %> - </div> - </fieldset> - <div class="nav-buttons"> - <%= form_send_buttons :disabled => disabled, :class => "button", :id=>"firewallSubmitButton" %> - </div> - <% end %> -</div> + $(document).ready(initChagesTrack(<%= jss _("You have unsaved changes. Do you want to save your changes?") -%>)); +</script> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/fixtures/firewall.xml new/www/test/fixtures/firewall.xml --- old/www/test/fixtures/firewall.xml 2010-07-29 15:49:26.000000000 +0200 +++ new/www/test/fixtures/firewall.xml 2011-04-12 11:29:23.000000000 +0200 @@ -1,100 +1,155 @@ <firewall> - <use_firewall type="boolean">true</use_firewall> - <fw_services type="array"> - <fw_services> - <name>dnsmasq</name> - <id>service:dnsmasq-dns</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>dnsmasq</name> - <id>service:dnsmasq-dhcp</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>WebYaST UI</name> - <id>service:webyast-ui</id> - <allowed type="boolean">true</allowed> - </fw_services> - <fw_services> - <name>lighttpd</name> - <id>service:lighttpd-ssl</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>xdmcp</name> - <id>service:xdmcp</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>Netbios Server</name> - <id>service:netbios-server</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>NIS Client</name> - <id>service:ypbind</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>Samba Client</name> - <id>service:samba-client</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>VNC mini-HTTP server</name> - <id>service:vnc-httpd</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>lighttpd</name> - <id>service:lighttpd</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>SMTP with Postfix</name> - <id>service:postfix</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>VNC</name> - <id>service:vnc-server</id> - <allowed type="boolean">true</allowed> - </fw_services> - <fw_services> - <name>xntp Server</name> - <id>service:ntp</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>Squid Service</name> - <id>service:squid</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>NFS Client</name> - <id>service:nfs-client</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>Samba Server</name> - <id>service:samba-server</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>VNC Server</name> - <id>service:xorg-x11-server</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>Secure Shell Server</name> - <id>service:sshd</id> - <allowed type="boolean">false</allowed> - </fw_services> - <fw_services> - <name>cups</name> - <id>service:cups</id> - <allowed type="boolean">false</allowed> - </fw_services> + <use_firewall type="boolean">true</use_firewall> + <fw_services type="array"> + <fw_services> + <name>MySQL server</name> + <id>service:mysql</id> + <description>opens ports for MySQL in order to allow other hosts connect to it</description> + <allowed type="boolean">true</allowed> </fw_services> + <fw_services> + <name>dnsmasq</name> + <id>service:dnsmasq-dns</id> + <description>Open ports for the dnsmasq DNS/DHCP server</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>dnsmasq</name> + <id>service:dnsmasq-dhcp</id> + <description>Open ports for the dnsmasq DNS/DHCP server</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>svnserve</name> + <id>service:svnserve</id> + <description>Open ports for svnserve</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>lighttpd</name> + <id>service:lighttpd-ssl</id> + <description>Open the https port for lighttpd.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>WebYaST UI</name> + <id>service:webyast-ui</id> + <description>WebYaST UI</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>xdmcp</name> + <id>service:xdmcp</id> + <description>Allow other hosts to access your display manager via XDMCP</description> + <allowed type="boolean">false</allowed> + </fw_services> + <fw_services> + <name>Netbios Server</name> + <id>service:netbios-server</id> + <description>Opens ports for Samba Netbios Server with broadcast allowed.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>HTTP Server</name> + <id>service:apache2</id> + <description>Opens ports for Apache Web Server.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>NIS Client</name> + <id>service:ypbind</id> + <description>The ypbind daemon binds NIS clients to an NIS domain</description> + <allowed type="boolean">false</allowed> + </fw_services> + <fw_services> + <name>Samba Client</name> + <id>service:samba-client</id> + <description>Enables browsing of SMB shares</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>HTTPS Server</name> + <id>service:apache2-ssl</id> + <description>Opens ports for Apache Web Server.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>VNC mini-HTTP server</name> + <id>service:vnc-httpd</id> + <description>Opens the VNC HTTP ports so that browsers can connect.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>lighttpd</name> + <id>service:lighttpd</id> + <description>Open the http port for lighttpd.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>Service: iscsitarget</name> + <id>service:iscsitarget</id> + <description/> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>VNC</name> + <id>service:vnc-server</id> + <description>Opens VNC server ports so that viewers can connect.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>SMTP with Postfix</name> + <id>service:postfix</id> + <description>Firewall Configuration file for postfix</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>Rsync server</name> + <id>service:rsync-server</id> + <description>Opens port for rsync server in order to allow remote synchronization</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>xntp Server</name> + <id>service:ntp</id> + <description>Opens ports for xntp.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>DHCPv4 Server</name> + <id>service:dhcp-server</id> + <description>Opens ports for ISC DHCPv4 4.x Server.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>Zeroconf/Bonjour Multicast DNS</name> + <id>service:avahi</id> + <description>Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)</description> + <allowed type="boolean">false</allowed> + </fw_services> + <fw_services> + <name>NFS Client</name> + <id>service:nfs-client</id> + <description>Opens ports for NFS client to allow connection to an NFS server.</description> + <allowed type="boolean">true</allowed> + </fw_services> + <fw_services> + <name>Samba Server</name> + <id>service:samba-server</id> + <description>Opens ports for Samba Server.</description> + <allowed type="boolean">false</allowed> + </fw_services> + <fw_services> + <name>VNC Server</name> + <id>service:xorg-x11-server</id> + <description>Opens ports for VNC Server</description> + <allowed type="boolean">false</allowed> + </fw_services> + <fw_services> + <name>Secure Shell Server</name> + <id>service:sshd</id> + <description>Open ports for Secure Shell Server</description> + <allowed type="boolean">true</allowed> + </fw_services> + </fw_services> </firewall> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de