Hello community, here is the log from the commit of package webyast-base-ui for openSUSE:Factory checked in at Fri May 27 14:01:53 CEST 2011.
-------- --- webyast-base-ui/webyast-base-ui.changes 2011-05-26 11:27:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-base-ui/webyast-base-ui.changes 2011-05-27 11:45:44.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 27 09:39:48 UTC 2011 - [email protected] + +- WebYast - Filed to link to "Enabling Kerberos Authentication" from help of LDAP authentication (bnc#693927) +- 0.2.50 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-base-ui.spec ++++++ --- /var/tmp/diff_new_pack.kzhFLp/_old 2011-05-27 13:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.kzhFLp/_new 2011-05-27 13:54:54.000000000 +0200 @@ -53,7 +53,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.49 +Version: 0.2.50 Release: 1 Summary: WebYaST - base UI for system management Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/online_help.rb new/www/app/models/online_help.rb --- old/www/app/models/online_help.rb 2011-04-13 17:05:36.000000000 +0200 +++ new/www/app/models/online_help.rb 2011-05-27 11:04:37.000000000 +0200 @@ -26,21 +26,46 @@ end def OnlineHelp.parse(model) - html = open("http://doc.opensuse.org/products/other/WebYaST/webyast-user/cha.webyast.user.modules.html";) + Rails.logger.error "***** ONLINE HELP for #{model} *****" + + unless model == "Area" #TODO: Find better way to navigate through WebYaST documentation + html = open("http://doc.opensuse.org/products/other/WebYaST/webyast-user/cha.webyast.user.modules.html";) + else + html = open("http://doc.opensuse.org/products/other/WebYaST/webyast-user/cha.webyast.user.control.html#cha.webyast.user.control.status";) + end + doc = Nokogiri::HTML(html.read) doc.encoding = 'utf-8' unless doc.nil? - doc.css('div.sect1').each do |link| - title = link.attributes['title'].text - link.css('h2.title span.permalink').remove() - link.css('a[alt="Permalink"]').remove() - link.css('tr.head td:first').remove() + if model == "Limits" #TODO: Find better way to navigate through WebYaST documentation + doc.css('div.sect2').each do |link| + title = link.attributes['title'].text + Rails.logger.error title.inspect + link.css('h2.title span.permalink').remove() + link.css('a[alt="Permalink"]').remove() + link.css('tr.head td:first').remove() + + if title.include? model + return link + end + end + else + doc.css('div.sect1').each do |link| + title = link.attributes['title'].text + Rails.logger.error title.inspect + link.css('h2.title span.permalink').remove() + link.css('a[alt="Permalink"]').remove() + link.css('tr.head td:first').remove() + link.css('div.sect2').remove() - if title.include? model - return link - end + if title.include? model + return link + end + end end end + Rails.logger.error "***** Document END *****" end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/public/javascripts/webyast-online-help.js new/www/public/javascripts/webyast-online-help.js --- old/www/public/javascripts/webyast-online-help.js 2011-05-25 12:58:42.000000000 +0200 +++ new/www/public/javascripts/webyast-online-help.js 2011-05-27 11:17:12.000000000 +0200 @@ -18,82 +18,50 @@ #++ */ -// TODO: find better solution for static links -$(document).ready(function() { - String.prototype.capitalize = function() { - return this.charAt(0).toUpperCase() + this.slice(1); - } +var webyastModules = { + firewall: "Firewall", + time: "Time", + patch: "Updates", + services: "Services", + registration: "Registration", + network: "Network", + ldap: "LDAP", + kerberos: "Kerberos", + activedirectory: "Active Directory", + repositories: "Repositories", + users: "Users", + groups: "Groups", + mail: "Mail", + roles: "Roles", + administrator: "Administrator", + status: "Status", + limits: "Limits", + status_area: "Area" +}; + +String.prototype.capitalize = function() { + return this.charAt(0).toUpperCase() + this.slice(1); +} +$(document).ready(function() { $('#questionMark').bind('click', function(){ - var currentURL = window.location.toString().split("/"); - - switch(currentURL[currentURL.length-1]) { - case 'activedirectory': - url = "onlinehelp/Active Directory"; - break; - case 'users': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'firewall': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'mail': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'groups': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'kerberos': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'ldap': - url = "onlinehelp/" + currentURL[currentURL.length-1].toUpperCase(); - break; - case 'network': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'registration': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'roles': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'repositories': - url = "onlinehelp/Repositories"; - break; - case 'status': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'services': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'administrator': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - case 'patch_updates': - url = "onlinehelp/Updates"; - break; - case 'time': - url = "onlinehelp/" + currentURL[currentURL.length-1].capitalize(); - break; - default: - url = "#"; - break; - } - + var pattern = /[a-z]+/ig; + var path = window.location.pathname; + var module = (pattern.exec(path)).toString() + var url = 'onlinehelp' + '/' + webyastModules[module]; - if(url !='#') { + if(webyastModules[module] !== undefined) { $('body').append('<div id="onlineHelpModalShade"/>'); $('body').after('<span id="onlineHelpContent"><span id="onlineHelpLoading"><img id="onlineHelpSpinner" src="images/wait.gif"><span>Please wait ...</span></span></span>'); var close = $('<img id="closeOnlineHelpDialog" />').attr('src', 'images/close-g.png'); - + setTimeout(function(){ $.get(url, function(data){ $('#onlineHelpContent').html(data).append(close); }); }, 800); - + $('#closeOnlineHelpDialog').live('click', function(){ $('#onlineHelpModalShade').remove(); $('#onlineHelpContent').remove(); @@ -102,12 +70,33 @@ $('#closeOnlineHelpDialog').live('mouseover', function(){ $(this).attr('src', 'images/close.png'); }); - + $('#closeOnlineHelpDialog').live('mouseout', function(){ $(this).attr('src', 'images/close-g.png'); }); + + $('a.xref').live('click', function(event){ + event.preventDefault(); + var text = $(this).text().toString(); +// console.log("text " + text) + for(var m in webyastModules) { + var module = webyastModules[m].toString(); + var pattern = new RegExp(module); + var hit = pattern.test(text); + + if(hit) { + url = 'onlinehelp' + '/' + module; + setTimeout(function(){ + $.get(url, function(data){ + $('#onlineHelpContent').html(data).append(close); + }); + }, 800); + } + } + return false; + }); } else { - alert("ERROR: broken URL!"); + alert("ERROR: Online help for <" + module + "> module is not available!"); } }); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/public/stylesheets/webyast-online-help.css new/www/public/stylesheets/webyast-online-help.css --- old/www/public/stylesheets/webyast-online-help.css 2011-05-09 16:19:57.000000000 +0200 +++ new/www/public/stylesheets/webyast-online-help.css 2011-05-27 10:55:43.000000000 +0200 @@ -96,7 +96,7 @@ #onlineHelpLoading span { text-decoration: blink; color:#474747; font-weight:bold; font-size:20px; vertical-align:middle; text-align:center; } #onlineHelpSpinner { height:32px; width:32px; vertical-align:middle; margin-right:5px; } -#onlineHelpContent div.sect1 { margin: 5px; padding: 20px; } +#onlineHelpContent div.sect1, #onlineHelpContent div.sect2 { margin: 5px; padding: 20px; } #onlineHelpContent h2.title { font-size:16px; line-height:16px; } #onlineHelpContent tr.head th { background: none; } #onlineHelpContent div.note th:before, div.tip th:before { content:"[Note] "; color:#0C64A8; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
