Hello community, here is the log from the commit of package webyast-base for openSUSE:Factory checked in at 2012-11-08 21:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webyast-base (Old) and /work/SRC/openSUSE:Factory/.webyast-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webyast-base", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/webyast-base/webyast-base.changes 2012-10-16 12:12:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webyast-base.new/webyast-base.changes 2012-11-08 21:54:47.000000000 +0100 @@ -1,0 +2,40 @@ +Thu Nov 1 06:35:07 UTC 2012 - [email protected] + +- 0.3.28 + +------------------------------------------------------------------- +Mon Oct 29 13:47:08 UTC 2012 - [email protected] + +- added datepicker translations (bnc#603641) + +------------------------------------------------------------------- +Mon Oct 29 09:13:12 UTC 2012 - [email protected] + +- added support for "main_hidden" option in shortcuts.yml files + to allow hiding control panel items by default (bnc#604628) + +------------------------------------------------------------------- +Fri Oct 26 13:45:30 UTC 2012 - [email protected] + +- page header - fixed layout problem when there is small space + (bnc#783892) + +------------------------------------------------------------------- +Wed Oct 24 10:56:00 UTC 2012 - [email protected] + +- display log file path when an error occurs (bnc#784017) + +------------------------------------------------------------------- +Wed Oct 17 12:39:16 UTC 2012 - [email protected] + +- display [Back] link in the network module (fixed base_setup_links + helper) (bnc#783556) +- use syslog for logging security critical actions (user login and + logout) (bnc#782808) + +------------------------------------------------------------------- +Wed Oct 17 08:55:41 UTC 2012 - [email protected] + +- do not log registration code to the webyast log (bnc#784486) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-base.spec ++++++ --- /var/tmp/diff_new_pack.I7A6kK/_old 2012-11-08 21:54:48.000000000 +0100 +++ /var/tmp/diff_new_pack.I7A6kK/_new 2012-11-08 21:54:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: webyast-base -Version: 0.3.27 +Version: 0.3.28 Release: 0 Provides: yast2-webservice = %{version} Obsoletes: yast2-webservice < %{version} ++++++ rcwebyast ++++++ --- /var/tmp/diff_new_pack.I7A6kK/_old 2012-11-08 21:54:48.000000000 +0100 +++ /var/tmp/diff_new_pack.I7A6kK/_new 2012-11-08 21:54:48.000000000 +0100 @@ -177,9 +177,10 @@ case "$1" in start) + echo -n "Starting WebYaST " if [ ! -e $COMBINEDCERTFILE ] then - echo "No certificate found. Creating one now." + echo "\nNo WebYaST certificate found, creating one now..." LOG_FILE="/var/log/webyast/check-create-certificate.log" if ! /usr/sbin/check-create-certificate -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE -D webyast -O WebYaST -U WebYaST > $LOG_FILE 2>&1 then @@ -189,11 +190,9 @@ rc_exit fi chown nginx:nginx $CERTIFICATEFILE $CERTKEYFILE $COMBINEDCERTFILE - echo -n "Created certificate: " + echo -n "WebYaST certificate: " openssl x509 -in $CERTIFICATEFILE -fingerprint -noout fi - - echo -n "Starting webyast " # refresh the Gemfile.lock content before starting the server # (outdated file can cause problems after upgrading needed rubygems) rm -f $GEMFILE_LOCK ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/Gemfile new/www/Gemfile --- old/www/Gemfile 2012-10-12 12:59:54.000000000 +0200 +++ new/www/Gemfile 2012-11-01 07:33:28.000000000 +0100 @@ -71,7 +71,7 @@ # needed for rake gettext:find gem 'ruby_parser' - gem "ruby-debug" + #gem "ruby-debug" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/base/webyast-controlpanel.js new/www/app/assets/javascripts/base/webyast-controlpanel.js --- old/www/app/assets/javascripts/base/webyast-controlpanel.js 2012-08-09 14:03:56.000000000 +0200 +++ new/www/app/assets/javascripts/base/webyast-controlpanel.js 2012-11-01 07:31:01.000000000 +0100 @@ -118,7 +118,10 @@ //Track frequenly used modules $(document).ready(function() { - + + // hide control panel items which should be visible only after clicking "All" + $('.main_hidden').hide(); + //localStorage.clear() if(localstorage_supported() && 'last_reset' in localStorage) { // console.log("Sorted by usage") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/base/webyast-ui-helpers.js new/www/app/assets/javascripts/base/webyast-ui-helpers.js --- old/www/app/assets/javascripts/base/webyast-ui-helpers.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/base/webyast-ui-helpers.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,29 @@ +/* +Copyright (C) 2012 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 +*/ + +$(document).ready(function() { + var tipsy_config = {gravity: 's', delayIn: 500, delayOut: 500, fade: true}; + $(".tipsy_help").tipsy(tipsy_config); + + tipsy_config.html = true; + $(".tipsy_help_html").tipsy(tipsy_config); +}); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-ar.js new/www/app/assets/javascripts/jquery.ui.datepicker-ar.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-ar.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-ar.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Arabic Translation for jQuery UI date picker plugin. */ +/* Khaled Alhourani -- [email protected] */ +/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */ +jQuery(function($){ + $.datepicker.regional['ar'] = { + closeText: 'إغلاق', + prevText: '<السابق', + nextText: 'التالي>', + currentText: 'اليوم', + monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'مايو', 'حزيران', + 'تموز', 'آب', 'أيلول', 'تشرين الأول', 'تشرين الثاني', 'كانون الأول'], + monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'], + dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'], + dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'], + dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'], + weekHeader: 'أسبوع', + dateFormat: 'dd/mm/yy', + firstDay: 6, + isRTL: true, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['ar']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-cs.js new/www/app/assets/javascripts/jquery.ui.datepicker-cs.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-cs.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-cs.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Czech initialisation for the jQuery UI date picker plugin. */ +/* Written by Tomas Muller ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['cs'] = { + closeText: 'Zavřít', + prevText: '<Dříve', + nextText: 'Později>', + currentText: 'Nyní', + monthNames: ['leden','únor','březen','duben','květen','červen', + 'červenec','srpen','září','říjen','listopad','prosinec'], + monthNamesShort: ['led','úno','bře','dub','kvě','čer', + 'čvc','srp','zář','říj','lis','pro'], + dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'], + dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'], + dayNamesMin: ['ne','po','út','st','čt','pá','so'], + weekHeader: 'Týd', + dateFormat: 'dd.mm.yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['cs']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-de.js new/www/app/assets/javascripts/jquery.ui.datepicker-de.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-de.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-de.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* German initialisation for the jQuery UI date picker plugin. */ +/* Written by Milian Wolff ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['de'] = { + closeText: 'schließen', + prevText: '<zurück', + nextText: 'Vor>', + currentText: 'heute', + monthNames: ['Januar','Februar','März','April','Mai','Juni', + 'Juli','August','September','Oktober','November','Dezember'], + monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun', + 'Jul','Aug','Sep','Okt','Nov','Dez'], + dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'], + dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'], + dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'], + weekHeader: 'Wo', + dateFormat: 'dd.mm.yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['de']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-es.js new/www/app/assets/javascripts/jquery.ui.datepicker-es.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-es.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-es.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Inicialización en español para la extensión 'UI date picker' para jQuery. */ +/* Traducido por Vester ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['es'] = { + closeText: 'Cerrar', + prevText: '<Ant', + nextText: 'Sig>', + currentText: 'Hoy', + monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio', + 'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'], + monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun', + 'Jul','Ago','Sep','Oct','Nov','Dic'], + dayNames: ['Domingo','Lunes','Martes','Miércoles','Jueves','Viernes','Sábado'], + dayNamesShort: ['Dom','Lun','Mar','Mié','Juv','Vie','Sáb'], + dayNamesMin: ['Do','Lu','Ma','Mi','Ju','Vi','Sá'], + weekHeader: 'Sm', + dateFormat: 'dd/mm/yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['es']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-fr.js new/www/app/assets/javascripts/jquery.ui.datepicker-fr.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-fr.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-fr.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,25 @@ +/* French initialisation for the jQuery UI date picker plugin. */ +/* Written by Keith Wood (kbwood{at}iinet.com.au), + Stéphane Nahmani ([email protected]), + Stéphane Raimbault <[email protected]> */ +jQuery(function($){ + $.datepicker.regional['fr'] = { + closeText: 'Fermer', + prevText: 'Précédent', + nextText: 'Suivant', + currentText: 'Aujourd\'hui', + monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin', + 'Juillet','Août','Septembre','Octobre','Novembre','Décembre'], + monthNamesShort: ['Janv.','Févr.','Mars','Avril','Mai','Juin', + 'Juil.','Août','Sept.','Oct.','Nov.','Déc.'], + dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'], + dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'], + dayNamesMin: ['D','L','M','M','J','V','S'], + weekHeader: 'Sem.', + dateFormat: 'dd/mm/yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['fr']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-hu.js new/www/app/assets/javascripts/jquery.ui.datepicker-hu.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-hu.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-hu.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Hungarian initialisation for the jQuery UI date picker plugin. */ +/* Written by Istvan Karaszi ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['hu'] = { + closeText: 'bezárás', + prevText: '« vissza', + nextText: 'előre »', + currentText: 'ma', + monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június', + 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'], + monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún', + 'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'], + dayNames: ['Vasárnap', 'Hétfö', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'], + dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'], + dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'], + weekHeader: 'Hé', + dateFormat: 'yy-mm-dd', + firstDay: 1, + isRTL: false, + showMonthAfterYear: true, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['hu']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-it.js new/www/app/assets/javascripts/jquery.ui.datepicker-it.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-it.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-it.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Italian initialisation for the jQuery UI date picker plugin. */ +/* Written by Antonello Pasella ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['it'] = { + closeText: 'Chiudi', + prevText: '<Prec', + nextText: 'Succ>', + currentText: 'Oggi', + monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno', + 'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'], + monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu', + 'Lug','Ago','Set','Ott','Nov','Dic'], + dayNames: ['Domenica','Lunedì','Martedì','Mercoledì','Giovedì','Venerdì','Sabato'], + dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'], + dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'], + weekHeader: 'Sm', + dateFormat: 'dd/mm/yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['it']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-ja.js new/www/app/assets/javascripts/jquery.ui.datepicker-ja.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-ja.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-ja.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Japanese initialisation for the jQuery UI date picker plugin. */ +/* Written by Kentaro SATO ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['ja'] = { + closeText: '閉じる', + prevText: '<前', + nextText: '次>', + currentText: '今日', + monthNames: ['1月','2月','3月','4月','5月','6月', + '7月','8月','9月','10月','11月','12月'], + monthNamesShort: ['1月','2月','3月','4月','5月','6月', + '7月','8月','9月','10月','11月','12月'], + dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'], + dayNamesShort: ['日','月','火','水','木','金','土'], + dayNamesMin: ['日','月','火','水','木','金','土'], + weekHeader: '週', + dateFormat: 'yy/mm/dd', + firstDay: 0, + isRTL: false, + showMonthAfterYear: true, + yearSuffix: '年'}; + $.datepicker.setDefaults($.datepicker.regional['ja']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-ko.js new/www/app/assets/javascripts/jquery.ui.datepicker-ko.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-ko.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-ko.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Korean initialisation for the jQuery calendar extension. */ +/* Written by DaeKwon Kang ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['ko'] = { + closeText: '닫기', + prevText: '이전달', + nextText: '다음달', + currentText: '오늘', + monthNames: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)', + '7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'], + monthNamesShort: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)', + '7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'], + dayNames: ['일','월','화','수','목','금','토'], + dayNamesShort: ['일','월','화','수','목','금','토'], + dayNamesMin: ['일','월','화','수','목','금','토'], + weekHeader: 'Wk', + dateFormat: 'yy-mm-dd', + firstDay: 0, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: '년'}; + $.datepicker.setDefaults($.datepicker.regional['ko']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-nl.js new/www/app/assets/javascripts/jquery.ui.datepicker-nl.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-nl.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-nl.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Mathias Bynens <http://mathiasbynens.be/> */ +jQuery(function($){ + $.datepicker.regional.nl = { + closeText: 'Sluiten', + prevText: '←', + nextText: '→', + currentText: 'Vandaag', + monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni', + 'juli', 'augustus', 'september', 'oktober', 'november', 'december'], + monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun', + 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'], + dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'], + dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'], + dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'], + weekHeader: 'Wk', + dateFormat: 'dd-mm-yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional.nl); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-pl.js new/www/app/assets/javascripts/jquery.ui.datepicker-pl.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-pl.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-pl.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Polish initialisation for the jQuery UI date picker plugin. */ +/* Written by Jacek Wysocki ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['pl'] = { + closeText: 'Zamknij', + prevText: '<Poprzedni', + nextText: 'Następny>', + currentText: 'Dziś', + monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec', + 'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'], + monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze', + 'Lip','Sie','Wrz','Pa','Lis','Gru'], + dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'], + dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'], + dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'], + weekHeader: 'Tydz', + dateFormat: 'dd.mm.yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['pl']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-pt-BR.js new/www/app/assets/javascripts/jquery.ui.datepicker-pt-BR.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-pt-BR.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-pt-BR.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Brazilian initialisation for the jQuery UI date picker plugin. */ +/* Written by Leonildo Costa Silva ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['pt-BR'] = { + closeText: 'Fechar', + prevText: '<Anterior', + nextText: 'Próximo>', + currentText: 'Hoje', + monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho', + 'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'], + monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun', + 'Jul','Ago','Set','Out','Nov','Dez'], + dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'], + dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'], + dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'], + weekHeader: 'Sm', + dateFormat: 'dd/mm/yy', + firstDay: 0, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['pt-BR']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-ru.js new/www/app/assets/javascripts/jquery.ui.datepicker-ru.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-ru.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-ru.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Andrew Stromnov ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['ru'] = { + closeText: 'Закрыть', + prevText: '<Пред', + nextText: 'След>', + currentText: 'Сегодня', + monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь', + 'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'], + monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн', + 'Июл','Авг','Сен','Окт','Ноя','Дек'], + dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'], + dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'], + dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'], + weekHeader: 'Нед', + dateFormat: 'dd.mm.yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['ru']); +}); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-sv.js new/www/app/assets/javascripts/jquery.ui.datepicker-sv.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-sv.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-sv.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Swedish initialisation for the jQuery UI date picker plugin. */ +/* Written by Anders Ekdahl ( [email protected]). */ +jQuery(function($){ + $.datepicker.regional['sv'] = { + closeText: 'Stäng', + prevText: '«Förra', + nextText: 'Nästa»', + currentText: 'Idag', + monthNames: ['Januari','Februari','Mars','April','Maj','Juni', + 'Juli','Augusti','September','Oktober','November','December'], + monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun', + 'Jul','Aug','Sep','Okt','Nov','Dec'], + dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'], + dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'], + dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'], + weekHeader: 'Ve', + dateFormat: 'yy-mm-dd', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; + $.datepicker.setDefaults($.datepicker.regional['sv']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-zh-CN.js new/www/app/assets/javascripts/jquery.ui.datepicker-zh-CN.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-zh-CN.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-zh-CN.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Chinese initialisation for the jQuery UI date picker plugin. */ +/* Written by Cloudream ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['zh-CN'] = { + closeText: '关闭', + prevText: '<上月', + nextText: '下月>', + currentText: '今天', + monthNames: ['一月','二月','三月','四月','五月','六月', + '七月','八月','九月','十月','十一月','十二月'], + monthNamesShort: ['一','二','三','四','五','六', + '七','八','九','十','十一','十二'], + dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'], + dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'], + dayNamesMin: ['日','一','二','三','四','五','六'], + weekHeader: '周', + dateFormat: 'yy-mm-dd', + firstDay: 1, + isRTL: false, + showMonthAfterYear: true, + yearSuffix: '年'}; + $.datepicker.setDefaults($.datepicker.regional['zh-CN']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/javascripts/jquery.ui.datepicker-zh-TW.js new/www/app/assets/javascripts/jquery.ui.datepicker-zh-TW.js --- old/www/app/assets/javascripts/jquery.ui.datepicker-zh-TW.js 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/assets/javascripts/jquery.ui.datepicker-zh-TW.js 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,23 @@ +/* Chinese initialisation for the jQuery UI date picker plugin. */ +/* Written by Ressol ([email protected]). */ +jQuery(function($){ + $.datepicker.regional['zh-TW'] = { + closeText: '關閉', + prevText: '<上月', + nextText: '下月>', + currentText: '今天', + monthNames: ['一月','二月','三月','四月','五月','六月', + '七月','八月','九月','十月','十一月','十二月'], + monthNamesShort: ['一','二','三','四','五','六', + '七','八','九','十','十一','十二'], + dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'], + dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'], + dayNamesMin: ['日','一','二','三','四','五','六'], + weekHeader: '周', + dateFormat: 'yy/mm/dd', + firstDay: 1, + isRTL: false, + showMonthAfterYear: true, + yearSuffix: '年'}; + $.datepicker.setDefaults($.datepicker.regional['zh-TW']); +}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/stylesheets/new_inputs.css new/www/app/assets/stylesheets/new_inputs.css --- old/www/app/assets/stylesheets/new_inputs.css 2012-08-30 18:11:56.000000000 +0200 +++ new/www/app/assets/stylesheets/new_inputs.css 2012-11-01 07:31:01.000000000 +0100 @@ -169,7 +169,7 @@ border:5px solid #666; border-width: 5px 0; } -#header h1 { color:#333; text-shadow: 0px 1px 0px #e5e5e5; position:absolute; width:50%; right:25%; left:25%; } +#header h1 { color:#333; text-shadow: 0px 1px 0px #e5e5e5; } label.description { display: inline; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/stylesheets/webyast-controlpanel.css new/www/app/assets/stylesheets/webyast-controlpanel.css --- old/www/app/assets/stylesheets/webyast-controlpanel.css 2012-08-09 13:58:41.000000000 +0200 +++ new/www/app/assets/stylesheets/webyast-controlpanel.css 2012-11-01 07:31:01.000000000 +0100 @@ -337,7 +337,7 @@ #userbar a { border-bottom: 1px dotted #555; color:#444; text-shadow: 0 1px 1px #e5e5e5; } #userbar a:hover { border-bottom: 1px solid #555; color:#fff; text-shadow: 0 -1px 0px #444; } -#userbar { line-height: 45px; position: absolute; right: 0; z-index: 100; margin: 0 5px; } +#userbar { line-height: 45px; float:right; margin: 0 5px; } #userbar-container { background-color:#aaa; padding:2px 0px 7px 3px; border:1px solid #a0a0a0; -moz-border-radius:2px; -webkit-border-radius:2px; } #userbar-container { -moz-box-shadow: 0px 0px 0px #000 inset; background: #ccc } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/assets/stylesheets/webyast.css new/www/app/assets/stylesheets/webyast.css --- old/www/app/assets/stylesheets/webyast.css 2012-10-12 12:54:54.000000000 +0200 +++ new/www/app/assets/stylesheets/webyast.css 2012-11-01 07:31:01.000000000 +0100 @@ -72,6 +72,10 @@ font-weight: bold; } + a.no-underscore { + border-bottom: none; + } + /* CSS Hack for FF */ html a.button:only-of-type { padding: 3px 10px; } @@ -82,11 +86,6 @@ select:focus { border: 1px solid #1e90ff; } -/* select for available Updates in software module with image before text */ -/* TODO find the solution for IE and Chrome, the images are not rendered before text */ -#selector { - padding: 0px; } - img { border: none; } @@ -95,9 +94,8 @@ /* == Basic Structure ===================================================== */ #header { - width: 100%; background-color: #c5c5c5; - height: 50px; + min-height: 50px; vertical-align: middle; text-align: center; position: relative; } @@ -108,14 +106,15 @@ margin: 0; padding-top: 13px; } #header img { - margin: 2px 1em 0; - position: absolute; - top: 2px; - left: 0; } + margin: 4px 0.5em 0;} #header ul.header-links { float: right; vertical-align: bottom; } +#webyast_logo { + float: left +} + #timeoutMessage { display: none; font-size: 16px; @@ -186,20 +185,6 @@ text-align: center; } -#login-wrapper { - position: absolute; - top: 0; - right: 0; } - #login-wrapper ul { - list-style: none outside; - margin: 0; - font-size: 0.7em; } - #login-wrapper li { - float: left; - margin: 0 0.5em; } - #login-wrapper ul em { - font-weight: bold; } - /* == Basic Styles ======================================================== */ #login-dialogue { width: 24em; @@ -214,23 +199,6 @@ -webkit-box-shadow: 0px 0px 2px #cccccc inset; background-color: #fafafa; } -#login_image_wrapper { - float: left; - width: 32%; - height: 140px; - line-height: 120px; - overflow: hidden; } - -#login_credentials_wrapper { - float: right; - width: 100%; - height: 140px; - overflow: hidden; } - -#login_button { - float: right; - width: 100%; } - #login-dialogue form { display: block; padding: 15px; @@ -261,11 +229,6 @@ margin: 0 0 0.2em; text-align: left; } -#content_title_details { - color: #777777; - font-size: 11px; - text-shadow: 0px 1px 0px #fefefe; } - #status_patches, #status_status { margin: 0; padding: 12px 0px 0px 10px; @@ -274,16 +237,6 @@ margin-left: 5px; vertical-align: top; } -#machine-controle { - width: 25%; - float: right; - height: 100%; - display: inline-block; } - #machine-controle a { - text-align: center; - margin: 10px 10px 0; - display: block; } - .plugin-content { background-color: white; border-color: #dddddd; @@ -418,11 +371,10 @@ vertical-align: text-top; } .bug-icon { - display: block; - width: 23px; - height: 23px; + padding-left: 26px; + padding-top: 2px; background: transparent url(/assets/images/bug.png) no-repeat scroll 0 0; - float: left; } +} .status-icon + span { /* margin-left: 1em; */ @@ -480,17 +432,6 @@ tr.even { background-color: #bee9ff; } -.clipboard { - display: block; - width: 14px; - height: 14px; - background: transparent url(assets/clipboard/button_up.png) no-repeat scroll 0 0; - float: left; } - .clipboard:hover { - background: transparent url(assets/clipboard/button_over.png) no-repeat scroll 0 0; } - .clipboard:active { - background: transparent url(assets/clipboard/button_down.png) no-repeat scroll 0 0; } - .busy { background: transparent url(assets/working.gif) no-repeat scroll 0 0; } @@ -512,28 +453,12 @@ .flash-message { margin-top: 20px; + border-radius: 4px; padding: 12px; } .flash-message span { float: left; margin-right: 0.3em; } -/* style for progress bars */ -.progress_bar { - float: left; - padding-left: 1em; - padding-top: 8px; } - -.progress_bar_percent { - float: left; - text-align: center; } - -.progress_bar_frame { - border-style: solid; - border-width: 1px; } - -.progress_bar_progress { - background: #7ad3ff; } - /* List accordion styles */ .list-fieldset { border: 2px solid #dfdfdf; @@ -563,9 +488,8 @@ background-color:#fcfdde; border-top: solid 2px red; border-bottom: solid 2px red; - width:100%; text-align:center; - padding: 15px 0; + padding: 15px; font-size: 1.2em; font-weight: bold; } @@ -639,3 +563,10 @@ clear: both; visibility: hidden; } + +.help_icon:after { + content: ""; + background: url(/assets/question-mark.png) no-repeat scroll 0 center; + padding-left: 12px; + margin-left: 5px; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/application_controller.rb new/www/app/controllers/application_controller.rb --- old/www/app/controllers/application_controller.rb 2012-10-12 12:59:54.000000000 +0200 +++ new/www/app/controllers/application_controller.rb 2012-11-01 07:31:01.000000000 +0100 @@ -19,6 +19,7 @@ require 'exceptions' require 'dbus' require 'haml_gettext' # translate haml file on the fly +require 'syslog' class ApplicationController < ActionController::Base include FastGettext::Translation @@ -191,11 +192,25 @@ end def after_sign_in_path_for(resource_or_scope) + msg = "User \"#{current_account.username}\" logged in, remote IP: #{request.remote_ip}" + Rails.logger.info msg + # flags: log PID, log to console if syslog fails, it's a security message + Syslog.open("WebYaST", Syslog::LOG_PID | Syslog::LOG_CONS | Syslog::LOG_AUTH) { |s| s.info msg } + Rails.logger.info "Reading all permissions for #{current_account.username} again" Permission.reset(current_account.username) super end + def after_sign_out_path_for(resource_or_scope) + unless current_account.nil? + msg = "User \"#{current_account.username}\" logged out, remote IP: #{request.remote_ip}" + Rails.logger.info msg + Syslog.open("WebYaST", Syslog::LOG_PID | Syslog::LOG_CONS | Syslog::LOG_AUTH) { |s| s.info msg } + end + super + end + # Checks if basic system module should be shown # and if it should, then also redirects to that module. # TODO check if controller from config exists diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/sessions_controller.rb new/www/app/controllers/sessions_controller.rb --- old/www/app/controllers/sessions_controller.rb 2012-10-12 12:59:54.000000000 +0200 +++ new/www/app/controllers/sessions_controller.rb 2012-11-01 07:31:01.000000000 +0100 @@ -24,6 +24,14 @@ end def create + if current_account.nil? + msg = "Authentication failed" + msg << ", user: \"#{params[:account][:username]}\"" if params[:account].try(:[], :username) + msg << ", remote IP: #{request.remote_ip}" + Rails.logger.info msg + Syslog.open("WebYaST", Syslog::LOG_PID | Syslog::LOG_CONS | Syslog::LOG_AUTH) { |s| s.info msg } + end + if (params[:remember_me] == "true" || params[:login].try(:[], :remember_me)) && current_account.present? && current_account.authentication_token.blank? Rails.logger.info "Creating authentication token for user #{current_account.username}" current_account.reset_authentication_token! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/helpers/application_helper.rb new/www/app/helpers/application_helper.rb --- old/www/app/helpers/application_helper.rb 2012-05-18 12:00:54.000000000 +0200 +++ new/www/app/helpers/application_helper.rb 2012-11-01 07:31:01.000000000 +0100 @@ -84,7 +84,7 @@ # It is similar to form_send_buttons but it uses plain links, # the save step is not performed def base_setup_links - return "" unless basesystem_in_process? + return form_back_button unless basesystem_in_process? bs = Basesystem.new.load_from_session(session) ret = link_to bs.last_step? ? _("Finish") : _("Next"), {:controller => "controlpanel", :action => "nextstep"}, :class => "button" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/helpers/languages_helper.rb new/www/app/helpers/languages_helper.rb --- old/www/app/helpers/languages_helper.rb 2012-05-18 16:44:39.000000000 +0200 +++ new/www/app/helpers/languages_helper.rb 2012-11-01 07:31:01.000000000 +0100 @@ -21,6 +21,7 @@ module LanguagesHelper +# NOTE: add the respective jquery.ui.datepicker-*.js file when adding a new language here SUPPORTED_LANGUAGES = { "ar" => "العربية", "cs" => "Čeština", @@ -50,5 +51,13 @@ def language_name lang SUPPORTED_LANGUAGES[lang] || SUPPORTED_LANGUAGES[lang.gsub(/_.*$/, '')] || lang end + + # load datepicker translations when available + def date_picker_localization + if File.file? File.join(Rails.root, "app", "assets", "javascripts", "jquery.ui.datepicker-#{I18n.locale}.js") + Rails.logger.debug "Datepicker translations found: jquery.ui.datepicker-#{I18n.locale}.js" + javascript_include_tag "jquery.ui.datepicker-#{I18n.locale}.js" + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/helpers/view_helpers/html_helper.rb new/www/app/helpers/view_helpers/html_helper.rb --- old/www/app/helpers/view_helpers/html_helper.rb 2012-09-06 13:02:18.000000000 +0200 +++ new/www/app/helpers/view_helpers/html_helper.rb 2012-11-01 07:31:01.000000000 +0100 @@ -18,98 +18,6 @@ module ViewHelpers::HtmlHelper - - def html_edit_link(id, action = :edit) - return link_to image_tag("edit-icon.png", :alt => :edit), {:action => action, :id => id}, :onclick=>"$('#progress').show()" - end - - # added additional argument to replace message string (see bnc#581153) - def html_delete_link(id, action = :delete, text = _('Are you sure?')) - return link_to image_tag("delete.png", :alt => :delete), {:action => action, :id => id}, - :confirm => text, :method => :delete - end - - def html_create_table_content(items, properties, permissions = {}, proc_obj = nil) - ret = '' - columns = properties.size - - items.each do |item| - line = '' - columns.times { |col| - property = properties[col] - - if !property.nil? && item.respond_to?(property) - cell = item.send(property) - else - if proc_obj.nil? - cell = "ERROR: unknown method #{property}" - else - cell = proc_obj.call(item, col) - end - end - - line += "<td>#{h(cell)}</td>" - } - - if permissions[:edit] - line += "<td align=\"center\">#{html_edit_link(item.send(permissions[:id]))}</td>" - end - - if permissions[:delete] - line += "<td align=\"center\">#{html_delete_link(item.send(permissions[:id]))}</td>" - end - - ret += "<tr>#{line}</tr>" - end - - return ret - end - - ## - # Create a simple HTML table - # - # Parameters: - # * labels - an array of strings - table headings - # * items - an array of objects - table content - # * properties - an array of strings - name of the method which will be called for the respective column. - # The result will be displayed in the table. - # * permissions - a hash with permissions - used to display/hide Add, Edit, and Delete buttons. - # The argument is optional, if missing no button will be displayed. Expected keys are :add, :edit, :delete. - # If a key is missing or the value is false the relevant button is hidden. - # * optional block with two arguments: object and column number - this block is used - # for computing table values for columns with property method set to nil. See the example. - # Use the column block parameter to distinguish the columns if there are several columns with nil property. - # - # Examples: - # - # <tt>simple_table([_("First Name"), _("Surname")], @users, [:first_name, :surname], {:add => true, :edit => true, :delete => true, :id => :name})</tt> - # - # <tt>simple_table([_("Avg. Download Speed")], files, [nil]){|file, column| "#{file.size/file.download_time/1024} kB/s"}</tt> - # - def html_simple_table(labels, items, properties, permissions = {}, &block) - header = '' - - labels.each { |l| - header += "<th class=\"first\">#{h(l)}</th>" - } - - if permissions[:edit] - header += "<th class=\"first\" width=10%>#{h(label_edit)}</th>" - end - - if permissions[:delete] - header += "<th class=\"first\" width=10%>#{h(label_delete)}</th>" - end - - content = html_create_table_content(items, properties, permissions, block) - - ret = "<table class=\"list\"><tr>#{header}</tr>#{content}</table>" - - ret += "<br/>" + button_to(label_add, {:action => "new"}) if permissions[:add] - - return ret - end - # report an exception to the flash messages zone # a flash error message will be appended to the # element with id "flashes" with standard jquery @@ -130,11 +38,12 @@ message ||= _("There was a problem retrieving information from the server.") # build the html + # FIXME: put this into a partial (easier editing than a heredoc) html =<<-EOF2 <div id="error-#{error_id}-content"> <div> <p><strong>Error message:</strong>#{err_message}</p> - <p><span class="bug-icon"></span><a target="_blank" href="#{"FIXME ::ApplicationController.bug_url"}">Report bug</a></p> + <p class="bug-icon"><a target="_blank" href="#{"FIXME ::ApplicationController.bug_url"}">Report bug</a></p> <p> <a href="#" id="error-#{error_id}-show-backtrace-link">Show details</a> </p> @@ -188,21 +97,6 @@ html.html_safe end - def progress_bar(percent, width = '150px', height = '1.4em') - # display only 0-100% range - percent = 100 if percent > 100 - percent = 0 if percent < 0 - - html = <<-EOF_PROGRESS - <div class="progress_bar"> - <div class="progress_bar_percent" style="width: #{width}; line-height: #{height}">#{percent.to_i}%</div> - <div class="progress_bar_frame" style="width: #{width}; height: #{height};"> - <div class="progress_bar_progress" style="width: #{percent.to_i}%; height: #{height};"/> - </div> - </div> -EOF_PROGRESS - end - # Encode an input string to a string which can be safely used as # an HTML element id without escaping problematic symbols. # The result contains only [a-zA-Z0-9_]* characters and can be used in jQuery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/controlpanel/index.html.erb new/www/app/views/controlpanel/index.html.erb --- old/www/app/views/controlpanel/index.html.erb 2012-10-12 12:59:54.000000000 +0200 +++ new/www/app/views/controlpanel/index.html.erb 2012-11-01 07:31:01.000000000 +0100 @@ -171,7 +171,7 @@ <% if data['main'] %> <li id="module<%= index %>" data-id="id-<%= index%>" data-type="<%= data['groups'] %>" class="main"> <% else %> - <li id="module<%= index %>" data-id="id-<%= index%>" data-type="<%= data['groups'] %>" class="<%= data['groups'] %>"> + <li id="module<%= index %>" data-id="id-<%= index%>" data-type="<%= data['groups'] %>" class="<%= data['groups'] -%> <%= (data['main_hidden'] == true) ? "main_hidden" : "" -%> "> <% end %> <%= link_to(data['url'], html_map) do %> <%= image_tag(data['icon'] ) %> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/layouts/application.html.erb new/www/app/views/layouts/application.html.erb --- old/www/app/views/layouts/application.html.erb 2012-08-31 17:01:44.000000000 +0200 +++ new/www/app/views/layouts/application.html.erb 2012-11-01 07:31:01.000000000 +0100 @@ -62,28 +62,30 @@ </head> <body id="shell"> <div class="wrapper"> - <div id='browserWarning' class="big-warning unsupported-browser-warning"> - <%= raw ( _("You are using an unsupported browser. Please switch to at least %sFireFox 10%s or %sInternet Explorer 9%s. Thanks! [%sclose%s]") % - ["<a href='http://getfirefox.com'>","</a>", - "<a href='http://www.microsoft.com/windows/downloads/ie/getitnow.mspx'>", "</a>", - "<a href='#' id='warningClose'>", "</a>"] ) %> + <div id='browserWarning' class="big-warning unsupported-browser-warning clearfix"> + <%= raw ( _("You are using an unsupported browser. Please switch to at least %s or %s. Thank you!") % + ["<a href='http://getfirefox.com' class='external'>FireFox 10</a>", + "<a href='http://www.microsoft.com/windows/downloads/ie/getitnow.mspx' class='external'>Internet Explorer 9</a>" ] ) %> + <div style="float:right"> + <a href='#' id='warningClose' class="no-underscore"><%= image_tag 'close.png', :title => _("Hide this warning") %></a> + </div> </div> <noscript> <div id="no_js_warning" class="big-warning"> - <%= raw ( _("JavaScript support is missing or disabled. Please turn JavaScript on or use a supported browser (at least %sFireFox 10%s or %sInternet Explorer 9%s).") % - ["<a href='http://getfirefox.com'>","</a>", - "<a href='http://www.microsoft.com/windows/downloads/ie/getitnow.mspx'>", "</a>"] ) %> + <%= raw ( _("JavaScript support is missing or disabled. Please turn JavaScript on or use a supported browser (at least %s or %s).") % + ["<a href='http://getfirefox.com' class='external'>FireFox 10</a>", + "<a href='http://www.microsoft.com/windows/downloads/ie/getitnow.mspx' class='external'>Internet Explorer 9</a>"] ) %> </div> </noscript> - <div id="header"> + <div id="header" class="clearfix"> <% appliance_label = ControlPanelConfig.read 'appliance_label', _("My Appliance") %> <% appliance_label = appliance_label.strip %> <% if appliance_label =~ /^_\(\"/ && appliance_label =~ /\"\)$/ %> <% appliance_label = _(appliance_label[3..appliance_label.length-3]) %> <% end %> - <%= link_to(image_tag("webyast-logo.png", :width=>"130", :height=>"42", :alt =>"webyast"),"/" )%> + <%= link_to(image_tag("webyast-logo.png", :width=>"130", :height=>"42", :alt =>"webyast", :id => 'webyast_logo'),"/" )%> <% if !account_signed_in? %> <span id="userbar"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/shared/exception_trap.haml new/www/app/views/shared/exception_trap.haml --- old/www/app/views/shared/exception_trap.haml 1970-01-01 01:00:00.000000000 +0100 +++ new/www/app/views/shared/exception_trap.haml 2012-11-01 07:31:01.000000000 +0100 @@ -0,0 +1,41 @@ +-# + -- + Webyast Webclient framework + + Copyright (C) 2009, 2010 Novell, Inc. + This library is free software; you can redistribute it and/or modify + it only under the terms of version 2.1 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + This library 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 Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ++ + +%h1 This is embarrassing.... +%p We are sorry, but there are some problems. + +%h3 Problem: +%pre= error.message + +%p.bug-icon + = _("Please Report a bug so we can fix the problem!.") + %a{:href => controller.class.bug_url, :target => "_blank"} Report a bug in bugzilla. + +%p Don't forget to include the bug details. +- log_file = Webyast::Application.config.paths['log'].first +%p= _("The main WebYaST log is located at %s file, there are also other log files in %s directory.") % [log_file, File.dirname(log_file)] + +%p + %a#details-link{:href => "#"} Show details... + +%pre#backtrace.hidden + = error.nil? || error.backtrace.blank? ? _("No information available") : error.backtrace.join("\n") + +:javascript + $('#details-link').toggle(function() {$('#backtrace').show();return false;}, function() {$('#backtrace').hide();return false;}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/shared/exception_trap.html.erb new/www/app/views/shared/exception_trap.html.erb --- old/www/app/views/shared/exception_trap.html.erb 2012-03-21 16:56:31.000000000 +0100 +++ new/www/app/views/shared/exception_trap.html.erb 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -<%# -#-- -# Webyast Webclient framework -# -# Copyright (C) 2009, 2010 Novell, Inc. -# This library is free software; you can redistribute it and/or modify -# it only under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library 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 Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#++ -%> - -<h1><%= _("This is embarrassing....") %></h1> - -<p><%= _("We are sorry, but there are some problems.") %></p> - -<h3><%= _("Problem:") %></h3> - -<p><pre> - <%= h error.message %> -</pre></p> - -<p><span class="bug-icon"></span><%= _("Please Report a bug so we can fix the problem!.") %><a target="_blank" href="<%= controller.class.bug_url %>"><%= _("(report link)") %></a></p> -<p><%= _("Don't forget to include the bug details.") %></p> - - <% - backtrace = _("No information available") - backtrace = error.backtrace.join("\n") unless (error.nil? || error.backtrace.nil? || error.backtrace.blank?) - %> - -<p> - <a href="#" id="details-link"><%= _("Show details...") %></a> - <!-- <#%# clippy("message: #{error.message}\n backtrace :\n #{backtrace}") #%#> --> -<p> - -<pre id="backtrace" style="display: none"> -<%= h backtrace %> -</pre> -<script type="text/javascript"> - $('#details-link').click(function() { $('#backtrace').hide();$('#backtrace').show();return false; }); -</script> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/config/application.rb new/www/config/application.rb --- old/www/config/application.rb 2012-10-12 12:59:54.000000000 +0200 +++ new/www/config/application.rb 2012-11-01 07:31:01.000000000 +0100 @@ -34,13 +34,13 @@ class Application < Rails::Application config.autoload_paths += %W(#{config.root}/lib #{config.root}/lib/validators #{config.root}/lib/common) config.encoding = "utf-8" - config.filter_parameters += [:password, :auth_token] + config.filter_parameters += [:password, :auth_token, :regcode] config.assets.enabled = true config.assets.version = '1.0' config.secret_token = '9d11bfc98abcf9799082d9c34ec94dc1cc926f0f1bf4bea8c440b497d96b14c1f712c8784d0303ee7dd69e382c3e5e4d38d4c56d1b619eae7acaa6516cd733b1' # precompile all webyast-* assets from plugins - config.assets.precompile += ['webyast-*', 'webyast-base-*'] + config.assets.precompile += ['webyast-*', 'webyast-base-*', 'jquery.ui.datepicker-*.js' ] # for a slighly faster asset compilation # (see http://guides.rubyonrails.org/asset_pipeline.html) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
