October 2013 - spacewalk-commits - Fedora mailing-lists

Changes to 'refs/tags/spacewalk-web-2.1.29-1'
by mkollar 31 Oct '13

31 Oct '13

Tag 'spacewalk-web-2.1.29-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-31 19:37 +0000 Tagging package [spacewalk-web] version [2.1.29-1] in directory [web/]. Changes since spacewalk-backend-2.1.34-1: Matej Kollar (1): Automatic commit of package [spacewalk-web] release [2.1.29-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by mkollar 31 Oct '13

31 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 31cd00c4fb198ab0d985361689e29c308919271e Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 20:37:55 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.29-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 73b3f82..ce979b2 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.28-1 web/ +2.1.29-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 061eb60..750d38a 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.28 +Version: 2.1.29 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.29-1 +- 1020952 - Single db root cert + option name change +- 1020952 - SSL for Postgresql: Java (Perl DBI) + * Thu Oct 24 2013 Jan Dobes 2.1.28-1 - 1015747 - cleanup - 1015747 - new jsp page + nav stuff

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.34-1'
by mkollar 31 Oct '13

31 Oct '13

Tag 'spacewalk-backend-2.1.34-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-31 19:35 +0000 Tagging package [spacewalk-backend] version [2.1.34-1] in directory [backend/]. Changes since spacewalk-java-2.1.63-1: Matej Kollar (1): Automatic commit of package [spacewalk-backend] release [2.1.34-1]. --- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by mkollar 31 Oct '13

31 Oct '13

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit ebf056174f669a042659464a189c277f47c66864 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 20:35:42 2013 +0100 Automatic commit of package [spacewalk-backend] release [2.1.34-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 8ca0d9c..2979b14 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.33 +Version: 2.1.34 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.34-1 +- 1020952 - Single db root cert + option name change + * Tue Oct 29 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.33-1 - 1020952 - SSL for Postgresql: Backend (Python) - Simplification diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index c76ab6e..1d01668 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.33-1 backend/ +2.1.34-1 backend/

1 0

Changes to 'refs/tags/spacewalk-java-2.1.63-1'
by mkollar 31 Oct '13

31 Oct '13

Tag 'spacewalk-java-2.1.63-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-31 19:34 +0000 Tagging package [spacewalk-java] version [2.1.63-1] in directory [java/]. Changes since spacewalk-search-2.1.5-1: Matej Kollar (1): Automatic commit of package [spacewalk-java] release [2.1.63-1]. --- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by mkollar 31 Oct '13

31 Oct '13

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 4b54d18dcc3cb6d20f27caa8e74befb882bd9040 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 20:34:04 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.63-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 5c770a9..913781f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.62 +Version: 2.1.63 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.63-1 +- 1020952 - Single db root cert + option name change +- Checkstyle fix, follow JSL for method modifiers +- 1007521 - synchronize repo entries creation + * Thu Oct 24 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.62-1 - 1011856 - detect max lengths at repo creation - 1020952 - SSL for Postgresql: Java (WebUI, Tascomatic) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 0cc39bc..973a89b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.62-1 java/ +2.1.63-1 java/

1 0

Changes to 'refs/tags/spacewalk-search-2.1.5-1'
by mkollar 31 Oct '13

31 Oct '13

Tag 'spacewalk-search-2.1.5-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-31 19:32 +0000 Tagging package [spacewalk-search] version [2.1.5-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-abrt-2.1.4-1: Matej Kollar (3): Checkstyle fix, follow JSL for method modifiers 1020952 - Single db root cert + option name change Automatic commit of package [spacewalk-search] release [2.1.5-1]. --- backend/rhn-conf/rhn.conf | 3 backend/server/rhnSQL/__init__.py | 18 +++-- backend/server/rhnSQL/driver_cx_Oracle.py | 9 +- backend/server/rhnSQL/driver_postgresql.py | 32 +++++----- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 16 +---- java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 2 rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/spacewalk-search.spec | 5 + search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 8 -- web/modules/rhn/RHN/DBI.pm | 6 - 10 files changed, 53 insertions(+), 48 deletions(-) ---

1 0

rel-eng/packages search-server/spacewalk-search
by mkollar 31 Oct '13

31 Oct '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 643c8b100759f299c03ee9e47a911d7cb23f3490 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 20:32:34 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.5-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 4f784ad..048e9c3 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.4-1 search-server/spacewalk-search/ +2.1.5-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index b619e57..82a499a 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.5-1 +- 1020952 - Single db root cert + option name change + * Thu Oct 31 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.4-1 - 1023669 - set Session Time Zone for Oracle connections - Unchecked conversion removed in rhnsearch

1 0

2 commits - backend/rhn-conf backend/server java/code search-server/spacewalk-search web/modules
by mkollar 31 Oct '13

31 Oct '13

backend/rhn-conf/rhn.conf | 3 backend/server/rhnSQL/__init__.py | 18 +++-- backend/server/rhnSQL/driver_cx_Oracle.py | 9 +- backend/server/rhnSQL/driver_postgresql.py | 32 +++++----- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 16 +---- java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 8 -- web/modules/rhn/RHN/DBI.pm | 6 - 8 files changed, 48 insertions(+), 46 deletions(-) New commits: commit 7a22df856e85d474132dfd667b1b5e24b6e66041 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 09:42:49 2013 +0100 1020952 - Single db root cert + option name change - Root ca certificate won't be stored multiple times, path can be configured - Option enabling SSL for db connections is now "db_ssl_enabled", and it is 1/0 option, as this better captures what does it do. Both changes tightly coupled and related to given bz diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf index c02896d..c6c24b3 100644 --- a/backend/rhn-conf/rhn.conf +++ b/backend/rhn-conf/rhn.conf @@ -15,3 +15,6 @@ log_file = /var/log/rhn/rhn.log enable_snapshots = 1 +## SSL for database (PostgreSQL) connection +db_ssl_enabled = 0 +db_sslrootcert = /etc/rhn/postgresql-db-root-ca.cert diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index f3f4dbf..c7d6c16 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -41,7 +41,7 @@ from sql_base import SQLError, SQLSchemaError, SQLConnectError, \ # EVER be exposed to the calling applications. -def __init__DB(backend, host, port, username, password, database, sslmode): +def __init__DB(backend, host, port, username, password, database, sslmode, sslrootcert): """ Establish and check the connection so we can wrap it and handle exceptions. @@ -52,14 +52,14 @@ def __init__DB(backend, host, port, username, password, database, sslmode): my_db = __DB except NameError: # __DB has not been set up db_class = dbi.get_database_class(backend=backend) - __DB = db_class(host, port, username, password, database, sslmode) + __DB = db_class(host, port, username, password, database, sslmode, sslrootcert) __DB.connect() return else: del my_db if __DB.is_connected_to(backend, host, port, username, password, - database, sslmode): + database, sslmode, sslrootcert): __DB.check_connection() return @@ -67,13 +67,13 @@ def __init__DB(backend, host, port, username, password, database, sslmode): __DB.close() # now we have to get a different connection __DB = dbi.get_database_class(backend=backend)( - host, port, username, password, database, sslmode) + host, port, username, password, database, sslmode, sslrootcert) __DB.connect() return 0 def initDB(backend=None, host=None, port=None, username=None, - password=None, database=None, sslmode=None): + password=None, database=None, sslmode=None, sslrootcert=None): """ Initialize the database. @@ -91,7 +91,11 @@ def initDB(backend=None, host=None, port=None, username=None, database = CFG.DB_NAME username = CFG.DB_USER password = CFG.DB_PASSWORD - sslmode = CFG.DB_SSLMODE + sslmode = None + sslrootcert = None + if CFG.DB_SSL_ENABLED: + sslmode = 'verify-full' + sslrootcert = CFG.DB_SSLROOTCERT if backend not in SUPPORTED_BACKENDS: raise rhnException("Unsupported database backend", backend) @@ -102,7 +106,7 @@ def initDB(backend=None, host=None, port=None, username=None, # Hide the password add_to_seclist(password) try: - __init__DB(backend, host, port, username, password, database, sslmode) + __init__DB(backend, host, port, username, password, database, sslmode, sslrootcert) # except (rhnException, SQLError): # raise # pass on, we know those ones # except (KeyboardInterrupt, SystemExit): diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 8bad31d..d4892f0 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -358,13 +358,15 @@ class Database(sql_base.Database): OracleError = cx_Oracle.DatabaseError def __init__(self, host=None, port=None, username=None, - password=None, database=None, sslmode=None): + password=None, database=None, sslmode=None, sslrootcert=None): # Oracle requires enough info to connect if not (username and password and database): raise AttributeError("A valid Oracle username, password, and SID are required.") if sslmode is not None: raise AttributeError("Option sslmode is not supported for Oracle database backend.") + if sslrootcert is not None: + raise AttributeError("Option sslrootcert is not supported for Oracle database backend.") sql_base.Database.__init__(self) @@ -419,10 +421,11 @@ class Database(sql_base.Database): return dbh def is_connected_to(self, backend, host, port, username, password, - database, sslmode): + database, sslmode, sslrootcert): # NOTE: host and port are unused for Oracle: return (backend == ORACLE) and (self.username == username) and \ - (self.password == password) and (self.database == database) + (self.password == password) and (self.database == database) and \ + (sslmode is None) and (sslrootcert is None) # try to close it first nicely def close(self): diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index 3a9eb8d..e38a890 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -137,12 +137,13 @@ class Database(sql_base.Database): """ Class for PostgreSQL database operations. """ def __init__(self, host=None, port=None, username=None, - password=None, database=None, sslmode=None): + password=None, database=None, sslmode=None, sslrootcert=None): self.username = username self.password = password self.database = database self.sslmode = sslmode + self.sslrootcert = sslrootcert # Minimum requirements to connect to a PostgreSQL db: if not (self.username and self.database): @@ -163,25 +164,28 @@ class Database(sql_base.Database): def connect(self, reconnect=1): try: - kwargs = { - 'database': str(self.database), - 'user': str(self.username), - 'password': str(self.password)} + dsndata = { + 'dbname': self.database, + 'user': self.username, + 'password': self.password} if self.host is not None: - kwargs['host'] = self.host - kwargs['port'] = self.port - if self.sslmode is not None and self.sslmode == 'verify-full': - kwargs['sslmode'] = str(self.sslmode) + dsndata['host'] = self.host + dsndata['port'] = self.port + if self.sslmode is not None and self.sslmode == 'verify-full' and self.sslrootcert is not None: + dsndata['sslmode'] = self.sslmode + dsndata['sslrootcert'] = self.sslrootcert elif self.sslmode is not None: - raise AttributeError("Only sslmode=verify-full is supported.") + raise AttributeError("Only sslmode=\"verify-full\" (or None) is supported.") + if self.sslmode is not None and self.sslrootcert is None: + raise AttributeError("Attribute sslrootcert needs to be set if sslmode is set.") - self.dbh = psycopg2.connect(**kwargs) + self.dbh = psycopg2.connect(" ".join("%s=%s" % (k, re.escape(str(v))) for k, v in dsndata.iteritems())) # convert all DECIMAL types to float (let Python to choose one) DEC2INTFLOAT = psycopg2.extensions.new_type(psycopg2._psycopg.DECIMAL.values, 'DEC2INTFLOAT', decimal2intfloat) psycopg2.extensions.register_type(DEC2INTFLOAT) - except Exception, e: + except psycopg2.Error, e: if reconnect > 0: # Try one more time: return self.connect(reconnect=reconnect - 1) @@ -192,7 +196,7 @@ class Database(sql_base.Database): "Attempting Re-Connect to the database failed"), None, sys.exc_info()[2] def is_connected_to(self, backend, host, port, username, password, - database, sslmode): + database, sslmode, sslrootcert): if host is None or host == '' or host == 'localhost': host = None port = None @@ -201,7 +205,7 @@ class Database(sql_base.Database): return (backend == POSTGRESQL) and (self.host == host) and \ (self.port == port) and (self.username == username) and \ (self.password == password) and (self.database == database) and \ - (self.sslmode == sslmode) + (self.sslmode == sslmode) and (self.sslrootcert == sslrootcert) def check_connection(self): try: diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index c847f32..46a1b34 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -145,7 +145,7 @@ public class ConfigDefaults { public static final String DB_NAME = "db_name"; public static final String DB_HOST = "db_host"; public static final String DB_PORT = "db_port"; - public static final String DB_SSLMODE = "db_sslmode"; + public static final String DB_SSL_ENABLED = "db_ssl_enabled"; public static final String DB_PROTO = "hibernate.connection.driver_proto"; public static final String DB_CLASS = "hibernate.connection.driver_class"; @@ -554,7 +554,7 @@ public class ConfigDefaults { String dbHost = Config.get().getString(DB_HOST); String dbPort = Config.get().getString(DB_PORT); String dbProto = Config.get().getString(DB_PROTO); - String dbSslmode = Config.get().getString(DB_SSLMODE); + boolean dbSslEnabled = Config.get().getBoolean(DB_SSL_ENABLED); String connectionUrl; @@ -565,9 +565,9 @@ public class ConfigDefaults { } connectionUrl += dbName; - if (dbSslmode != null) { + if (dbSslEnabled) { throw new ConfigException( - "Option sslmode is not supported for Oracle database backend"); + "SSL is not supported for Oracle database backend"); } } else if (isPostgresql()) { @@ -581,16 +581,10 @@ public class ConfigDefaults { } connectionUrl += dbName; - if (dbSslmode != null && dbSslmode.equals("verify-full")) { + if (dbSslEnabled) { connectionUrl += "?ssl=true"; setSslTrustStore(); } - else if (dbSslmode != null) { - throw new ConfigException("Unsuported value for " + - DB_SSLMODE + - ". Only 'verify-full' is supported."); - } - } else { throw new ConfigException( diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 7ecb7b1..3cfe695 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -86,8 +86,7 @@ public class DatabaseManager { } connectionUrl += "/" + overrides.getProperty("db_name"); - String sslmode = config.getString("db_sslmode"); - if (sslmode != null && sslmode.equals("verify-full")) { + if (config.getBoolean("db_ssl_enabled")) { connectionUrl += "?ssl=true"; String trustStore = config.getString("java.ssl_truststore"); if (trustStore == null || ! new File(trustStore).isFile()) { @@ -95,10 +94,7 @@ public class DatabaseManager { trustStore + ". Path can be changed with java.ssl_truststore option."); } System.setProperty("javax.net.ssl.trustStore", trustStore); - } - else if (sslmode != null) { - throw new ConfigException( - "Unsuported value for db_sslmode. Only 'verify-full' is supported."); + overrides.setProperty("db_name", connectionUrl); } } } diff --git a/web/modules/rhn/RHN/DBI.pm b/web/modules/rhn/RHN/DBI.pm index d49873f..9de2330 100644 --- a/web/modules/rhn/RHN/DBI.pm +++ b/web/modules/rhn/RHN/DBI.pm @@ -54,11 +54,9 @@ sub _get_dbi_connect_parameters { if (defined $port and $port ne '' and $port ne '5432') { $DSN .= ";port=$port"; } - my sslmode = PXT::Config->get("db_sslmode"); - if (defined $sslmode and $sslmode eq "verify-full") { + if (PXT::Config->get("db_ssl_enabled")) { $DSN .= ";sslmode=verify-full"; - } elsif (defined $sslmode) { - die "Unsuported value for db_sslmode. Only 'verify-full' is supported.\n"; + $DSN .= ";sslrootcert=" . PXT::Config->get("db_sslrootcert"); } } } commit 1a966c26270047dd7da058a7dde476c979e67c36 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 31 18:21:40 2013 +0100 Checkstyle fix, follow JSL for method modifiers diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index 312c8ed..4dc8f5c 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -1188,7 +1188,7 @@ public class PackageManager extends BaseManager { * Create all repoentries for a channel's packages if needed * @param cid the channel id */ - public synchronized static void createRepoEntrys(Long cid) { + public static synchronized void createRepoEntrys(Long cid) { Map params = new HashMap(); params.put("cid", cid); try {

1 0

Changes to 'refs/tags/spacewalk-abrt-2.1.4-1'
by Tomáš Kašpárek 31 Oct '13

31 Oct '13

Tag 'spacewalk-abrt-2.1.4-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-31 12:43 +0000 Tagging package [spacewalk-abrt] version [2.1.4-1] in directory [client/tools/spacewalk-abrt/]. Changes since spacewalk-search-2.1.4-1: Tomas Kasparek (2): explicitely require abrt-cli Automatic commit of package [spacewalk-abrt] release [2.1.4-1]. --- client/tools/spacewalk-abrt/spacewalk-abrt.spec | 9 ++++++++- rel-eng/packages/spacewalk-abrt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Tomáš Kašpárek 31 Oct '13

31 Oct '13

client/tools/spacewalk-abrt/spacewalk-abrt.spec | 5 ++++- rel-eng/packages/spacewalk-abrt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 5b268ea01a0070b6240d78705207f69490d083a4 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Thu Oct 31 13:43:08 2013 +0100 Automatic commit of package [spacewalk-abrt] release [2.1.4-1]. diff --git a/client/tools/spacewalk-abrt/spacewalk-abrt.spec b/client/tools/spacewalk-abrt/spacewalk-abrt.spec index 2bd4ef6..fc25cc3 100644 --- a/client/tools/spacewalk-abrt/spacewalk-abrt.spec +++ b/client/tools/spacewalk-abrt/spacewalk-abrt.spec @@ -1,5 +1,5 @@ Name: spacewalk-abrt -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} Summary: ABRT plug-in for rhn-check @@ -41,6 +41,9 @@ service abrtd restart %{_mandir}/man8/* %changelog +* Thu Oct 31 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.4-1 +- explicitely require abrt-cli + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 - Reading only one line - 1002041 - File content is loaded only when needed diff --git a/rel-eng/packages/spacewalk-abrt b/rel-eng/packages/spacewalk-abrt index 17be0c5..f3dd12d 100644 --- a/rel-eng/packages/spacewalk-abrt +++ b/rel-eng/packages/spacewalk-abrt @@ -1 +1 @@ -2.1.3-1 client/tools/spacewalk-abrt/ +2.1.4-1 client/tools/spacewalk-abrt/

1 0

client/tools
by Tomáš Kašpárek 31 Oct '13

31 Oct '13

client/tools/spacewalk-abrt/spacewalk-abrt.spec | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit cc9ea76d45d18398cd05ebebfaca95120ab234aa Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Thu Oct 31 10:49:49 2013 +0100 explicitely require abrt-cli abrt-cli contains abrt-addons which serve for catching crashes - without them whole abrt is useless as it does not capture crashes on Fedora 19 abrt and abrt-cli are not part of @Base and abrt does not require abrt-cli diff --git a/client/tools/spacewalk-abrt/spacewalk-abrt.spec b/client/tools/spacewalk-abrt/spacewalk-abrt.spec index 24dd06c..2bd4ef6 100644 --- a/client/tools/spacewalk-abrt/spacewalk-abrt.spec +++ b/client/tools/spacewalk-abrt/spacewalk-abrt.spec @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext Requires: abrt +Requires: abrt-cli Requires: rhnlib Requires: rhn-check %description @@ -29,6 +30,9 @@ make -f Makefile.spacewalk-abrt install PREFIX=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%post +service abrtd restart + %files %config /etc/sysconfig/rhn/clientCaps.d/abrt %config /etc/libreport/events.d/spacewalk.conf

1 0

Changes to 'refs/tags/spacewalk-search-2.1.4-1'
by Tomas Lestach 31 Oct '13

31 Oct '13

Tag 'spacewalk-search-2.1.4-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-10-31 11:08 +0000 Tagging package [spacewalk-search] version [2.1.4-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-backend-2.1.33-1: Tomas Lestach (2): 1023669 - set Session Time Zone for Oracle connections Automatic commit of package [spacewalk-search] release [2.1.4-1]. --- rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/spacewalk-search.spec | 7 + search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 43 ++++++++-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 1 4 files changed, 46 insertions(+), 7 deletions(-) ---

1 0

rel-eng/packages search-server/spacewalk-search
by Tomas Lestach 31 Oct '13

31 Oct '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 0e1f10a1259ad0c4d802c157060c137acd70b127 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 31 12:08:40 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.4-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index a4dd053..4f784ad 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.3-1 search-server/spacewalk-search/ +2.1.4-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 03ca9f7..b619e57 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,11 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Thu Oct 31 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.4-1 +- 1023669 - set Session Time Zone for Oracle connections +- Unchecked conversion removed in rhnsearch +- 1020952 - SSL for Postgresql: Java (rhn-search) + * Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 - 1002590 - unified way how we call rhn-search cleanindex

1 0

search-server/spacewalk-search
by Tomas Lestach 31 Oct '13

31 Oct '13

search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 43 ++++++++-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 1 2 files changed, 39 insertions(+), 5 deletions(-) New commits: commit 219276e9b7209db0d3aa05c5767bd8400c40dbaa Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Oct 30 10:25:04 2013 +0100 1023669 - set Session Time Zone for Oracle connections addressing: com.ibatis.common.jdbc.exception.NestedSQLException: --- The error occurred in com/redhat/satellite/search/db/server.xml. --- The error occurred while applying a result map. --- Check the getServerByIdOrDate-AutoResultMap. --- Check the result mapping for the 'registered' property. --- Cause: java.sql.SQLException: Session Time Zone not set! similar to 6e364cdc diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 269b3ed..7ecb7b1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -21,7 +21,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.lang.reflect.Method; import java.util.Properties; +import java.util.TimeZone; import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; @@ -29,6 +31,8 @@ import com.ibatis.sqlmap.client.SqlMapSession; import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException; +import org.apache.log4j.Logger; + /** * Manages DB activity - connections, running queries, etc * @version $Rev$ @@ -36,6 +40,9 @@ import com.redhat.satellite.search.config.ConfigException; public class DatabaseManager { private SqlMapClient client = null; + private boolean isOracle; + private static Logger log = Logger.getLogger(DatabaseManager.class); + /** * Constructor @@ -66,7 +73,8 @@ public class DatabaseManager { for (String option : options) { overrides.setProperty(option, config.getString(option)); } - if (config.getString("db_backend").equals("oracle")) { + isOracle = config.getString("db_backend").equals("oracle"); + if (isOracle) { overrides.setProperty("db_name", "@" + overrides.getProperty("db_name")); } else { String dbHost = config.getString("db_host"); @@ -105,8 +113,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - SqlMapSession session = client.openSession(); - return new Query<T>(session, name); + return new Query<T>(openSession(), name); } /** @@ -115,7 +122,7 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - SqlMapSession session = client.openSession(); + SqlMapSession session = openSession(); return new WriteQuery(session, name); } @@ -124,6 +131,32 @@ public class DatabaseManager { * @return connection object */ public Connection getConnection() { - return new Connection(client.openSession()); + return new Connection(openSession()); + } + + private SqlMapSession openSession() { + SqlMapSession session = client.openSession(); + setSessionTimeZone(); + return session; + } + + public void setSessionTimeZone() { + if (isOracle) { + try { + java.sql.Connection proxyConn = client.getDataSource().getConnection(); + // this is a trick, how to get OracleConnection from the Proxy object + java.sql.Connection oraConn = proxyConn.createStatement().getConnection(); + Method setSessionTimeZoneMethod = Class.forName( + "oracle.jdbc.driver.OracleConnection").getMethod( + "setSessionTimeZone", String.class); + if (setSessionTimeZoneMethod != null) { + setSessionTimeZoneMethod.invoke(oraConn, TimeZone.getDefault().getID()); + } + } + catch (Exception e) { + log.warn("Unable to set session timezone."); + e.printStackTrace(); + } + } } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java index f997ed8..9b575bf 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java @@ -88,6 +88,7 @@ public abstract class GenericIndexTask implements Job { getIndexName() + ">"); } catch (SQLException e) { + e.printStackTrace(); throw new JobExecutionException(e); } catch (IndexingException e) {

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.33-1'
by mkollar 29 Oct '13

29 Oct '13

Tag 'spacewalk-backend-2.1.33-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-29 15:47 +0000 Tagging package [spacewalk-backend] version [2.1.33-1] in directory [backend/]. Changes since spacewalk-java-2.1.62-1: Matej Kollar (11): Tab vs. Space War Change deprecated 'has_key' to 'in' Small coding conventions Older Class to newer Instance exceptions Test for None with `is` Various small coding convetions (PEP8) Simplification: use isinstance Simplification 1020952 - SSL for Postgresql: Backend (Python) Small changes Automatic commit of package [spacewalk-backend] release [2.1.33-1]. Michael Mraka (1): 1007521 - synchronize repo entries creation --- backend/server/rhnSQL/__init__.py | 74 ++++++-- backend/server/rhnSQL/const.py | 5 backend/server/rhnSQL/dbi.py | 6 backend/server/rhnSQL/driver_cx_Oracle.py | 76 ++++---- backend/server/rhnSQL/driver_postgresql.py | 74 ++++---- backend/server/rhnSQL/sql_base.py | 53 ++--- backend/server/rhnSQL/sql_lib.py | 11 - backend/server/rhnSQL/sql_row.py | 39 ++-- backend/server/rhnSQL/sql_sequence.py | 23 +- backend/server/rhnSQL/sql_table.py | 91 +++++----- backend/server/rhnSQL/sql_types.py | 7 backend/spacewalk-backend.spec | 13 + java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 2 rel-eng/download-koji.sh | 8 rel-eng/packages/spacewalk-backend | 2 15 files changed, 279 insertions(+), 205 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by mkollar 29 Oct '13

29 Oct '13

backend/spacewalk-backend.spec | 13 ++++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) New commits: commit dd0a5a4e4cd4640ab2ec191e04c0796662c75a6f Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 29 16:47:25 2013 +0100 Automatic commit of package [spacewalk-backend] release [2.1.33-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index ee7d78c..8ca0d9c 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.32 +Version: 2.1.33 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,17 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Tue Oct 29 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.33-1 +- 1020952 - SSL for Postgresql: Backend (Python) +- Simplification +- Simplification: use isinstance +- Various small coding convetions (PEP8) +- Test for None with `is` +- Older Class to newer Instance exceptions +- Small coding conventions +- Change deprecated 'has_key' to 'in' +- Tab vs. Space War + * Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.32-1 - fixed table alias - add support for enhances rpm weak dependencies (backend) (bnc#846436) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 41029bb..c76ab6e 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.32-1 backend/ +2.1.33-1 backend/

1 0

10 commits - backend/server rel-eng/download-koji.sh
by mkollar 29 Oct '13

29 Oct '13

backend/server/rhnSQL/__init__.py | 74 ++++++++++++++++++----- backend/server/rhnSQL/const.py | 5 - backend/server/rhnSQL/dbi.py | 6 + backend/server/rhnSQL/driver_cx_Oracle.py | 76 ++++++++++++------------ backend/server/rhnSQL/driver_postgresql.py | 74 +++++++++++++---------- backend/server/rhnSQL/sql_base.py | 53 +++++++--------- backend/server/rhnSQL/sql_lib.py | 11 +-- backend/server/rhnSQL/sql_row.py | 39 ++++++------ backend/server/rhnSQL/sql_sequence.py | 23 +++---- backend/server/rhnSQL/sql_table.py | 91 +++++++++++++++-------------- backend/server/rhnSQL/sql_types.py | 7 +- rel-eng/download-koji.sh | 8 +- 12 files changed, 265 insertions(+), 202 deletions(-) New commits: commit a52ac21e56b83776ed40bf440ac6aa73a9998c51 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 24 18:16:04 2013 +0200 Small changes diff --git a/rel-eng/download-koji.sh b/rel-eng/download-koji.sh index 6c81d9b..e95f7c7 100755 --- a/rel-eng/download-koji.sh +++ b/rel-eng/download-koji.sh @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -KOJI=$(echo "$1" | sed 's,$https*://.*$/[^/]*$,\1/,') +KOJI=$( echo "$1" | sed 's,$https\?://.*$/[^/]*$,\1/,' ) WGET='wget --no-check-certificate -nv' $WGET -O - $1 \ @@ -13,4 +13,6 @@ $WGET -O - $1 \ print "'"$KOJI"'" $2 " -O " basename($2)} /"http:\/\/download.*\.rpm/ && ! /src\.rpm/ { print $2 " -O " basename($2)} ' \ - | xargs -n 3 $WGET + | xargs --no-run-if-empty -n 3 $WGET + +# rpm -Fvh *.rpm commit 01afc927f1fb519884cfe900c4169360fcbf243c Author: Matej Kollar <mkollar(a)redhat.com> Date: Fri Oct 18 17:33:31 2013 +0200 1020952 - SSL for Postgresql: Backend (Python) diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index f3e744b..f3f4dbf 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -41,7 +41,7 @@ from sql_base import SQLError, SQLSchemaError, SQLConnectError, \ # EVER be exposed to the calling applications. -def __init__DB(backend, host, port, username, password, database): +def __init__DB(backend, host, port, username, password, database, sslmode): """ Establish and check the connection so we can wrap it and handle exceptions. @@ -52,14 +52,14 @@ def __init__DB(backend, host, port, username, password, database): my_db = __DB except NameError: # __DB has not been set up db_class = dbi.get_database_class(backend=backend) - __DB = db_class(host, port, username, password, database) + __DB = db_class(host, port, username, password, database, sslmode) __DB.connect() return else: del my_db if __DB.is_connected_to(backend, host, port, username, password, - database): + database, sslmode): __DB.check_connection() return @@ -67,13 +67,13 @@ def __init__DB(backend, host, port, username, password, database): __DB.close() # now we have to get a different connection __DB = dbi.get_database_class(backend=backend)( - host, port, username, password, database) + host, port, username, password, database, sslmode) __DB.connect() return 0 def initDB(backend=None, host=None, port=None, username=None, - password=None, database=None): + password=None, database=None, sslmode=None): """ Initialize the database. @@ -91,6 +91,7 @@ def initDB(backend=None, host=None, port=None, username=None, database = CFG.DB_NAME username = CFG.DB_USER password = CFG.DB_PASSWORD + sslmode = CFG.DB_SSLMODE if backend not in SUPPORTED_BACKENDS: raise rhnException("Unsupported database backend", backend) @@ -101,7 +102,7 @@ def initDB(backend=None, host=None, port=None, username=None, # Hide the password add_to_seclist(password) try: - __init__DB(backend, host, port, username, password, database) + __init__DB(backend, host, port, username, password, database, sslmode) # except (rhnException, SQLError): # raise # pass on, we know those ones # except (KeyboardInterrupt, SystemExit): diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 8d5724b..8bad31d 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -358,11 +358,13 @@ class Database(sql_base.Database): OracleError = cx_Oracle.DatabaseError def __init__(self, host=None, port=None, username=None, - password=None, database=None): + password=None, database=None, sslmode=None): # Oracle requires enough info to connect if not (username and password and database): raise AttributeError("A valid Oracle username, password, and SID are required.") + if sslmode is not None: + raise AttributeError("Option sslmode is not supported for Oracle database backend.") sql_base.Database.__init__(self) @@ -417,7 +419,7 @@ class Database(sql_base.Database): return dbh def is_connected_to(self, backend, host, port, username, password, - database): + database, sslmode): # NOTE: host and port are unused for Oracle: return (backend == ORACLE) and (self.username == username) and \ (self.password == password) and (self.database == database) diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index ce7c97a..3a9eb8d 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -137,7 +137,16 @@ class Database(sql_base.Database): """ Class for PostgreSQL database operations. """ def __init__(self, host=None, port=None, username=None, - password=None, database=None): + password=None, database=None, sslmode=None): + + self.username = username + self.password = password + self.database = database + self.sslmode = sslmode + + # Minimum requirements to connect to a PostgreSQL db: + if not (self.username and self.database): + raise AttributeError("PostgreSQL requires at least a user and database name.") if host is None or host == '' or host == 'localhost': self.host = None @@ -150,40 +159,40 @@ class Database(sql_base.Database): if not self.port: self.port = -1 - self.username = username - self.password = password - self.database = database - - # Minimum requirements to connect to a PostgreSQL db: - if not (self.username and self.database): - raise AttributeError("PostgreSQL requires at least a user and database name.") - sql_base.Database.__init__(self) def connect(self, reconnect=1): try: - if self.host is None: - self.dbh = psycopg2.connect(database=str(self.database), user=str(self.username), - password=str(self.password)) - else: - self.dbh = psycopg2.connect(database=str(self.database), user=str(self.username), - password=str(self.password), host=self.host, port=self.port) + kwargs = { + 'database': str(self.database), + 'user': str(self.username), + 'password': str(self.password)} + if self.host is not None: + kwargs['host'] = self.host + kwargs['port'] = self.port + if self.sslmode is not None and self.sslmode == 'verify-full': + kwargs['sslmode'] = str(self.sslmode) + elif self.sslmode is not None: + raise AttributeError("Only sslmode=verify-full is supported.") + + self.dbh = psycopg2.connect(**kwargs) + # convert all DECIMAL types to float (let Python to choose one) DEC2INTFLOAT = psycopg2.extensions.new_type(psycopg2._psycopg.DECIMAL.values, - 'DEC2INTFLOAT', decimal2intfloat) + 'DEC2INTFLOAT', decimal2intfloat) psycopg2.extensions.register_type(DEC2INTFLOAT) except Exception, e: - if reconnect: + if reconnect > 0: # Try one more time: - return self.connect(reconnect=0) + return self.connect(reconnect=reconnect - 1) # Failed reconnect, time to error out: raise sql_base.SQLConnectError( - self.database, e.pgcode, e.pgerror, - "Attempting Re-Connect to the database failed"), None, sys.exc_info()[2] + self.database, e.pgcode, e.pgerror, + "Attempting Re-Connect to the database failed"), None, sys.exc_info()[2] def is_connected_to(self, backend, host, port, username, password, - database): + database, sslmode): if host is None or host == '' or host == 'localhost': host = None port = None @@ -191,7 +200,8 @@ class Database(sql_base.Database): port = -1 return (backend == POSTGRESQL) and (self.host == host) and \ (self.port == port) and (self.username == username) and \ - (self.password == password) and (self.database == database) + (self.password == password) and (self.database == database) and \ + (self.sslmode == sslmode) def check_connection(self): try: diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index 4650582..071f717 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -356,7 +356,7 @@ class Database: return None def is_connected_to(self, backend, host, port, username, password, - database): + database, sslmode): """ Check if this database matches the given connection parameters. """ commit 5f924106873af856a7c3d802a1ed4b9e1316d7d3 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 20:46:19 2013 +0200 Simplification diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index ad17c1c..4650582 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -52,9 +52,7 @@ def __oci_name_value(names, value): # this is for when an execute statement went bad... class SQLError(Exception): - def __init__(self, *args): - apply(Exception.__init__, (self, ) + args) - + pass # other Schema Errors diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py index 444572e..d0a5419 100644 --- a/backend/server/rhnSQL/sql_row.py +++ b/backend/server/rhnSQL/sql_row.py @@ -81,9 +81,9 @@ class Row(UserDictCase): def reset(self, val=0): """ reset the changed status for these entries """ - for k in self.data.keys(): + for k, v in self.data.items(): # tuples do not support item assignement - self.data[k] = (self.data[k][0], val) + self.data[k] = (v[0], val) def create(self, hashval): """ create it as a new entry """ @@ -104,8 +104,8 @@ class Row(UserDictCase): if not ret: self.real = 0 return 0 - for k in ret.keys(): - self.data[k] = (ret[k], 0) + for k, v in ret.items(): + self.data[k] = (v, 0) self.real = 1 return 1 commit 34ba98264c70235e8b965aa92f1f82e4e776fb5f Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 20:44:00 2013 +0200 Simplification: use isinstance instead of complicated construction with "type" diff --git a/backend/server/rhnSQL/sql_sequence.py b/backend/server/rhnSQL/sql_sequence.py index df6b073..539a88c 100644 --- a/backend/server/rhnSQL/sql_sequence.py +++ b/backend/server/rhnSQL/sql_sequence.py @@ -24,7 +24,7 @@ import sql_base # XXX: this is still Oracle specific, but it shouldn't be class Sequence: def __init__(self, db, seq): - if not seq or type(seq) != type(""): + if not seq or not isinstance(seq, str): raise rhnException("First argument needs to be a sequence name", seq) self.__seq = seq if not isinstance(db, sql_base.Database): diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index fd8ae21..5143819 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -61,11 +61,11 @@ class RowData(UserDictCase): # Some day we'll figure out how to reduce confusion... class Table: def __init__(self, db, table, hashid, cache=False): - if not table or not type(table) == type(""): + if not table or not isinstance(table, str): raise rhnException("First argument needs to be a table name", table) self.__table = table - if not hashid or not type(hashid) == type(""): + if not hashid or not isinstance(hashid, str): raise rhnException("Second argument needs to be the name of the unique index column", hashid) self.__hashid = hashid @@ -91,9 +91,9 @@ class Table: if self.__cache is not None: self.__cache[row[self.__hashid]] = row return self.__setitem__(None, row) - if type(rows) == type({}) or isinstance(rows, UserDictCase): + if isinstance(rows, dict) or isinstance(rows, UserDictCase): return insert_row(rows) - if type(rows) == type([]): + if isinstance(rows, list): for x in rows: insert_row(x) return None @@ -102,7 +102,7 @@ class Table: # select from the whole table all the entries that match the # valuies of the hash provided (kind of a complex select) def select(self, row): - if not type(row) == type({}) and not isinstance(row, UserDictCase): + if not isinstance(row, dict) and not isinstance(row, UserDictCase): raise rhnException("Expecting hash argument. %s is invalid" % type(row), row) if row == {}: @@ -166,7 +166,7 @@ class Table: # values for all columns except the one that functions as the # primary key identifier def __setitem__(self, key, value): - if not type(value) == type({}) and not isinstance(value, UserDictCase): + if not isinstance(value, dict) and not isinstance(value, UserDictCase): raise TypeError("Expected value to be a hash") if self.__hashid in value: # we don't need that if key is None: commit 1ae50700dfaffed1bcf031815b1c5555e244bff1 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 20:27:16 2013 +0200 Various small coding convetions (PEP8) I.e. * visual indentation * indendtation multiple of four * spaces around operator * 2 spaces before inline comment * 2 empty lines between top level definitions * 1 empty line between local definitions * ... Conflicts: backend/server/rhnSQL/driver_cx_Oracle.py backend/server/rhnSQL/sql_base.py diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index 7c4b2e9..f3e744b 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -40,6 +40,7 @@ from sql_base import SQLError, SQLSchemaError, SQLConnectError, \ # instantiated by the initDB call. This object/instance should NEVER, # EVER be exposed to the calling applications. + def __init__DB(backend, host, port, username, password, database): """ Establish and check the connection so we can wrap it and handle @@ -49,7 +50,7 @@ def __init__DB(backend, host, port, username, password, database): global __DB try: my_db = __DB - except NameError: # __DB has not been set up + except NameError: # __DB has not been set up db_class = dbi.get_database_class(backend=backend) __DB = db_class(host, port, username, password, database) __DB.connect() @@ -58,20 +59,21 @@ def __init__DB(backend, host, port, username, password, database): del my_db if __DB.is_connected_to(backend, host, port, username, password, - database): + database): __DB.check_connection() return __DB.commit() __DB.close() # now we have to get a different connection - __DB = dbi.get_database_class(backend=backend)(host, port, username, - password, database) + __DB = dbi.get_database_class(backend=backend)( + host, port, username, password, database) __DB.connect() return 0 + def initDB(backend=None, host=None, port=None, username=None, - password=None, database=None): + password=None, database=None): """ Initialize the database. @@ -101,7 +103,7 @@ def initDB(backend=None, host=None, port=None, username=None, try: __init__DB(backend, host, port, username, password, database) # except (rhnException, SQLError): -# raise # pass on, we know those ones +# raise # pass on, we know those ones # except (KeyboardInterrupt, SystemExit): # raise except: @@ -111,6 +113,7 @@ def initDB(backend=None, host=None, port=None, username=None, # str(e_type), str(e_value)) return 0 + # close the database def closeDB(): global __DB @@ -125,6 +128,7 @@ def closeDB(): del __DB return + # common function for testing the connection state (ie, __DB defined def __test_DB(): global __DB @@ -139,73 +143,105 @@ def Procedure(name): db = __test_DB() return db.procedure(name) + # wrapper for a Procedure callable class def Function(name, ret_type): db = __test_DB() return db.function(name, ret_type) + # Wrapper for the Sequence class def Sequence(seq): db = __test_DB() return sql_sequence.Sequence(db, seq) + # Wrapper for the Row class def Row(table, hash_name, hash_value=None): db = __test_DB() return sql_row.Row(db, table, hash_name, hash_value) + # Wrapper for the Table class def Table(table, hash_name, local_cache=0): db = __test_DB() return sql_table.Table(db, table, hash_name, local_cache) + +########################### # Functions points of entry +########################### + + def cursor(): db = __test_DB() return db.cursor() + + def prepare(sql, blob_map=None): db = __test_DB() if isinstance(sql, Statement): sql = sql.statement return db.prepare(sql, blob_map=blob_map) + + def execute(sql, *args, **kwargs): db = __test_DB() return apply(db.execute, (sql, ) + args, kwargs) + + def fetchall_dict(sql, *args, **kwargs): h = prepare(sql) h.execute(sql, *args, **kwargs) return h.fetchall_dict() + + def fetchone_dict(sql, *args, **kwargs): h = prepare(sql) h.execute(sql, *args, **kwargs) return h.fetchone_dict() + + def commit(): db = __test_DB() return db.commit() + + def rollback(name=None): db = __test_DB() return db.rollback(name) + + def transaction(name): db = __test_DB() return db.transaction(name) + + def TimestampFromTicks(*args, **kwargs): db = __test_DB() return apply(db.TimestampFromTicks, args, kwargs) + + def DateFromTicks(*args, **kwargs): db = __test_DB() return apply(db.DateFromTicks, args, kwargs) + + def Date(*args, **kwargs): db = __test_DB() return apply(db.Date, args, kwargs) + def clear_log_id(): clear_log_id = Procedure("logging.clear_log_id") clear_log_id() + def set_log_auth(user_id): set_log_auth = Procedure("logging.set_log_auth") set_log_auth(user_id) + def set_log_auth_login(login): h = prepare("select id from web_contact_all where login = :login") h.execute(login=login) @@ -216,6 +252,7 @@ def set_log_auth_login(login): else: raise rhnException("No such log user", login) + def read_lob(lob): if not lob: return None @@ -238,9 +275,10 @@ class _Callable(object): class _Procedure(_Callable): - def __init__(self, name): - _Callable.__init__(self, name) - self._implementor = Procedure + def __init__(self, name): + _Callable.__init__(self, name) + self._implementor = Procedure + class _Function(_Callable): def __init__(self, name): diff --git a/backend/server/rhnSQL/const.py b/backend/server/rhnSQL/const.py index 9dc9fdb..4114efc 100644 --- a/backend/server/rhnSQL/const.py +++ b/backend/server/rhnSQL/const.py @@ -20,7 +20,6 @@ POSTGRESQL = "postgresql" # Backend constants: SUPPORTED_BACKENDS = { - ORACLE: "", - POSTGRESQL: "", + ORACLE: "", + POSTGRESQL: "", } - diff --git a/backend/server/rhnSQL/dbi.py b/backend/server/rhnSQL/dbi.py index 50d315c..cb5e35a 100644 --- a/backend/server/rhnSQL/dbi.py +++ b/backend/server/rhnSQL/dbi.py @@ -18,10 +18,11 @@ from const import ORACLE, POSTGRESQL # Map supported backend constants to a specific Python driver: BACKEND_DRIVERS = { - ORACLE: "cx_Oracle", - POSTGRESQL: "postgresql", + ORACLE: "cx_Oracle", + POSTGRESQL: "postgresql", } + def get_database_module(backend=None): """Loads the database driver module, performing autodetection if needed""" @@ -41,6 +42,7 @@ def get_database_module(backend=None): return module + def get_database_class(backend=None): """Returns the database class""" module = get_database_module(backend=backend) diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 547adbc..8d5724b 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -44,6 +44,7 @@ ORACLE_TYPE_MAPPING = [ (sql_types.LONG_BINARY, cx_Oracle.LONG_BINARY), ] + class Cursor(sql_base.Cursor): """ Wrapper that should just transform Oracle specific exceptions into @@ -55,7 +56,7 @@ class Cursor(sql_base.Cursor): try: sql_base.Cursor.__init__(self, dbh=dbh, sql=sql, - force=force) + force=force) self._type_mapping = ORACLE_TYPE_MAPPING self.blob_map = blob_map except sql_base.SQLSchemaError, e: @@ -89,19 +90,19 @@ class Cursor(sql_base.Cursor): return cursor def _execute_wrapper(self, function, *p, **kw): - params = ','.join(["%s: %s" % (repr(key), repr(value)) for key, value \ - in kw.items()]) + params = ','.join(["%s: %s" % (repr(key), repr(value)) for key, value + in kw.items()]) log_debug(5, "Executing SQL: \"%s\" with bind params: {%s}" - % (self.sql, params)) + % (self.sql, params)) if self.sql is None: raise rhnException("Cannot execute empty cursor") if self.blob_map: blob_content = {} for orig_blob_var in self.blob_map.keys(): - new_blob_var = orig_blob_var + '_blob' - blob_content[new_blob_var] = kw[orig_blob_var] - kw[new_blob_var] = self.var(cx_Oracle.BLOB) - del kw[orig_blob_var] + new_blob_var = orig_blob_var + '_blob' + blob_content[new_blob_var] = kw[orig_blob_var] + kw[new_blob_var] = self.var(cx_Oracle.BLOB) + del kw[orig_blob_var] modified_params = self._munge_args(kw) try: @@ -114,26 +115,26 @@ class Cursor(sql_base.Cursor): if 900 <= errno <= 999: # Per Oracle's documentation, SQL parsing error raise sql_base.SQLStatementPrepareError(errno, errmsg, self.sql), None, sys.exc_info()[2] - if errno == 1475: # statement needs to be reparsed; force a prepare again - if self.reparsed: # useless, tried that already. give up + if errno == 1475: # statement needs to be reparsed; force a prepare again + if self.reparsed: # useless, tried that already. give up log_error("Reparsing cursor did not fix it", self.sql) args = ("Reparsing tried and still got this",) + tuple(ret) raise sql_base.SQLError(*args), None, sys.exc_info()[2] self._real_cursor = self.dbh.prepare(self.sql) self.reparsed = 1 apply(self._execute_wrapper, (function, ) + p, kw) - elif 20000 <= errno <= 20999: # error codes we know we raise as schema errors + elif 20000 <= errno <= 20999: # error codes we know we raise as schema errors raise sql_base.SQLSchemaError(*ret), None, sys.exc_info()[2] raise apply(sql_base.SQLError, ret), None, sys.exc_info()[2] except ValueError: # this is not good.Let the user know raise else: - self.reparsed = 0 # reset the reparsed counter + self.reparsed = 0 # reset the reparsed counter if self.blob_map: for blob_var, content in blob_content.items(): - kw[blob_var].getvalue().write(content) + kw[blob_var].getvalue().write(content) # Munge back the values self._unmunge_args(kw, modified_params) return retval @@ -194,7 +195,7 @@ class Cursor(sql_base.Cursor): for i in xrange(item_count): pdict = arr[i] for k, v in kwargs.iteritems(): - pdict[k] = to_string(v[start+i]) + pdict[k] = to_string(v[start + i]) # We clear self->bindVariables so that list of all nulls # in the previous chunk which caused the type to be set to @@ -264,10 +265,10 @@ class Cursor(sql_base.Cursor): return modified def update_blob(self, table_name, column_name, where_clause, data, - **kwargs): + **kwargs): sql = "SELECT %s FROM %s %s FOR update of %s" % \ (column_name, table_name, where_clause, column_name) - c= rhnSQL.prepare(sql) + c = rhnSQL.prepare(sql) apply(c.execute, (), kwargs) row = c.fetchone_dict() blob = row[column_name] @@ -293,9 +294,9 @@ class Procedure(sql_base.Procedure): except cx_Oracle.DatabaseError, e: if not hasattr(e, "args"): raise sql_base.SQLError(self.name, args), None, sys.exc_info()[2] - elif 20000 <= e[0].code <= 20999: # error codes we know we raise as schema errors + elif 20000 <= e[0].code <= 20999: # error codes we know we raise as schema errors - raise sql_base.SQLSchemaError(e[0].code, str(e[0])), None, sys.exc_info()[2] + raise sql_base.SQLSchemaError(e[0].code, str(e[0])), None, sys.exc_info()[2] raise sql_base.SQLError(e[0].code, str(e[0])), None, sys.exc_info()[2] except cx_Oracle.NotSupportedError, error: raise sql_base.SQLError(*error.args), None, sys.exc_info()[2] @@ -341,7 +342,6 @@ class Procedure(sql_base.Procedure): return self.cursor.callproc(self.name, args) - class Function(Procedure): def __init__(self, name, proc, ret_type): Procedure.__init__(self, name, proc) @@ -351,7 +351,6 @@ class Function(Procedure): return self._call_proc_ret(args, self.ret_type) - class Database(sql_base.Database): _cursor_class = Cursor _procedure_class = Procedure @@ -359,7 +358,7 @@ class Database(sql_base.Database): OracleError = cx_Oracle.DatabaseError def __init__(self, host=None, port=None, username=None, - password=None, database=None): + password=None, database=None): # Oracle requires enough info to connect if not (username and password and database): @@ -396,7 +395,7 @@ class Database(sql_base.Database): # we don't try to reconnect blindly. We have a list of # known "good" failure codes that warrant a reconnect # attempt - if errno in [ 12547 ] : # lost contact + if errno in [12547]: # lost contact return self.connect(reconnect=0) err_args = [self.dbtxt, errno, errmsg] err_args.extend(list(ret[2:])) @@ -412,13 +411,13 @@ class Database(sql_base.Database): def _connect(self): dbh = cx_Oracle.Connection(self.username, self.password, self.database) if hasattr(sys, "argv"): - dbh.cursor().execute( - "BEGIN DBMS_APPLICATION_INFO.SET_MODULE('%s',NULL); END;" - % sys.argv[0]) + dbh.cursor().execute( + "BEGIN DBMS_APPLICATION_INFO.SET_MODULE('%s',NULL); END;" + % sys.argv[0]) return dbh def is_connected_to(self, backend, host, port, username, password, - database): + database): # NOTE: host and port are unused for Oracle: return (backend == ORACLE) and (self.username == username) and \ (self.password == password) and (self.database == database) @@ -459,11 +458,11 @@ class Database(sql_base.Database): col_list = [] bind_list = [] for bind_var, column in blob_map.items(): - r=re.compile(":%s" % bind_var) + r = re.compile(":%s" % bind_var) sql = re.sub(r, 'empty_blob()', sql) col_list.append(column) bind_list.append(":%s_blob" % bind_var) - sql += " returning %s into %s" %(','.join(col_list), ','.join(bind_list)) + sql += " returning %s into %s" % (','.join(col_list), ','.join(bind_list)) # this way we only hit the network once for each sql statement return self._cursor_class(dbh=self.dbh, sql=sql, force=force, blob_map=blob_map) @@ -502,7 +501,7 @@ class Database(sql_base.Database): def rollback(self, name=None): log_debug(3, self.dbtxt, name) - if name: # we need to roll back to a savepoint + if name: # we need to roll back to a savepoint return self.execute("rollback to savepoint %s" % name) return self.dbh.rollback() @@ -510,10 +509,10 @@ class Database(sql_base.Database): try: h = self.prepare("select 1 from dual") h.execute() - except: # try to reconnect, that one MUST WORK always + except: # try to reconnect, that one MUST WORK always log_error("DATABASE CONNECTION TO '%s' LOST" % self.dbtxt, "Exception information: %s" % sys.exc_info()[1]) - self.connect() # only allow one try + self.connect() # only allow one try return 0 # function that attempts to fix the environment variables @@ -552,4 +551,3 @@ class Database(sql_base.Database): def DatetimeFromTicks(self, ticks): return cx_Oracle.DatetimeFromTicks(ticks) - diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index 326a27b..ce7c97a 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -36,6 +36,7 @@ from spacewalk.common.rhnLog import log_debug, log_error from spacewalk.common.rhnException import rhnException from const import POSTGRESQL + def convert_named_query_params(query): """ Convert a query with named parameters (i.e. :id, :name, etc) into one @@ -131,6 +132,7 @@ def decimal2intfloat(dec, cursor): except ValueError: return float(dec) + class Database(sql_base.Database): """ Class for PostgreSQL database operations. """ @@ -188,17 +190,17 @@ class Database(sql_base.Database): if not port: port = -1 return (backend == POSTGRESQL) and (self.host == host) and \ - (self.port == port) and (self.username == username) \ - and (self.password == password) and (self.database == database) + (self.port == port) and (self.username == username) and \ + (self.password == password) and (self.database == database) def check_connection(self): try: c = self.prepare("select 1") c.execute() - except: # try to reconnect, that one MUST WORK always + except: # try to reconnect, that one MUST WORK always log_error("DATABASE CONNECTION TO '%s' LOST" % self.database, "Exception information: %s" % sys.exc_info()[1]) - self.connect() # only allow one try + self.connect() # only allow one try def prepare(self, sql, force=0, blob_map=None): return Cursor(dbh=self.dbh, sql=sql, force=force, blob_map=blob_map) @@ -240,7 +242,6 @@ class Database(sql_base.Database): return str(lob) - class Cursor(sql_base.Cursor): """ PostgreSQL specific wrapper over sql_base.Cursor. """ @@ -261,15 +262,15 @@ class Cursor(sql_base.Cursor): return cursor def _execute_wrapper(self, function, *p, **kw): - params = ','.join(["%s: %s" % (key, value) for key, value \ - in kw.items()]) + params = ','.join(["%s: %s" % (key, value) for key, value + in kw.items()]) log_debug(5, "Executing SQL: \"%s\" with bind params: {%s}" % (self.sql, params)) if self.sql is None: raise rhnException("Cannot execute empty cursor") if self.blob_map: for blob_var in self.blob_map.keys(): - kw[blob_var] = buffer(kw[blob_var]) + kw[blob_var] = buffer(kw[blob_var]) try: retval = apply(function, p, kw) @@ -277,7 +278,7 @@ class Cursor(sql_base.Cursor): error_code = 99999 m = re.match('ERROR: +-([0-9]+)', e.pgerror) if m: - error_code = int(m.group(1)) + error_code = int(m.group(1)) raise sql_base.SQLSchemaError(error_code, e.pgerror, e) except psycopg2.ProgrammingError, e: raise sql_base.SQLStatementPrepareError(self.dbh, e.pgerror, self.sql) diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index 5fd3c38..ad17c1c 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -28,6 +28,7 @@ import sys import sql_types import types + def ociDict(names=None, row=None): """ Create a dictionary from a row description and its values. """ data = {} @@ -40,6 +41,7 @@ def ociDict(names=None, row=None): data[name] = value return data + def __oci_name_value(names, value): """ Extract the name, value pair needed by ociDict function. """ # the format of the names is @@ -47,6 +49,7 @@ def __oci_name_value(names, value): name = name.lower() return name, value + # this is for when an execute statement went bad... class SQLError(Exception): def __init__(self, *args): @@ -58,14 +61,13 @@ class SQLError(Exception): class SQLSchemaError(SQLError): def __init__(self, errno, errmsg, *args): self.errno = errno - (self.errmsg, errmsg) = string.split(errmsg, '\n', 1) + (self.errmsg, errmsg) = string.split(errmsg, '\n', 1) if len(args): apply(SQLError.__init__, (self, self.errno, self.errmsg, errmsg) + args) else: apply(SQLError.__init__, (self, errno, self.errmsg) + (errmsg,)) - # SQL connect error class SQLConnectError(SQLError): def __init__(self, db, errno, errmsg, *args): @@ -78,7 +80,6 @@ class SQLConnectError(SQLError): SQLError.__init__(self, errno, errmsg, db) - # Cannot prepare statement class SQLStatementPrepareError(SQLError): def __init__(self, db, errmsg, *args): @@ -87,12 +88,10 @@ class SQLStatementPrepareError(SQLError): apply(SQLError.__init__, (self, errmsg, db) + args) - class ModifiedRowError(SQLError): pass - class Cursor: """ A class to implement generic SQL Cursor operations. """ @@ -220,7 +219,6 @@ class Cursor: # Please note: these functions return None if no data is available, # not an empty tuple or a list of empty tuples, or an empty list # or any other combination you can imagine with the word "empty" in it. - def fetchone(self): return self._real_cursor.fetchone() @@ -260,7 +258,6 @@ class Cursor: return 0 - class Procedure: """ Class for calling out to stored procedures. @@ -280,7 +277,6 @@ class Procedure: self.cursor = None - class Database: """ Base class for handling database operations. @@ -362,7 +358,7 @@ class Database: return None def is_connected_to(self, backend, host, port, username, password, - database): + database): """ Check if this database matches the given connection parameters. """ diff --git a/backend/server/rhnSQL/sql_lib.py b/backend/server/rhnSQL/sql_lib.py index ae376a3..6540a30 100644 --- a/backend/server/rhnSQL/sql_lib.py +++ b/backend/server/rhnSQL/sql_lib.py @@ -23,6 +23,7 @@ import string + def build_sql_insert(table, hash_name, items): """ This statement builds a sql statement for an insert of 'items' into "table" indexed by "hash_name" @@ -31,10 +32,11 @@ def build_sql_insert(table, hash_name, items): table, hash_name, string.join(map(lambda a: a[0], items), ", "), string.join(map(lambda a: ":p_%s" % a[0], items), ", ")) - pdict = { "p0" : None } # This must be reset after we return from this call - map(pdict.update, map(lambda a : { "p_%s" % a[0] : a[1] }, items)) + pdict = {"p0": None} # This must be reset after we return from this call + map(pdict.update, map(lambda a: {"p_%s" % a[0]: a[1]}, items)) return sql, pdict + def build_sql_update(table, hash_name, items): """ This statement builds a sql statement for an update of 'items' into "table" indexed by "hash_name" @@ -45,7 +47,6 @@ def build_sql_update(table, hash_name, items): map(lambda a: a[0], items)), ", "), hash_name) - pdict = { "p0" : None } # This must be reset after we return from this call - map(pdict.update, map(lambda a : { "p_%s" % a[0] : a[1] }, items)) + pdict = {"p0": None} # This must be reset after we return from this call + map(pdict.update, map(lambda a: {"p_%s" % a[0]: a[1]}, items)) return sql, pdict - diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py index bc0653d..444572e 100644 --- a/backend/server/rhnSQL/sql_row.py +++ b/backend/server/rhnSQL/sql_row.py @@ -23,6 +23,7 @@ from spacewalk.common.rhnException import rhnException import sql_base import sql_lib + class Row(UserDictCase): """ This class allows one to work with the columns of a particular row in a more convenient manner (ie, using a disctionary interface). It allows for the row @@ -45,7 +46,7 @@ class Row(UserDictCase): self.data = {} # is this a real entry (ie, use insert or update) self.real = 0 - if hashval is not None: # if we have to load an entry already... + if hashval is not None: # if we have to load an entry already... self.load(hashval) def __repr__(self): @@ -65,6 +66,7 @@ class Row(UserDictCase): raise AttributeError("Can not reset the value of the hash key") if x not in self.data or self.data[x][0] != value: self.data[x] = (value, 1) + def __getitem__(self, name): x = string.lower(name) if x in self.data: @@ -114,10 +116,10 @@ class Row(UserDictCase): # get a list of fields to be set items = map(lambda a: (a[0], a[1][0]), filter(lambda b: b[1][1] == 1, self.data.items())) - if not items: # if there is nothing for us to do, avoid doing it. + if not items: # if there is nothing for us to do, avoid doing it. return # and now build the SQL statements - if self.real: # Update + if self.real: # Update if not with_updates: raise sql_base.ModifiedRowError() sql, pdict = sql_lib.build_sql_update(self.table, self.hashname, items) @@ -129,4 +131,3 @@ class Row(UserDictCase): apply(h.execute, (), pdict) self.real = 1 return - diff --git a/backend/server/rhnSQL/sql_sequence.py b/backend/server/rhnSQL/sql_sequence.py index d724866..df6b073 100644 --- a/backend/server/rhnSQL/sql_sequence.py +++ b/backend/server/rhnSQL/sql_sequence.py @@ -19,6 +19,7 @@ from spacewalk.common.rhnException import rhnException import sql_base + # A class to handle sequences # XXX: this is still Oracle specific, but it shouldn't be class Sequence: @@ -35,7 +36,7 @@ class Sequence: cursor = self.__db.prepare(sql) cursor.execute() ret = cursor.fetchone_dict() - if ret is None: # how the hell can this happen? + if ret is None: # how the hell can this happen? return ret return int(ret['id']) diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index f1a7945..fd8ae21 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -43,9 +43,12 @@ class RowData(UserDictCase): h.execute(new_val=value, row_id=self.__rowid) # keep self.data in sync self.data[key] = value - if self.__cache: # maintain cache consistency - try: self.__cache[self.__rowid][key] = value - except: pass + if self.__cache: # maintain cache consistency + try: + self.__cache[self.__rowid][key] = value + except: + pass + # A class to handle operations on a table. # @@ -77,7 +80,7 @@ class Table: if not value: self.__cache = None return - if self.__cache is not None: # already enabled + if self.__cache is not None: # already enabled return self.__cache = {} @@ -173,7 +176,7 @@ class Table: if key is None: raise KeyError("Can not insert entry with NULL key") items = value.items() - if items == []: # quick check for noop + if items == []: # quick check for noop return sql = None if self.has_key(key): @@ -181,7 +184,7 @@ class Table: else: sql, pdict = sql_lib.build_sql_insert(self.__table, self.__hashid, items) # import the value of the hash key - pdict["p0"] = key + pdict["p0"] = key h = self.__db.prepare(sql) apply(h.execute, (), pdict) try: @@ -204,8 +207,10 @@ class Table: h = self.__db.prepare("delete from %s where %s = :p1" % ( self.__table, self.__hashid)) h.execute(p1=key) - try: del self.__cache[key] - except: pass + try: + del self.__cache[key] + except: + pass return 0 # get all keys @@ -240,12 +245,13 @@ class Table: # flush the cache. if cache is off, then noop def flush(self): - if self.__cache is not None: # avoid turning caching on when flushing + if self.__cache is not None: # avoid turning caching on when flushing self.__cache = {} # passthrough commit def commit(self): return self.__db.commit() + # passthrough rollback def rollback(self): self.flush() diff --git a/backend/server/rhnSQL/sql_types.py b/backend/server/rhnSQL/sql_types.py index 1a6057b..7898149 100644 --- a/backend/server/rhnSQL/sql_types.py +++ b/backend/server/rhnSQL/sql_types.py @@ -16,9 +16,11 @@ # Database types we support for out variables # + # Data types class DatabaseDataType: type_name = None + def __init__(self, value=None, size=None): self.size = size or 1 self.set_value(value) @@ -36,18 +38,21 @@ class DatabaseDataType: class NUMBER(DatabaseDataType): type_name = "NUMBER" + class STRING(DatabaseDataType): type_name = "STRING" + def __init__(self, value=None, size=None): DatabaseDataType.__init__(self, value=value, size=size) if not size: self.size = 4000 + class BINARY(DatabaseDataType): type_name = "BINARY" + class LONG_BINARY(DatabaseDataType): type_name = "LONG_BINARY" # XXX More data types to be added as we find need for them - commit 8ac869af32eeea8862bc484f2c7466582c890d82 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 20:16:59 2013 +0200 Test for None with `is` diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index beada98..326a27b 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -91,7 +91,7 @@ class Function(sql_base.Procedure): error_code = int(m.group(1)) raise sql_base.SQLSchemaError(error_code, e.pgerror, e) - if self.ret_type == None: + if self.ret_type is None: return ret else: return self.cursor.fetchone()[0] commit 983455878c7e46d2028333cf48aab461e6ccad86 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 20:14:12 2013 +0200 Older Class to newer Instance exceptions diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index d632086..7c4b2e9 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -131,7 +131,8 @@ def __test_DB(): try: return __DB except NameError: - raise SystemError, "Not connected to any database!", sys.exc_info()[2] + raise SystemError("Not connected to any database!"), None, sys.exc_info()[2] + # wrapper for a Procedure callable class def Procedure(name): diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 0bfa6b6..547adbc 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -224,7 +224,7 @@ class Cursor(sql_base.Cursor): def __getattr__(self, name): if hasattr(self._real_cursor, name): return getattr(self._real_cursor, name) - raise AttributeError, name + raise AttributeError(name) # deletion of the object def __del__(self): @@ -363,7 +363,7 @@ class Database(sql_base.Database): # Oracle requires enough info to connect if not (username and password and database): - raise AttributeError, "A valid Oracle username, password, and SID are required." + raise AttributeError("A valid Oracle username, password, and SID are required.") sql_base.Database.__init__(self) diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index 62b1057..beada98 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -154,7 +154,7 @@ class Database(sql_base.Database): # Minimum requirements to connect to a PostgreSQL db: if not (self.username and self.database): - raise AttributeError, "PostgreSQL requires at least a user and database name." + raise AttributeError("PostgreSQL requires at least a user and database name.") sql_base.Database.__init__(self) diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index 0a56ddd..5fd3c38 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -32,7 +32,7 @@ def ociDict(names=None, row=None): """ Create a dictionary from a row description and its values. """ data = {} if not names: - raise AttributeError, "Class initialization requires a description hash" + raise AttributeError("Class initialization requires a description hash") if row is None: return data for x in range(len(names)): @@ -118,7 +118,7 @@ class Cursor: self._real_cursor = self._prepare(force=force) def _prepare_sql(self): - raise NotImplementedError + raise NotImplementedError() def _prepare(self, force=None): if self.sql: @@ -149,7 +149,7 @@ class Cursor: Abstraction for the update of a blob column which can vary wildly between different database implementations. """ - raise NotImplementedError + raise NotImplementedError() def execute(self, *p, **kw): """ Execute a single query. """ @@ -200,7 +200,7 @@ class Cursor: Must be subclasses by database specific drivers. """ - raise NotImplementedError + raise NotImplementedError() def _execute(self, *args, **kwargs): if kwargs: @@ -210,12 +210,11 @@ class Cursor: return self._execute_(args, kwargs) def _executemany(self, *args, **kwargs): - raise NotImplementedError + raise NotImplementedError() def _execute_(self, args, kwargs): """ Database specific execution of the query. """ - raise NotImplementedError - + raise NotImplementedError() # DATA RETRIEVAL # Please note: these functions return None if no data is available, @@ -296,21 +295,21 @@ class Database: def connect(self, reconnect=1): """ Opens a connection to the database. """ - raise NotImplementedError + raise NotImplementedError() def check_connection(self): """ Check that this connection is still valid. """ # Delegates to sub-classes as this is usually done with a DB specific # query: - raise NotImplementedError + raise NotImplementedError() def prepare(self, sql, force=0): """ Prepare an SQL statement. """ - raise NotImplementedError + raise NotImplementedError() def commit(self): """ Commit changes """ - raise NotImplementedError + raise NotImplementedError() def procedure(self, name): """Return a pointer to a callable instance for a given stored @@ -336,8 +335,7 @@ class Database: return self._function(name, ret_type) def _function(self, name, ret_type): - raise NotImplementedError - + raise NotImplementedError() def transaction(self, name): "set a transaction point to which we can rollback to" @@ -368,16 +366,15 @@ class Database: """ Check if this database matches the given connection parameters. """ - raise NotImplementedError + raise NotImplementedError() def Date(self, year, month, day): "Returns a Date object" - raise NotImplementedError + raise NotImplementedError() def DateFromTicks(self, ticks): "Returns a Date object" - raise NotImplementedError - + raise NotImplementedError() # Class that we use just as a markup for queries/statements; if the statement diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py index cbee06b..bc0653d 100644 --- a/backend/server/rhnSQL/sql_row.py +++ b/backend/server/rhnSQL/sql_row.py @@ -62,14 +62,15 @@ class Row(UserDictCase): # "load from new id"?). We provide interfaces for load, save # and create instead. if x == self.hashname: - raise AttributeError, "Can not reset the value of the hash key" + raise AttributeError("Can not reset the value of the hash key") if x not in self.data or self.data[x][0] != value: self.data[x] = (value, 1) def __getitem__(self, name): x = string.lower(name) if x in self.data: return self.data[x][0] - raise KeyError, "Key %s not found in the Row dictionary" % name + raise KeyError("Key %s not found in the Row dictionary" % name) + def get(self, name): x = string.lower(name) if x in self.data: @@ -109,7 +110,7 @@ class Row(UserDictCase): def save(self, with_updates=1): """ now save an entry """ if self.hashname not in self.data: - raise AttributeError, "Table does not have a hash `%s' key" % self.hashname + raise AttributeError("Table does not have a hash `%s' key" % self.hashname) # get a list of fields to be set items = map(lambda a: (a[0], a[1][0]), filter(lambda b: b[1][1] == 1, self.data.items())) diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index f303693..f1a7945 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -24,12 +24,13 @@ from spacewalk.common.rhnException import rhnException import sql_base import sql_lib + # A class to handle row updates transparently class RowData(UserDictCase): def __init__(self, dict, db, sql, rowid, cache=None): UserDictCase.__init__(self, dict) if not isinstance(db, sql_base.Database): - raise TypeError, "Second argument needs to be a database handle" + raise TypeError("Second argument needs to be a database handle") self.__db = db self.__sql = sql self.__rowid = rowid @@ -163,14 +164,14 @@ class Table: # primary key identifier def __setitem__(self, key, value): if not type(value) == type({}) and not isinstance(value, UserDictCase): - raise TypeError, "Expected value to be a hash" + raise TypeError("Expected value to be a hash") if self.__hashid in value: # we don't need that if key is None: key = value[self.__hashid] del value[self.__hashid] if key is None: - raise KeyError, "Can not insert entry with NULL key" + raise KeyError("Can not insert entry with NULL key") items = value.items() if items == []: # quick check for noop return commit 6083f8ca7323eadb369fe9b3342f4137476ccb41 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 18:41:03 2013 +0200 Small coding conventions diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index fc74642..d632086 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -149,12 +149,12 @@ def Sequence(seq): return sql_sequence.Sequence(db, seq) # Wrapper for the Row class -def Row(table, hash_name, hash_value = None): +def Row(table, hash_name, hash_value=None): db = __test_DB() return sql_row.Row(db, table, hash_name, hash_value) # Wrapper for the Table class -def Table(table, hash_name, local_cache = 0): +def Table(table, hash_name, local_cache=0): db = __test_DB() return sql_table.Table(db, table, hash_name, local_cache) @@ -181,7 +181,7 @@ def fetchone_dict(sql, *args, **kwargs): def commit(): db = __test_DB() return db.commit() -def rollback(name = None): +def rollback(name=None): db = __test_DB() return db.rollback(name) def transaction(name): diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 584955d..0bfa6b6 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -448,7 +448,7 @@ class Database(sql_base.Database): return self._cursor_class(dbh=self.dbh) # pass-through functions for when you want to do SQL yourself - def prepare(self, sql, force=0, blob_map = None): + def prepare(self, sql, force=0, blob_map=None): # Abuse the map calls to get rid of SQL comments and extra spaces sql = string.join(filter(lambda a: len(a), map(string.strip, @@ -500,7 +500,7 @@ class Database(sql_base.Database): log_debug(3, self.dbtxt) return self.dbh.commit() - def rollback(self, name = None): + def rollback(self, name=None): log_debug(3, self.dbtxt, name) if name: # we need to roll back to a savepoint return self.execute("rollback to savepoint %s" % name) diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index 3925848..0a56ddd 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -343,7 +343,7 @@ class Database: "set a transaction point to which we can rollback to" pass - def rollback(self, name = None): + def rollback(self, name=None): "rollback changes, optionally to a previously set transaction point" pass diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py index 4fd7d9c..cbee06b 100644 --- a/backend/server/rhnSQL/sql_row.py +++ b/backend/server/rhnSQL/sql_row.py @@ -32,7 +32,8 @@ class Row(UserDictCase): The easiest way to separate what these things are for is to remember that the Table class indexes by KEY, while the Row class indexes by column """ - def __init__(self, db, table, hashname, hashval = None): + + def __init__(self, db, table, hashname, hashval=None): UserDictCase.__init__(self) if not isinstance(db, sql_base.Database): raise rhnException("Argument db is not a database instance", db) @@ -75,7 +76,7 @@ class Row(UserDictCase): return self.data[x][0] return None - def reset(self, val = 0): + def reset(self, val=0): """ reset the changed status for these entries """ for k in self.data.keys(): # tuples do not support item assignement @@ -91,7 +92,7 @@ class Row(UserDictCase): """ load an entry """ return self.load_sql("%s = :hashval" % self.hashname, {'hashval': hashval}) - def load_sql(self, sql, pdict = {}): + def load_sql(self, sql, pdict={}): """ load from a sql clause """ h = self.db.prepare("select * from %s where %s" % (self.table, sql)) apply(h.execute, (), pdict) diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index 10b6d69..f303693 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -26,7 +26,7 @@ import sql_lib # A class to handle row updates transparently class RowData(UserDictCase): - def __init__(self, dict, db, sql, rowid, cache = None): + def __init__(self, dict, db, sql, rowid, cache=None): UserDictCase.__init__(self, dict) if not isinstance(db, sql_base.Database): raise TypeError, "Second argument needs to be a database handle" @@ -56,7 +56,7 @@ class RowData(UserDictCase): # # Some day we'll figure out how to reduce confusion... class Table: - def __init__(self, db, table, hashid, cache = 0): + def __init__(self, db, table, hashid, cache=False): if not table or not type(table) == type(""): raise rhnException("First argument needs to be a table name", table) @@ -83,7 +83,7 @@ class Table: # insert row(s) into the table def insert(self, rows): # insert a single row into the table - def insert_row(row, self = self): + def insert_row(row, self=self): if self.__cache is not None: self.__cache[row[self.__hashid]] = row return self.__setitem__(None, row) commit 08079f0d816fc8217cdd163be079c3f0ae59281f Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 18:12:26 2013 +0200 Change deprecated 'has_key' to 'in' where it was possible/I dared to do so. diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py index b1fe23f..fc74642 100644 --- a/backend/server/rhnSQL/__init__.py +++ b/backend/server/rhnSQL/__init__.py @@ -90,7 +90,7 @@ def initDB(backend=None, host=None, port=None, username=None, username = CFG.DB_USER password = CFG.DB_PASSWORD - if not SUPPORTED_BACKENDS.has_key(backend): + if backend not in SUPPORTED_BACKENDS: raise rhnException("Unsupported database backend", backend) if port: diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index a92d341..584955d 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -522,7 +522,7 @@ class Database(sql_base.Database): # an invalid pointer if we set an environment variable. # If the environment variables are already set, this will be a noop - if not os.environ.has_key("NLS_LANG"): + if "NLS_LANG" not in os.environ: value = None # Do we have a config object? if rhnConfig.CFG.is_initialized(): diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index e1ce75a..3925848 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -111,7 +111,7 @@ class Cursor: self.description = None - if not self._cursor_cache.has_key(self._dbh_id): + if self._dbh_id not in self._cursor_cache: self._cursor_cache[self._dbh_id] = {} # Store a reference to the underlying Python DB API Cursor: diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py index 9055230..4fd7d9c 100644 --- a/backend/server/rhnSQL/sql_row.py +++ b/backend/server/rhnSQL/sql_row.py @@ -62,16 +62,16 @@ class Row(UserDictCase): # and create instead. if x == self.hashname: raise AttributeError, "Can not reset the value of the hash key" - if not self.data.has_key(x) or self.data[x][0] != value: + if x not in self.data or self.data[x][0] != value: self.data[x] = (value, 1) def __getitem__(self, name): x = string.lower(name) - if self.data.has_key(x): + if x in self.data: return self.data[x][0] raise KeyError, "Key %s not found in the Row dictionary" % name def get(self, name): x = string.lower(name) - if self.data.has_key(x): + if x in self.data: return self.data[x][0] return None @@ -107,7 +107,7 @@ class Row(UserDictCase): def save(self, with_updates=1): """ now save an entry """ - if not self.data.has_key(self.hashname): + if self.hashname not in self.data: raise AttributeError, "Table does not have a hash `%s' key" % self.hashname # get a list of fields to be set items = map(lambda a: (a[0], a[1][0]), diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index 9980e98..10b6d69 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -132,7 +132,7 @@ class Table: # make this table look like a dictionary def __getitem__(self, key): - if self.__cache and self.__cache.has_key(key): + if self.__cache and key in self.__cache: return self.__cache[key] h = self.__db.prepare("select * from %s where %s = :p1" % ( self.__table, self.__hashid)) @@ -152,7 +152,7 @@ class Table: # be modified. def get(self, key): ret = self.__getitem__(key) - if self.__cache and self.__cache.has_key(key): + if self.__cache and key in self.__cache: del self.__cache[key] sql = "update %s set %%s = :new_val where %s = :row_id" % ( self.__table, self.__hashid) @@ -164,7 +164,7 @@ class Table: def __setitem__(self, key, value): if not type(value) == type({}) and not isinstance(value, UserDictCase): raise TypeError, "Expected value to be a hash" - if value.has_key(self.__hashid): # we don't need that + if self.__hashid in value: # we don't need that if key is None: key = value[self.__hashid] del value[self.__hashid] commit dc9f5258e69b92df862eee58ad44d3e7cab0516b Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 17 16:33:05 2013 +0200 Tab vs. Space War diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 0af3df6..a92d341 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -504,7 +504,7 @@ class Database(sql_base.Database): log_debug(3, self.dbtxt, name) if name: # we need to roll back to a savepoint return self.execute("rollback to savepoint %s" % name) - return self.dbh.rollback() + return self.dbh.rollback() def check_connection(self): try: diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index caa5e25..62b1057 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -117,6 +117,7 @@ class Procedure(Function): #if not (type(result) == 'tuple' and result[0] == ''): #raise rhnSQL.SQLError("Unexpected result returned by procedure %s: %s" % (self.name, str(result))) + def decimal2intfloat(dec, cursor): "Convert a Decimal to an int or a float with no loss of information." "The dec is passed in as str (not Decimal) so we cannot check its type." diff --git a/backend/server/rhnSQL/sql_sequence.py b/backend/server/rhnSQL/sql_sequence.py index 297680c..d724866 100644 --- a/backend/server/rhnSQL/sql_sequence.py +++ b/backend/server/rhnSQL/sql_sequence.py @@ -23,24 +23,24 @@ import sql_base # XXX: this is still Oracle specific, but it shouldn't be class Sequence: def __init__(self, db, seq): - if not seq or type(seq) != type(""): - raise rhnException("First argument needs to be a sequence name", seq) - self.__seq = seq + if not seq or type(seq) != type(""): + raise rhnException("First argument needs to be a sequence name", seq) + self.__seq = seq if not isinstance(db, sql_base.Database): raise rhnException("Argument db is not a database instance", db) self.__db = db def next(self): - sql = "select sequence_nextval('%s') as ID from dual" % self.__seq - cursor = self.__db.prepare(sql) - cursor.execute() - ret = cursor.fetchone_dict() - if ret is None: # how the hell can this happen? - return ret - return int(ret['id']) + sql = "select sequence_nextval('%s') as ID from dual" % self.__seq + cursor = self.__db.prepare(sql) + cursor.execute() + ret = cursor.fetchone_dict() + if ret is None: # how the hell can this happen? + return ret + return int(ret['id']) def __call__(self): - return self.next() + return self.next() def __del__(self): self.__seq = self.__db = None diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py index ca7cbce..9980e98 100644 --- a/backend/server/rhnSQL/sql_table.py +++ b/backend/server/rhnSQL/sql_table.py @@ -92,7 +92,7 @@ class Table: if type(rows) == type([]): for x in rows: insert_row(x) - return None + return None raise rhnException("Invalid data %s passed" % type(rows), rows) # select from the whole table all the entries that match the @@ -102,7 +102,7 @@ class Table: raise rhnException("Expecting hash argument. %s is invalid" % type(row), row) if row == {}: - raise rhnException("The hash argument is empty", row) + raise rhnException("The hash argument is empty", row) keys = row.keys() # Sort the list of keys, to always get the same list of arguments keys.sort() @@ -113,10 +113,10 @@ class Table: else: clause = "%s = :%s" % (col, col) args.append(clause) - sql = "select * from %s where " % self.__table - cursor = self.__db.prepare(sql + string.join(args, " and ")) - apply(cursor.execute, (), row) - rows = cursor.fetchall_dict() + sql = "select * from %s where " % self.__table + cursor = self.__db.prepare(sql + string.join(args, " and ")) + apply(cursor.execute, (), row) + rows = cursor.fetchall_dict() if rows is None: return None # fill up the cache @@ -133,14 +133,14 @@ class Table: # make this table look like a dictionary def __getitem__(self, key): if self.__cache and self.__cache.has_key(key): - return self.__cache[key] + return self.__cache[key] h = self.__db.prepare("select * from %s where %s = :p1" % ( self.__table, self.__hashid)) h.execute(p1=key) ret = h.fetchone_dict() if ret is None: - if self.__cache is not None: - self.__cache[key] = None + if self.__cache is not None: + self.__cache[key] = None return None xret = UserDictCase(ret) if self.__cache is not None: @@ -153,7 +153,7 @@ class Table: def get(self, key): ret = self.__getitem__(key) if self.__cache and self.__cache.has_key(key): - del self.__cache[key] + del self.__cache[key] sql = "update %s set %%s = :new_val where %s = :row_id" % ( self.__table, self.__hashid) return RowData(ret, self.__db, sql, key, self.__cache) @@ -174,7 +174,7 @@ class Table: items = value.items() if items == []: # quick check for noop return - sql = None + sql = None if self.has_key(key): sql, pdict = sql_lib.build_sql_update(self.__table, self.__hashid, items) else: @@ -183,11 +183,11 @@ class Table: pdict["p0"] = key h = self.__db.prepare(sql) apply(h.execute, (), pdict) - try: - value[self.__hashid] = key - self.__cache[key] = value - except: - pass + try: + value[self.__hashid] = key + self.__cache[key] = value + except: + pass # length def __len__(self): @@ -203,8 +203,8 @@ class Table: h = self.__db.prepare("delete from %s where %s = :p1" % ( self.__table, self.__hashid)) h.execute(p1=key) - try: del self.__cache[key] - except: pass + try: del self.__cache[key] + except: pass return 0 # get all keys @@ -247,9 +247,9 @@ class Table: return self.__db.commit() # passthrough rollback def rollback(self): - self.flush() + self.flush() return self.__db.rollback() def printcache(self): - print self.__cache + print self.__cache return

1 0

Branch 'bootstrap-css' - 29 commits - branding/css branding/fonts java/code
by Silvio Moioli 29 Oct '13

29 Oct '13

branding/css/responsive-rules.less | 63 branding/css/spacewalk.less | 218 - branding/css/tables.less | 5 branding/css/theme.less | 187 + branding/css/variables.less | 9 branding/fonts/font-awesome/css/font-awesome-ie7.css | 1203 ---------- branding/fonts/font-awesome/css/font-awesome-ie7.min.css | 384 --- branding/fonts/font-awesome/css/font-awesome.css | 1116 ++++----- branding/fonts/font-awesome/css/font-awesome.min.css | 798 +++--- branding/fonts/font-awesome/font/fontawesome-webfont.svg | 399 --- branding/fonts/font-awesome/fonts/FontAwesome.otf |binary branding/fonts/font-awesome/fonts/fontawesome-webfont.eot |binary branding/fonts/font-awesome/fonts/fontawesome-webfont.svg | 414 +++ branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf |binary branding/fonts/font-awesome/fonts/fontawesome-webfont.woff |binary dev/null |binary java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 17 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 16 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 7 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 21 java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 26 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 5 java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java | 16 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 1 java/code/webapp/WEB-INF/includes/header.jsp | 10 java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 6 java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 10 java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 6 java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 24 java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 26 java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 105 java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 117 java/code/webapp/WEB-INF/pages/activationkeys/create.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 36 java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 2 java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 2 java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4 java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 10 java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 2 java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 5 java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 7 java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 2 java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 4 java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 4 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 4 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 51 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 50 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf | 33 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 203 - java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 6 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 4 java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 2 java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 6 java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2 java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2 java/code/webapp/WEB-INF/pages/audit/overview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 4 java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp | 2 java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 29 java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 4 java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 4 java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 6 java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 10 java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 10 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 320 +- java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf | 77 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf | 64 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 3 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 24 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 20 java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp | 32 java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 32 java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp | 32 java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 14 java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/credentials/delete.jsp | 4 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/errata/delete.jsp | 2 java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 java/code/webapp/WEB-INF/pages/errata/notify.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 2 java/code/webapp/WEB-INF/pages/groups/create.jsp | 4 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 4 java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keycreate.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 12 java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/delete.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/details.jsp | 2 java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 563 ++-- java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 4 java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 4 java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 4 java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 6 java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 12 java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 7 java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 106 java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 5 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 4 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 2 java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4 java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 4 java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 6 java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 12 java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 164 - java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 919 ++++--- java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp | 58 java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 10 java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 713 +++-- java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 8 java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp | 148 - java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 6 java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 2 java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp | 6 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 292 +- java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 2 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 116 350 files changed, 4394 insertions(+), 5747 deletions(-) New commits: commit 4b0e9e79b68d398e2dc2df0be64f0e2fd2714c6d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 29 15:51:57 2013 +0100 Remove self-closing paragraphs. Not valid in html5. Remove self closing anchors. Replace them with closed anchors. diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp index c466791..01924fc 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -20,7 +20,7 @@ <bean:message key="softwareentitlements.description"/> -<p/> + <c:choose> <c:when test = "${orgCount > 1}"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp index 1830b01..0a3e437 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -146,7 +146,7 @@ </th> <td> ${maxMem} - <p/> + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </span> </td> @@ -181,7 +181,7 @@ </th> <td> ${maxFlex} - <p/> + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp index ee4bbc6..0a3931e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp @@ -17,7 +17,7 @@ imgAlt="users.jsp.imgAlt"> </rhn:toolbar> <bean:message key="sys_entitlements.description"/> -<p/> + <c:choose> <c:when test = "${orgCount > 1}"> @@ -75,7 +75,7 @@ imgAlt="users.jsp.imgAlt"> </rl:list> </rl:listset> -<p/> + <rhn:tooltip typeKey="Tip">*-<bean:message key = "sys_entitlements.tip"/></rhn:tooltip> <rhn:tooltip typeKey="Tip">**-<bean:message key = "Used/Allotted.tip"/></rhn:tooltip> </body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp index e72c5d9..f4d6920 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp @@ -23,7 +23,7 @@ <bean:message key="system_entitlement_details.access_grant_desc.${name}"/> -<p/> + </body> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index 88282b0..a72b559 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -43,7 +43,7 @@ </label> </c:forEach> <c:if test="${orgAdmin}"> - <p/> + <bean:message key="userdetails.jsp.grantedByOrgAdmin"/> </c:if> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp index 969856b..08cbb85 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp @@ -13,7 +13,7 @@ </h2> <div class="page-summary"><bean:message key="ssmchildsubs.jsp.summary"/></div> - <p /> + <rl:listset name="channellist"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp index f1cb895..302cf24 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp @@ -29,7 +29,7 @@ <c:if test="${foundUnmatchedChannels}"> <h3><bean:message key="basesub.jsp.confirm.unmatchedHeader"/></h3> - <bean:message key="basesub.jsp.confirm.unmatchedDescription"/> *<p/> + <bean:message key="basesub.jsp.confirm.unmatchedDescription"/> * <rl:listset name="unmatchedChannelSet"> <rhn:csrf /> @@ -82,7 +82,7 @@ <h3><bean:message key="basesub.jsp.confirm.matchedHeader"/></h3> - <bean:message key="basesub.jsp.confirm.matchedDescription"/><p/> + <bean:message key="basesub.jsp.confirm.matchedDescription"/> <rl:listset name="matchedChannelSet"> <rl:list dataset="matched_child_channels" @@ -131,7 +131,7 @@ </rl:list> </rl:listset> - <p/> + <html:form method="post" action="/channel/ssm/BaseChannelSubscribe.do"> <div class="text-right"> @@ -151,7 +151,7 @@ </div> </html:form> - <p/> + <span class="small-text"><bean:message key="basesub.jsp.confirm.fasTrackBetaNote"/></span> </body> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf index 0470f42..27e4a79 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf @@ -8,13 +8,13 @@ <c:when test="${revision.configContent.binary}"> <strong><bean:message key="filedetails.contents.jspf.binary-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.binary-edit" /> - <p /> + <bean:message key="filedetails.contents.jspf.binary-canupload"/> </c:when> <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-edit" arg0="${requestScope.maxEditBytes}"/> - <p /> + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" @@ -37,7 +37,7 @@ <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-display" arg0="${requestScope.maxbytes}"/> - <p /> + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf index 3bd9028..6b422cb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf @@ -13,7 +13,7 @@ arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" arg2="${beanarg}" /> -<p /> + <html:form action="/configuration/file/GlobalRevisionDeploySubmit.do?ccid=${ccid}&cfid=${cfid}&crid=${crid}"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp index 4a8601c..3c293d9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp @@ -15,7 +15,7 @@ <h2><bean:message key="channelfiles.jsp.header2" /></h2> <bean:message key="channelfiles.jsp.description"/> -<p /> + <div> <html:form action="/configuration/ChannelFilesSubmit.do?ccid=${ccid}"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp index f57c82b..b00062b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp @@ -14,7 +14,7 @@ <h2><bean:message key="deploy.jsp.h2" /></h2> <bean:message key="deploy.jsp.description"/> -<p /> + <html:form action="/configuration/channel/ChooseFilesSubmit.do?ccid=${ccid}"> <rhn:csrf /> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 4299c91..7028694 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -19,7 +19,7 @@ <h2><bean:message key="deployconfirm.jsp.h2" /></h2> <bean:message key="deployconfirm.jsp.note" /> -<p /> + <c:set var="channel_name_display"><cfg:channel id="${ccid}" name="${channel.name}" type="global"/></c:set> @@ -52,8 +52,8 @@ </rl:column> </rl:list> </div> - <p /> - <p /> + + <h2><bean:message key="deployconfirm.jsp.systems-header2" /></h2>  <div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp index 86cb659..40ef740 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp @@ -10,10 +10,10 @@ file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> <div class="importfragment"> -<a name="import"/> +<a name="import"></a> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/import.jspf" %> </div> -<p /> + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index d7d20c0..237f162 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -11,7 +11,7 @@ <h2><bean:message key="deletefile.jsp.header2" /></h2> <bean:message key="deletefile.jsp.info" /> -<p /> + <html:form action="/configuration/file/DeleteFile.do?cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index 37f8f2e..d2311ba 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -13,7 +13,7 @@ <h2><bean:message key="deleterev.jsp.header2" /></h2> <bean:message key="deleterev.jsp.info" arg0="${channel.displayName}" arg1="/rhn/configuration/ChannelOverview.do?ccid=${ccid}"/> -<p /> + <html:form action="/configuration/file/DeleteRevision.do?crid=${crid}&cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp index faacd5a..cd1efa4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp @@ -25,7 +25,7 @@ <bean:message key="deploy.jsp.sandbox-note1" arg1="/rhn/systems/details/Overview.do?sid=${sid}" arg0="${system}"/> - <p /> + <c:set var="copyname" scope="request"> <bean:message key="copycentral.jsp.copy" /> </c:set> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 49b1167..43ee18c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -16,7 +16,7 @@ arg2="${channel.displayName}" arg3="/rhn/configuration/ChannelOverview.do?ccid=${ccid}" /> </c:if> -<p /> + <html:form action="/configuration/file/GlobalRevisionDeployConfirmSubmit.do?cfid=${cfid}&crid=${crid}"> <rhn:csrf /> @@ -31,7 +31,7 @@ </rhn:column> </rhn:listdisplay> </rhn:list> - <p /> + <c:if test="${not empty requestScope.pageList}"> <div> <bean:message key="deploy.jsp.widgetsummary" /></p> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index 358be7c..635c648 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -48,7 +48,7 @@ <rhn:require acl="is_file();config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> -<a name="upload" /> +<a name="upload"></a> <h2><bean:message key="manage.jsp.upload"/></h2> <p> <bean:message key="manage.jsp.uploadsummary" arg0="${max_size}"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index c4b15f2..453a3a1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -34,7 +34,7 @@ function setStep(stepName) { <c:if test="${requestScope.isVirtualGuest == 'true'}"> <div class="page-summary"> - <bean:message key="kickstart.schedule.cannot.provision.guest"/><p/> + <bean:message key="kickstart.schedule.cannot.provision.guest"/> <c:if test="${requestScope.virtHostIsRegistered == 'true'}"> <bean:message key="kickstart.schedule.visit.host.virt.tab" arg0="${requestScope.hostSid}"/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp index 65edd96..3404dd9 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp @@ -102,7 +102,7 @@ <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> <jsp:param name="widget" value="date"/> - </jsp:include><br/><p/> + </jsp:include><br/> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index 12aa9ee..55dde4d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -109,7 +109,7 @@ <div class="page-summary"> <p> <bean:message key="sdc.channels.edit.summary2"/> - <p/> + <select name="new_base_channel_id" size="${fn:length(base_channels)+fn:length(custom_base_channels)+3}"> <option value="-1" <c:if test="${current_base_channel_id == -1}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 4f5f3c0..71ed4dc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -11,7 +11,7 @@ <bean:message key="sdc.channels.confirmNewBase.header.confirm"/> </h2> - <bean:message key="sdc.channels.confirmNewBase.currentlySubscribedTo"/><p/> + <bean:message key="sdc.channels.confirmNewBase.currentlySubscribedTo"/> <c:choose> <c:when test="${current_base_channel == null}"> <strong><bean:message key="sdc.channels.confirmNewBase.noBaseChannel"/></strong> @@ -28,9 +28,9 @@ </ul> </c:otherwise> </c:choose> - <p/> + - <bean:message key="sdc.channels.confirmNewBase.toBeSubscribedTo"/><p/> + <bean:message key="sdc.channels.confirmNewBase.toBeSubscribedTo"/> <c:choose> <c:when test="${new_base_channel == null}"> <strong><bean:message key="sdc.channels.confirmNewBase.noBaseChannel"/></strong> @@ -44,10 +44,10 @@ </ul> </c:otherwise> </c:choose> - <p/> + <bean:message key="sdc.channels.confirmNewBase.otherChannelsWarning"/> - <p/> <p/> +   <span class="small-text"> <bean:message key="sdc.channels.confirmNewBase.fasTrackBetaNote"/> commit 035e5d427c4fcea9b60de440c1d065a88fec4069 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 29 15:23:25 2013 +0100 hidden element does not exist diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp index 996817c..d24ef09 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp @@ -62,7 +62,7 @@ <html:hidden property="submitted" value="true"/> <div class="text-right"><hr> <input type="submit" name="schedule_remote_command" value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> - <hidden name="use_date" value="true" /> + <input type="hidden" name="use_date" value="true" /> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp index eace722..cb0dedd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp @@ -84,9 +84,9 @@ </button> </div> </div> - <hidden name="sid" value="${system.id}" /> - <hidden name="submitted" value="true" /> - <hidden name="use_date" value="true" /> + <input type="hidden" name="sid" value="${system.id}" /> + <input type="hidden" name="submitted" value="true" /> + <input type="hidden" name="use_date" value="true" /> </form> </div> </div> commit ecb038c665ada9c2ff2b7992d454edc8379b5048 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 29 14:41:08 2013 +0100 TB3: Admin/Subsriptions/Entitlements/Organizations layout diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index c1985d7..0d58d185a2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -3,115 +3,118 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> - -<html:html xhtml="true"> +<html:html> <head> - -<script type="text/javascript" language="JavaScript"> + <script type="text/javascript" language="JavaScript"> function setOrgClicked(target) { document.forms[0].orgClicked.value=target; alert(target); }; -</script> + </script> </head> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" - miscUrl="${url}" - miscAcl="user_role(org_admin)" - miscText="${text}" - miscImg="${img}" - miscAlt="${text}" -imgAlt="users.jsp.imgAlt"> -<c:out value="${entname}"/> -</rhn:toolbar> - -<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/systemEntitlementOrgs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="entitlementorgs.miniheader"/></h2> -<bean:message key="entitlementorgs.description" arg0="${enthuman}"/> -<p/> - -<rl:listset name="entitlementSet"> - <rhn:csrf /> -  - <html:hidden property="submitted" value="true"/> - <html:hidden property="orgClicked" value="0"/> - - <rl:list dataset="pageList" - width="100%" - name="pageList" - filter="com.redhat.rhn.frontend.action.multiorg.SystemEntitlementOrgsFilter" - styleclass="list" - emptykey="sys_entitlements.noentorgs"> - <rl:column bound="false" - sortable="false" - headerkey="entitlementorgs.orgname"> + <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" + miscUrl="${url}" + miscAcl="user_role(org_admin)" + miscText="${text}" + miscImg="${img}" + miscAlt="${text}" + imgAlt="users.jsp.imgAlt"> + <c:out value="${entname}"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/systemEntitlementOrgs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="entitlementorgs.miniheader"/></h2> + <p><bean:message key="entitlementorgs.description" arg0="${enthuman}"/></p> + <rl:listset name="entitlementSet"> + <rhn:csrf /> +  + <html:hidden property="submitted" value="true"/> + <html:hidden property="orgClicked" value="0"/> + <rl:list dataset="pageList" + width="100%" + name="pageList" + filter="com.redhat.rhn.frontend.action.multiorg.SystemEntitlementOrgsFilter" + styleclass="list" + emptykey="sys_entitlements.noentorgs"> + <rl:column bound="false" + sortable="false" + headerkey="entitlementorgs.orgname"> - <a href="/rhn/admin/multiorg/OrgDetails.do?oid=${current.orgid}">${current.name}</a> - </rl:column> - <rl:column bound="false" - sortable="false" - headerkey="entitlementorgs.total"> - ${current.total} - </rl:column> - <rl:column bound="false" - sortable="false" - headerkey="entitlementorgs.used"> - ${current.usage} - </rl:column> - <rl:column bound="false" - sortable="false" - headerkey="entitlementorgs.proposed_total"> - <html:text property="newCount_${current.orgid}" size="5" value="${current.total}" - onkeydown="return blockEnter(event)" /> - <html:submit onclick="this.form.orgClicked.value = '${current.orgid}'"> <bean:message key="entitlementorgs.update"/> - </html:submit> - <br><span class="small-text"><bean:message key="entitlementorgs.jsp.possible_vals" arg0="${current.upper}"/></span> - </rl:column> - </rl:list> -</rl:listset> - -<span class="small-text"> - <bean:message key="entitlementorgs.tip"/> -</span> - -<h2><bean:message key="entitlementorgs.usage"/></h2> - -<table class="details"> - <tr> - <th> - <b><bean:message key="entitlementorgs.total_allocated"/>:</ -b> - </th> - <td> - ${maxEnt} - <p/> - <div class="small-text"> - <bean:message key="entitlementorgs.tip_allocated"/> + <a href="/rhn/admin/multiorg/OrgDetails.do?oid=${current.orgid}">${current.name}</a> + </rl:column> + <rl:column bound="false" + sortable="false" + headerkey="entitlementorgs.total"> + ${current.total} + </rl:column> + <rl:column bound="false" + sortable="false" + headerkey="entitlementorgs.used"> + ${current.usage} + </rl:column> + <rl:column bound="false" + sortable="false" + headerkey="entitlementorgs.proposed_total"> + <div class="row"> + <div class="col-lg-1"> + <div class="input-group"> + <span class="input-group-btn"> + <html:text property="newCount_${current.orgid}" size="5" value="${current.total}" + styleClass="form-control" + onkeydown="return blockEnter(event)" /> + <html:submit styleClass="btn btn-info" onclick="this.form.orgClicked.value = '${current.orgid}'"> + <bean:message key="entitlementorgs.update"/> + </html:submit> + </span> + </div> + </div> + </div> + <span class="help-block"> + <bean:message key="entitlementorgs.jsp.possible_vals" arg0="${current.upper}"/> + </span> + </rl:column> + </rl:list> + </rl:listset> + <span class="help-block"> + <bean:message key="entitlementorgs.tip"/> + </span> + <h2><bean:message key="entitlementorgs.usage"/></h2> + <div class="form-horizontal"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="entitlementorgs.total_allocated"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + ${maxEnt} + </div> + <span class="help-block"> + <bean:message key="entitlementorgs.tip_allocated"/> + </span> </div> - </td> - </tr> - <tr> - <th> - <b><bean:message key="entitlementorgs.total_inuse"/>:</b> - </th> - <td> - ${curEnt} - <p/> - </td> - </tr> - <tr> - <th> - <b><bean:message key="entitlementorgs.total_orguse"/>:</b> - </th> - <td> - <bean:message key="entitlementorgs.total_orgusedata" - arg0="${alloc}" arg1="${orgsnum}" arg2="${ratio}"/> - <p/> - </td> - </tr> -</table> - + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="entitlementorgs.total_inuse"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + ${curEnt} + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="entitlementorgs.total_orguse"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <bean:message key="entitlementorgs.total_orgusedata" + arg0="${alloc}" arg1="${orgsnum}" arg2="${ratio}"/> + </div> + </div> + </div> + </div> </body> </html:html> commit 5750c88419b26649bc277cd8f30041485f4909d2 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 29 14:34:34 2013 +0100 Javascript added to recognize if a panel is dissabled and hidden by the user diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index a893911..9940c83 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -32,6 +32,22 @@ <c:if test="${requestScope.systemGroupsWidget == 'y'}"> <script type="text/javascript" src="/rhn/dwr/interface/SystemGroupsRenderer.js"></script> </c:if> +<script type="text/javascript"> + $(document).on("ready", function() { + //for each div with class row + $(".row-0").each(function() { + //we count the number of childrens with class col-md-6 + var numberOfChildrenCol6 = $(this).children(".col-md-6").length; + //and we count the number of children with class different than col-md-6 + var numberOfChildrenDifferent = $(this).children().not('.col-md-6').length; + //if the number of childrens different to col-md-6 is Cero and the row has only 1 col-md-6 (which takes only 50% of the space) + if (numberOfChildrenDifferent == 0 && numberOfChildrenCol6 == 1) { + //we remove the class col-md-6 and change it for col-md-12, which will take a width of 100%. + $(this).children(".col-md-6").removeClass('col-md-6').addClass('col-md-12'); + } + }); + }); +</script> </head> <body> <rhn:toolbar base="h1" icon="fa-tachometer" imgAlt="yourrhn.jsp.toolbar.img.alt" @@ -45,25 +61,24 @@ <c:choose> <c:when test="${requestScope.anyListsSelected == 'true'}"> - <c:if test="${requestScope.tasks == 'y'}"> - <div class="half-table half-table-left" id="tasks-pane" > - <script type="text/javascript"> - TasksRenderer.renderAsync(makeAjaxCallback('tasks-pane', false)); - </script> - </div> - </c:if> - <c:if test="${requestScope.inactiveSystems == 'y'}"> - <div class="half-table half-table-right" id="inactive-systems-pane" > - <script type="text/javascript"> - InactiveSystemsRenderer.renderAsync(makeAjaxCallback("inactive-systems-pane", false)); - </script> - </div> - </c:if> - + <div class="row-0"> + <c:if test="${requestScope.tasks == 'y'}"> + <div class="col-md-6" id="tasks-pane" > + <script type="text/javascript"> + TasksRenderer.renderAsync(makeAjaxCallback('tasks-pane', false)); + </script> + </div> + </c:if> + <c:if test="${requestScope.inactiveSystems == 'y'}"> + <div class="col-md-6" id="inactive-systems-pane" > + <script type="text/javascript"> + InactiveSystemsRenderer.renderAsync(makeAjaxCallback("inactive-systems-pane", false)); + </script> + </div> + </c:if> + </div> <c:if test="${requestScope.criticalSystems == 'y'}"> - <div style="clear: both; padding-top: 10px;"> - <div id="critical-systems-pane" > - + <div id="critical-systems-pane" class="row"> <script type="text/javascript"> CriticalSystemsRenderer.renderAsync(makeAjaxCallback("critical-systems-pane", false)); </script> @@ -71,7 +86,7 @@ </c:if> <c:if test="${requestScope.criticalProbes == 'y'}"> - <div id="critical-probes-pane" > + <div id="critical-probes-pane" class="row"> <script type="text/javascript"> CriticalProbesRenderer.renderAsync(makeAjaxCallback("critical-probes-pane", false)); </script> @@ -79,43 +94,40 @@ </c:if> <c:if test="${requestScope.warningProbes == 'y'}"> - <div id="warning-probes-pane" > + <div id="warning-probes-pane" class="row"> <script type="text/javascript"> WarningProbesRenderer.renderAsync(makeAjaxCallback("warning-probes-pane", false)); </script> </div> </c:if> - - <div style="clear: both;"> - <c:if test="${requestScope.pendingActions =='y'}"> - <div id="pending-actions-pane" class="full-width-wrapper"> - <script type="text/javascript"> - PendingActionsRenderer.renderAsync(makeAjaxCallback("pending-actions-pane", false)); - </script> - </div> - </c:if> - <c:if test="${requestScope.latestErrata == 'y'}"> - <div id="latest-errata-pane" class="full-width-wrapper"> - <script type="text/javascript"> - LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); - </script> - </div> - </c:if> - <c:if test="${requestScope.systemGroupsWidget == 'y'}"> - <div id="systems-groups-pane" class="full-width-wrapper"> - <script type="text/javascript"> - SystemGroupsRenderer.renderAsync(makeAjaxCallback("systems-groups-pane", false)); - </script> - </div> - </c:if> - <c:if test="${requestScope.recentlyRegisteredSystems == 'y'}"> - <div id="recently-registered-pane" class="full-width-wrapper"> - <script> - RecentSystemsRenderer.renderAsync(makeAjaxCallback("recently-registered-pane", false)); - </script> - </div> - </c:if> - </div> + <c:if test="${requestScope.pendingActions =='y'}"> + <div id="pending-actions-pane" class="row"> + <script type="text/javascript"> + PendingActionsRenderer.renderAsync(makeAjaxCallback("pending-actions-pane", false)); + </script> + </div> + </c:if> + <c:if test="${requestScope.latestErrata == 'y'}"> + <div id="latest-errata-pane" class="row"> + <script type="text/javascript"> + LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); + </script> + </div> + </c:if> + <c:if test="${requestScope.systemGroupsWidget == 'y'}"> + <div id="systems-groups-pane" class="row"> + <script type="text/javascript"> + SystemGroupsRenderer.renderAsync(makeAjaxCallback("systems-groups-pane", false)); + </script> + </div> + </c:if> + <c:if test="${requestScope.recentlyRegisteredSystems == 'y'}"> + <div id="recently-registered-pane" class="row"> + <script> + RecentSystemsRenderer.renderAsync(makeAjaxCallback("recently-registered-pane", false)); + </script> + </div> + </c:if> </c:when> <c:otherwise> commit 578673fe12a2df7c04154861708d7154a4cd05c3 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 29 14:33:53 2013 +0100 Javascript added to recognize if a panel is dissabled and hidden by the user diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 44bff1e..28f048c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -46,17 +46,15 @@ </rl:column> </rl:list> - - <span class="pull-left text-right"> - ${paginationMessage} - </span> - - <span class="pull-right text-right"> - <a href="/rhn/systems/OutOfDate.do"> - <bean:message key="yourrhn.jsp.allcriticalsystems" /> - </a> - </span> + <div class="row"> + <div class="col-md-6 text-left"> + ${paginationMessage} + </div> + <div class="col-md-6 text-right"> + <a href="/rhn/systems/OutOfDate.do"> + <bean:message key="yourrhn.jsp.allcriticalsystems" /> + </a> + </div> + <hr/> + </div> </rl:listset> - - - commit 741ceb45aed2fb43928768d3a5d93ee2b41cb0ce Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 29 14:33:16 2013 +0100 icon Help name modified to apply with the new fontawesome 4 names diff --git a/branding/css/theme.less b/branding/css/theme.less index 30f32d8..a40fcbf 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -163,15 +163,15 @@ aside .nav > li > a { } /* question symbol for help pop up*/ -h1 .icon-stack .icon-question { +h1 .fa-stack .fa-question { font-size: .6em; } -h1 .icon-stack { +h1 .fa-stack { width: 1em; height: 1em; line-height: .7em; } -.icon-stack .icon-stack-base.icon-circle { +.fa-stack .fa-circle { font-size: .7em; color: @spacewalk-blue; } commit 8dca5ab03274df1272487a8ed967e1a2e168f609 Author: Maximilian Meister <mmeister(a)suse.de> Date: Tue Oct 29 13:12:05 2013 +0100 Adding the rhn:toolbar icons. diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp index 9e04ddb..a1fff22 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html> <body> - <rhn:toolbar base="h1" icon="icon-key" + <rhn:toolbar base="h1" icon="fa-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" > diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp index 45807a4..4bb8647 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html> <body> - <rhn:toolbar base="h1" icon="icon-key" + <rhn:toolbar base="h1" icon="fa-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" > diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 5fb8e23..9062b4c 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -9,7 +9,7 @@ <meta name="name" value="activationkeys.jsp.header" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-key" +<rhn:toolbar base="h1" icon="fa-key" imgAlt="activation-keys.common.alt" creationUrl="/rhn/activationkeys/Create.do" creationType="activationkeys" diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp index 0a5d80d..42a397e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-user" +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> <bean:message key="Addresses" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index 642d153..e08fce7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-dashboard"> +<rhn:toolbar base="h1" icon="fa-tachometer"> <bean:message key="bunch.edit.jsp.toolbar" arg0="${label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp index 3bc27e7..2b13f9d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="bootstrap.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="bootstrap.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp index c022893..d4eca02 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="certificate.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="certificate.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index 9239b59..fda62ec 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="cobbler.jsp.toolbar"/> </rhn:toolbar> <p> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp index ecc9212..9c4a08a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="general.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="general.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp index b980e85..ba87799 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp @@ -5,7 +5,7 @@ <html> <body> - <rhn:toolbar base="h1" icon="icon-cog" + <rhn:toolbar base="h1" icon="fa-cog" helpUrl=""> <bean:message key="generalconfig.jsp.header1"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index ed06f73..c5f3584 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="general.jsp.org.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index 8ecfc7c..d62e5bf 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -11,7 +11,7 @@ </c:if> </head> <body <c:if test="${requestScope.restart == 'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if> > - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="restart.jsp.toolbar"/> </rhn:toolbar> <p> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp index 7cc8a30..03308f8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp @@ -5,7 +5,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt"> <bean:message key="disableself.jsp.account_deactivation" /> </rhn:toolbar> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp index 5cb403c..97545f9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp @@ -5,7 +5,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-user"> +<rhn:toolbar base="h1" icon="fa-user"> <bean:message key="disableselfconfirm.jsp.warning_question" /> </rhn:toolbar> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp index d44d236..cbcf9e2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign"> + <rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="iss.confirmmasterremove.jsp.toolbar" /> </rhn:toolbar> <p><bean:message key="iss.confirmmasterremove.jsp.areyousure" /></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index 463bb8c..22da2b4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign"> + <rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="iss.confirmslaveremove.jsp.toolbar" /> </rhn:toolbar> <p><bean:message key="iss.confirmslaveremove.jsp.areyousure" /></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp index a104ba8..6030b29 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp @@ -7,14 +7,14 @@ <body> <c:choose> <c:when test="${requestScope.id > 0}"> - <rhn:toolbar base="h1" icon="icon-info-sign" + <rhn:toolbar base="h1" icon="fa-info-circle" deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}" deletionType="master" deletionAcl="user_role(satellite_admin)"> <bean:message key="iss.editmaster.jsp.toolbar" /> </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-info-sign"> + <rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="iss.editmaster.jsp.toolbar" /> </rhn:toolbar> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp index b8fbe1f..c1b19a1 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp @@ -7,14 +7,14 @@ <body> <c:choose> <c:when test="${requestScope.sid > 0}"> - <rhn:toolbar base="h1" icon="icon-info-sign" + <rhn:toolbar base="h1" icon="fa-info-circle" deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}" deletionType="slave" deletionAcl="user_role(satellite_admin)"> <bean:message key="iss.editslave.jsp.toolbar" /> </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-info-sign"> + <rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="iss.editslave.jsp.toolbar" /> </rhn:toolbar> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index a9d0368..e59ec9a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -6,7 +6,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" + <rhn:toolbar base="h1" icon="fa-info-circle" creationUrl="/rhn/admin/iss/EditSlave.do" creationType="slave" creationAcl="user_role(satellite_admin)"> <bean:message key="iss.master.jsp.toolbar" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index bdc2fbd..e0bccb4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" + <rhn:toolbar base="h1" icon="fa-info-circle" creationUrl="/rhn/admin/iss/EditMaster.do" creationType="master" creationAcl="user_role(satellite_admin)"> <bean:message key="iss.slave.jsp.toolbar" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp index 62005e5..abf7060 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign"> +<rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="methods.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp index ab7df8c..22bb3e3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-cog" + <rhn:toolbar base="h1" icon="fa-cog" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probe-create.jsp.header1" arg0="${probeSuite.suiteName}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp index aaf183c..a41f3aa 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp @@ -20,7 +20,7 @@ } //--> </script> - <rhn:toolbar base="h1" icon="icon-cog" + <rhn:toolbar base="h1" icon="fa-cog" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probe-edit.jsp.header1" arg0="${probe.description}" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp index 470537d..67c7076 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp @@ -9,7 +9,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-cog" +<rhn:toolbar base="h1" icon="fa-cog" creationUrl="ProbeSuiteProbeCreate.do?suite_id=${suite_id}" creationType="probe" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp index d5635c3..6b80952 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp @@ -18,7 +18,7 @@ function modifyUploadCheckbox(checkbox) { <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -32,7 +32,7 @@ function modifyUploadCheckbox(checkbox) { </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp index ba706b8..d4d60ef 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-group"> +<rhn:toolbar base="h1" icon="fa-group"> <bean:message key="orgdelete.jsp.header1" arg0="${orgName}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp index b3b6de5..0e00ef2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp index 6877ff3..23c24a4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" creationUrl="/rhn/admin/multiorg/OrgCreate.do" creationType="org"> <bean:message key="organizations.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp index bbbcf1d..c3261f7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index ad53c34..4898f7f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp index fd8b4dc..a3c085b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp @@ -9,7 +9,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -23,7 +23,7 @@ </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-group" + <rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp index a18e2b2..e395f58 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp @@ -7,7 +7,7 @@ <body> <rhn:toolbar base="h1" - icon="icon-group" + icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp index 79eaf6b..540e780 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" - icon="icon-group" + icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp index 270a8ea..f177f47 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-group" +<rhn:toolbar base="h1" icon="fa-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp index c2e729350..e72c5d9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp @@ -7,7 +7,7 @@ <head> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" +<rhn:toolbar base="h1" icon="fa-desktop" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp index 951ffdb..f677567 100644 --- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-dashboard" +<rhn:toolbar base="h1" icon="fa-tachometer" imgAlt="channels.overview.toolbar.imgAlt" creationUrl="/rhn/admin/ScheduleDetail.do" creationType="schedule" diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp index 348788b..38f0641 100644 --- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-dashboard" +<rhn:toolbar base="h1" icon="fa-tachometer" helpUrl=""> <bean:message key="task.status.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp index 2d22e62..ca5d81d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp index 47ab352..631d2f7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt"> <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 65bda1f..7e0593b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-deactivated" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp index 4e44372..d6bdde5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt"> <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index a75a022..2a0d1b7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -10,7 +10,7 @@ <meta name="name" value="Users" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-user" +<rhn:toolbar base="h1" icon="fa-user" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp"> <bean:message key="userconfirm.jsp.header" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp index eb4fb8a..0eeecc9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-all" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 7cec460..21ad63d 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" +<rhn:toolbar base="h1" icon="fa-desktop" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="auditsearch.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp index a808c5e..1ef92f5 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp @@ -15,7 +15,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="auditsearch.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp index ffcd114..6dbcedb 100644 --- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp @@ -13,7 +13,7 @@ <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt"> +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="audit.jsp.alt"> <bean:message key="system.audit.listscap.jsp.overview"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp b/java/code/webapp/WEB-INF/pages/audit/machine.jsp index f7ce1cb..61d53cd 100644 --- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="audit.overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp b/java/code/webapp/WEB-INF/pages/audit/overview.jsp index d581c8b..d5e54a7 100644 --- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="audit.overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp index 2608214..f690af8 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp @@ -10,7 +10,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-search"> +<rhn:toolbar base="h1" icon="fa-search"> <bean:message key="scapdiff.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp index 1a33f68..1e57a6a 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp @@ -21,7 +21,7 @@ div.differs { </head> <body> -<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="fa-search" imgAlt="search.alt.img"> <bean:message key="scapdiff.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index f55def8..0f30ae9 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -23,7 +23,7 @@ <body> -<rhn:toolbar base="h1" icon="icon-search"> +<rhn:toolbar base="h1" icon="fa-search"> <bean:message key="scapsearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp index ca16caa..4ed3d6d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <c:out value="${requestScope.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp index 292d06d..e546e26 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp @@ -7,13 +7,13 @@ <body> <c:choose> <c:when test = "${not empty requestScope.create_mode}"> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="repos.jsp.toolbar"/> </rhn:toolbar> <h2><bean:message key="repos.jsp.header2"/></h2> </c:when> <c:otherwise> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img" + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img" deletionUrl="RepoDelete.do?id=${requestScope.repo.id}" deletionType="repos"> <c:out value="${requestScope.repo.label}"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp index d3a973b..016531b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" +<rhn:toolbar base="h1" icon="fa-info-circle" creationUrl="RepoCreate.do" creationType="repos" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index a6b0473..5b777ad 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -9,7 +9,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - <rhn:toolbar base="h1" icon="icon-search" + <rhn:toolbar base="h1" icon="fa-search" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> <bean:message key="packagesearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf index aadc347..481f7d3 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf @@ -1,6 +1,6 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<rhn:toolbar base="h1" icon="icon-key" +<rhn:toolbar base="h1" icon="fa-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf index 8b4440b..5ee0a77 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/kickstart/KickstartDeleteAdvanced.do?ksid=${ksdata.id}" deletionType="kickstart" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf index 755d202..a80719f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="kickstart.clone.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf index 3d3c99b..0004723 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf @@ -1,7 +1,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/kickstart/KickstartDelete.do?ksid=${ksdata.id}" deletionType="kickstart" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf index a17b3fd..af67eed 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -14,7 +14,7 @@ <c:set var="img" value="action-add.gif" /> </c:if> -<rhn:toolbar base="h1" icon="icon-user" +<rhn:toolbar base="h1" icon="fa-user" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s3-sm-user-active-details" miscUrl="${url}" miscAcl="user_role(org_admin)" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index 811576b..c2c9656 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" +<rhn:toolbar base="h1" icon="fa-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems" > <bean:message key="managedsystems.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index edf7bc2..71ae941 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-cog" imgAlt="config.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-cog" imgAlt="config.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-overview" > <bean:message key="configoverview.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp index 34adc36..ff7b4ee 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-cogs"> +<rhn:toolbar base="h1" icon="fa-cogs"> <bean:message key="summary.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp index 9bafb8a..8fbda89 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp @@ -8,7 +8,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-desktop" +<rhn:toolbar base="h1" icon="fa-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"> <bean:message key="targetsystems.jsp.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp index aee619f..b6a68f0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - icon="icon-desktop" + icon="fa-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcdeployfile.jsp.header" arg0="${system.name}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp index 66c18c1..646bf35 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" icon="icon-desktop" > +<rhn:toolbar base="h2" icon="fa-desktop" > <bean:message key="sdcdeployconfirm.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp index 694480a..75baca1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - icon="icon-desktop" + icon="fa-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcdifffile.jsp.header" arg0="${fn:escapeXml(system.name)}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp index 99dfb08..bc9b038 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" icon="icon-desktop" > +<rhn:toolbar base="h2" icon="fa-desktop" > <bean:message key="sdcdiffconfirm.jsp.header" arg0="${fn:escapeXml(system.name)}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index f4c7e35..c12de0d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - icon="icon-desktop" + icon="fa-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcimportfile.jsp.header" arg0="${fn:escapeXml(system.name)}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index 3714fb0..e9d1747 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -11,7 +11,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" icon="icon-desktop" > +<rhn:toolbar base="h2" icon="fa-desktop" > <bean:message key="sdcimportconfirm.jsp.header" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index eb6778c..6156148 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> <bean:message key="credentials.jsp.delete.dispatch" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 69d3713..0715513 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" + <rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" deletionUrl="/rhn/account/DeleteCredentials.do" deletionType="credentials"> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 6354011..fb714a2 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -25,7 +25,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-search" +<rhn:toolbar base="h1" icon="fa-search" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search"> <bean:message key="erratasearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 1f210eb..0247e56 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -10,7 +10,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> -<rhn:toolbar base="h1" icon="icon-search" imgAlt="docsearch.jsp.imgAlt" +<rhn:toolbar base="h1" icon="fa-search" imgAlt="docsearch.jsp.imgAlt" helpUrl=""> <bean:message key="docsearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp index 25acacd..b5156d2 100644 --- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> <bean:message key="keydelete.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp index 74d502f..763c20b 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="keycreate.jsp.toolbar"/> </rhn:toolbar> <bean:message key="keycreate.jsp.summary"/> diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp index e911ebc..f2ee894 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="system.common.kickstartAlt" + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/keys/CryptoKeyDelete.do?key_id=${cryptoKey.id}" deletionType="CryptoKeyDelete"> <bean:message key="keyedit.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp b/java/code/webapp/WEB-INF/pages/keys/keys.jsp index 4e1c3fa..c598c2a 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" +<rhn:toolbar base="h1" icon="fa-info-circle" creationUrl="CryptoKeyCreate.do" creationType="keys" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp index e9a81c2..819d930 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> <c:out value="${requestScope.snippet.displayName}"/> </rhn:toolbar> <h2><bean:message key="cobbler.snippet.delete"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp index 3b30208..c54cece 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp @@ -11,14 +11,14 @@ <body> <c:choose> <c:when test = "${not empty requestScope.create_mode}"> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="snippetcreate.jsp.toolbar"/> </rhn:toolbar> <h2><bean:message key="snippetcreate.jsp.header2"/></h2> </c:when> <c:otherwise> <rhn:toolbar base="h1" - icon="icon-info-sign" + icon="fa-info-circle" imgAlt="info.alt.img" deletionUrl="CobblerSnippetDelete.do?name=${cobblerSnippetsForm.map.name}" deletionType="snippets"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp index 00f79a7..4ac66b4 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" +<rhn:toolbar base="h1" icon="fa-info-circle" creationUrl="CobblerSnippetCreate.do" creationType="snippets" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp index e565c29..d0d2f5b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -9,7 +9,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> ${requestScope.snippet.displayName} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index 021ea28..6a0702a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" creationUrl="/rhn/kickstart/CreateProfileWizard.do" creationType="kickstart" imgAlt="kickstarts.alt.img" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp index 95acbbc..deaf9b9 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp @@ -7,7 +7,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> <bean:message key="kickstartranges.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 0ad1089..6efa967 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -7,7 +7,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" creationUrl="/rhn/kickstart/CreateProfileWizard.do" creationType="kickstart" imgAlt="kickstarts.alt.img" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp index 645970c..e7b5f41 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstid}" deletionType="deleteTree" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp index 5e0dcc0..16c3409 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket"> +<rhn:toolbar base="h1" icon="fa-rocket"> <bean:message key="kickstartdelete.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp index 79a7788..3c4069f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp @@ -17,7 +17,7 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <p> -<rhn:toolbar base="h2" icon="icon-rocket" +<rhn:toolbar base="h2" icon="fa-rocket" deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}" deletionType="kickstartscript" > <bean:message key="kickstart.script.header1"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 3279228..12ac559 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" creationType="kickstartscript" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp index 3bb22d4..a7eac1a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp @@ -9,7 +9,7 @@ <meta http-equiv="Pragma" content="no-cache" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="treecreate.jsp.toolbar"/> </rhn:toolbar> <bean:message key="treecreate.jsp.header1"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp index d1136a7..3a5ac7d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp @@ -15,7 +15,7 @@ </div> </c:if> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="distro-delete.jsp.header1" arg0="${kstree.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp index 23ffd9f..85d8e69 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp @@ -12,7 +12,7 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" deletionType="deleteTree" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp index 51175ef..6bd6d14 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp @@ -20,7 +20,7 @@ function clickNewestTree(obj) { </script> </head> <body> - <rhn:toolbar base="h1" icon="icon-rocket" + <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key ="kickstart.advanced.jsp.create"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp index c07e0c8..c22b827 100644 --- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-info-sign"> +<rhn:toolbar base="h1" icon="fa-info-circle"> <bean:message key="probes.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp index b434958..261833b 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" icon="icon-group"> +<rhn:toolbar base="h1" icon="fa-group"> ${trustorg} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp index 60620bd..2a81b64 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" icon="icon-group"> +<rhn:toolbar base="h1" icon="fa-group"> ${trustorg} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index 3f6a849..c20b9db 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -9,7 +9,7 @@ <c:set var="pageList" value="${requestScope.pageList}" /> -<rhn:toolbar base="h1" icon="icon-group" > +<rhn:toolbar base="h1" icon="fa-group" > <bean:message key="organizations.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp index a29848f..cdd42ea 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> - <rhn:toolbar base="h1" icon="icon-group" > + <rhn:toolbar base="h1" icon="fa-group" > ${orgtrust} </rhn:toolbar> <rhn:dialogmenu mindepth="0" maxdepth="3" diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp index e183e23..697428d 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp @@ -9,7 +9,7 @@ <html> <body> - <rhn:toolbar base="h1" icon="icon-time" + <rhn:toolbar base="h1" icon="fa-clock-o" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-arch"> <bean:message key="archivedactions.jsp.archived_actions"/> diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp index 45ec4b0..ac856ab 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp @@ -8,7 +8,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-time" +<rhn:toolbar base="h1" icon="fa-clock-o" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-comp"> <bean:message key="completedactions.jsp.completed_actions"/> diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp index eb7b651..36fbf85 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-time" +<rhn:toolbar base="h1" icon="fa-clock-o" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-fail"> <bean:message key="failedactions.jsp.failed_actions"/> diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp index 8ada4e0..30dfca4 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-time" +<rhn:toolbar base="h1" icon="fa-clock-o" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend"> <bean:message key="pendingactions.jsp.pending_actions"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp index 3c3947a..cb99b08 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp index 12aa35f..725b220 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -39,7 +39,7 @@ </script> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp index 007c065..6858c87 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp index 11a8639..2cf47ad 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none"/> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="overview.jsp.alt"> +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="overview.jsp.alt"> <bean:message key="systementitlements.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index a3780f1..b539548 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -27,7 +27,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop"> + <rhn:toolbar base="h1" icon="fa-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp index 95d7cba..e9231b4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp @@ -14,7 +14,7 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop"> + <rhn:toolbar base="h1" icon="fa-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> <rhn:dialogmenu mindepth="0" diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp index 0d15014..07a831c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp @@ -14,7 +14,7 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop"> + <rhn:toolbar base="h1" icon="fa-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> <rhn:dialogmenu mindepth="0" diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp index b36da7b..4b17fd1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp @@ -13,7 +13,7 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop"> + <rhn:toolbar base="h1" icon="fa-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp index 05e8cf5..c6b41be 100644 --- a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="extrapackagessystemslist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp index 440d9be..e389fa3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="inactivelist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp index 5baf16d..120ca64 100644 --- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="outofdatelist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp index 89d448d..96819f3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="overview.jsp.alt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-overview"> <bean:message key="overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp index 84832a2..ff990af 100644 --- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp"> <bean:message key="systemlist.jsp.physicalheader"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp index 3e3d726..321e33e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp @@ -10,7 +10,7 @@ </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <rhn:toolbar base="h2" icon="icon-desktop"> + <rhn:toolbar base="h2" icon="fa-desktop"> <bean:message key="probeedit.jsp.editprobe" /> </rhn:toolbar> <html:form action="/systems/details/probes/ProbeCreate" method="POST" styleClass="form-horizontal"> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 7709bb7..d3583b2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <c:if test="${is_suite_probe}"> - <rhn:toolbar base="h2" icon="icon-desktop" + <rhn:toolbar base="h2" icon="fa-desktop" miscAlt="probedetails.jsp.editsuiteprobe" miscImg="action-clone.gif" miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}" @@ -23,7 +23,7 @@ </rhn:toolbar> </c:if> <c:if test="${not is_suite_probe}"> - <rhn:toolbar base="h2" icon="icon-desktop" + <rhn:toolbar base="h2" icon="fa-desktop" deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe" miscAlt="probedetails.jsp.editthisprobe" diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp index a268a03..6ea7faa 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp @@ -24,7 +24,7 @@ function refreshNotifFields() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" icon="icon-desktop" +<rhn:toolbar base="h2" icon="fa-desktop" deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe"> <bean:message key="probeedit.jsp.editprobe" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp index 1808246..8f3da11 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp @@ -14,7 +14,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes" +<rhn:toolbar base="h2" icon="fa-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes" creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}" creationType="probe" > <bean:message key="probes.index.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp index 7e97460..1b2a419 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="preservation_create.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp index 03b6055..32f9365 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp @@ -5,7 +5,7 @@ <html> <body> - <rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt" + <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/systems/provisioning/preservation/PreservationListDeleteSingle.do?file_list_id=${fileList.id}" deletionType="filelist"> <bean:message key="preservation_edit.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp index be0850a..9ff3dd6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt" creationUrl="PreservationListCreate.do" creationType="filelist"> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp index 9a7a7d6..c2b471b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" +<rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="preservation_list.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp index f4c9082..ebe244d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-proxy"> <bean:message key="proxylist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 46b498f..750301f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -11,7 +11,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-list-rregistered"> <bean:message key="registeredlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp index afc2b79..9f48c23 100644 --- a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="requiringrebootlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp index 3bfc00b..1340e31 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <rhn:toolbar base="h2" icon="icon-info-sign" + <rhn:toolbar base="h2" icon="fa-info-circle" creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}" creationType="customdata"> <bean:message key="sdc.details.customdata.header"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp index bfce6fb..f30e713 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <rhn:toolbar base="h2" icon="icon-pushpin" + <rhn:toolbar base="h2" icon="fa-thumb-tack" creationUrl="/rhn/systems/details/EditNote.do?sid=${system.id}" creationType="note"> <bean:message key="sdc.details.notes.header"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index ff061ee..649d3a7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -11,7 +11,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt"> <bean:message key="systemcurrency.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp index 7582149..5d7e1ff 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp"> <bean:message key="systemlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index 3705c49..6814a4e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> - <rhn:toolbar base="h1" icon="icon-search" + <rhn:toolbar base="h1" icon="fa-search" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-search" imgAlt="search.alt.img"> <bean:message key="systemsearch.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp index 08aa829..c5cc629 100644 --- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-lists3-sm-system-list-unent"> <bean:message key="unentitledlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp index 4319e0c..3b2b23a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="fa-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ungrp"> <bean:message key="ungroupedlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp index 5881a96..e187425 100644 --- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" +<rhn:toolbar base="h1" icon="fa-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-virtual"> <bean:message key="virtuallist.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp index c54d1d8..414c914 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -16,7 +16,7 @@ </c:if> <c:if test="${account_type == 'into_org'}" > - <rhn:toolbar base="h1" icon="icon-user" imgAlt="user.common.userAlt" + <rhn:toolbar base="h1" icon="fa-user" imgAlt="user.common.userAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp"> <bean:message key="usercreate.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp index 239de14..4d3d982 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" icon="icon-user" + <rhn:toolbar base="h1" icon="fa-user" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" imgAlt="users.jsp.imgAlt"> <bean:message key="yourchangeemail.jsp.title"/> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index 946e2a3..e181e1f 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-user" + <rhn:toolbar base="h1" icon="fa-user" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" imgAlt="users.jsp.imgAlt"> <bean:message key="details.jsp.account_details" /> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index 1f045bd..a893911 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -34,7 +34,7 @@ </c:if> </head> <body> -<rhn:toolbar base="h1" icon="icon-dashboard" imgAlt="yourrhn.jsp.toolbar.img.alt" +<rhn:toolbar base="h1" icon="fa-tachometer" imgAlt="yourrhn.jsp.toolbar.img.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp"> <bean:message key="yourrhn.jsp.toolbar"/> </rhn:toolbar> commit 05be7420c78715ec479344995449ab66b6d9c185 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 29 11:37:40 2013 +0100 port to FontAwesome 4.x diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index d8e0251..e9983dd 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -164,6 +164,7 @@ p { overflow: hidden; } /* adding margin to the icons in fontawesome */ +i[class~="fa"], i[class^="icon-"], i[class*=" icon-"], i[class*="spacewalk-icon"], @@ -172,26 +173,15 @@ i[class^="spacewalk-icon"] { } /* if the icon is inside a H tag we wont use a margin*/ h1, h2, h3, h4, h5, h6 { + i[class~="fa"], i[class^="icon-"], i[class*=" icon-"], + i[class^="fa-"], i[class*="spacewalk-icon"], i[class^="spacewalk-icon"] { margin-right: 0; } } -/* color for icon */ -.spacewalk-icon-green { - color: @spacewalk-updates-green -} -.spacewalk-icon-red { - color: @spacewalk-security-red -} -.spacewalk-icon-yellow { - color: @spacewalk-bugs-yellow; -} -.spacewalk-icon-blue { - color: @spacewalk-enhancement-blue -} header { .spacewalk-header-container { @@ -429,10 +419,10 @@ ul.nav.nav-tabs:last-child{ } // icon size smaller than the ones default by Font Awesome -.icon-1-5x { +.fa-1-5x { font-size: 1.3em; } -.icon-1-5x.icon-border { +.fa-1-5x.icon-border { border-width: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; diff --git a/branding/css/variables.less b/branding/css/variables.less index 112839e..6445b31 100644 --- a/branding/css/variables.less +++ b/branding/css/variables.less @@ -10,11 +10,10 @@ @spacewalk-blue: #00aad4; -@spacewalk-updates-green: #7ac142; -@spacewalk-security-red: #a81a1a; -@spacewalk-bugs-yellow: #ffab47; -@spacewalk-enhancement-blue: #4ea1ee; - +@state-success-text: #7ac142; +@state-info-text: #4ea1ee; +@state-warning-text: #ffab47; +@state-danger-text: #a81a1a; /* aside menu colors */ @spacewalk-list-menu: @gray-lighter; diff --git a/branding/fonts/font-awesome/css/font-awesome-ie7.css b/branding/fonts/font-awesome/css/font-awesome-ie7.css deleted file mode 100644 index 17f0776..0000000 --- a/branding/fonts/font-awesome/css/font-awesome-ie7.css +++ /dev/null @@ -1,1203 +0,0 @@ -/*! - * Font Awesome 3.2.1 - * the iconic font designed for Bootstrap - * ------------------------------------------------------------------------------ - * The full suite of pictographic icons, examples, and documentation can be - * found at http://fontawesome.io. Stay up to date on Twitter at - * http://twitter.com/fontawesome. - * - * License - * ------------------------------------------------------------------------------ - * - The Font Awesome font is licensed under SIL OFL 1.1 - - * http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - - * http://opensource.org/licenses/mit-license.html - * - Font Awesome documentation licensed under CC BY 3.0 - - * http://creativecommons.org/licenses/by/3.0/ - * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fontawesome.io" - * - * Author - Dave Gandy - * ------------------------------------------------------------------------------ - * Email: dave(a)fontawesome.io - * Twitter: http://twitter.com/davegandy - * Work: Lead Product Designer @ Kyruus - http://kyruus.com - */ -.icon-large { - font-size: 1.3333333333333333em; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - vertical-align: middle; -} -.nav [class^="icon-"], -.nav [class*=" icon-"] { - vertical-align: inherit; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; -} -.nav [class^="icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - vertical-align: -25%; -} -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large { - line-height: .75em; - margin-top: -7px; - padding-top: 5px; - margin-bottom: -5px; - padding-bottom: 4px; -} -.btn [class^="icon-"].pull-left, -.btn [class*=" icon-"].pull-left, -.btn [class^="icon-"].pull-right, -.btn [class*=" icon-"].pull-right { - vertical-align: inherit; -} -.btn [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large { - margin-top: -0.5em; -} -a [class^="icon-"], -a [class*=" icon-"] { - cursor: pointer; -} -.icon-glass { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-music { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-search { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-envelope-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-heart { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-star { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-star-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-user { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-film { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-th-large { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-th { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-th-list { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ok { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-remove { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-zoom-in { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-zoom-out { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-off { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-power-off { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-signal { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cog { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gear { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-trash { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-home { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-file-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-time { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-road { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-download-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-download { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-upload { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-inbox { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-play-circle { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-repeat { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rotate-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-refresh { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-list-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-lock { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-flag { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-headphones { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-volume-off { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-volume-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-volume-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-qrcode { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-barcode { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tag { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tags { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-book { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bookmark { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-print { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-camera { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bold { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-italic { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-text-height { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-text-width { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-align-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-align-center { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-align-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-align-justify { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-list { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-indent-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-indent-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-facetime-video { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-picture { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-pencil { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-map-marker { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-adjust { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tint { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-edit { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-share { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-check { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-move { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-step-backward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fast-backward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-backward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-play { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-pause { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-stop { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-forward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fast-forward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-step-forward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-eject { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-plus-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-minus-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-remove-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ok-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-question-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-info-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-screenshot { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-remove-circle { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ok-circle { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ban-circle { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-arrow-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-arrow-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-arrow-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-arrow-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-share-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-mail-forward { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-resize-full { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-resize-small { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-plus { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-minus { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-asterisk { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-exclamation-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gift { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-leaf { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fire { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-eye-open { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-eye-close { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-warning-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-plane { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-calendar { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-random { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-comment { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-magnet { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-retweet { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-shopping-cart { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-folder-close { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-folder-open { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-resize-vertical { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-resize-horizontal { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bar-chart { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-twitter-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-facebook-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-camera-retro { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-key { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cogs { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gears { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-comments { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-thumbs-up-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-thumbs-down-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-star-half { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-heart-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-signout { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-linkedin-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-pushpin { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-external-link { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-signin { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-trophy { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-github-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-upload-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-lemon { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-phone { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-check-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-unchecked { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bookmark-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-phone-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-twitter { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-facebook { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-github { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-unlock { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-credit-card { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rss { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hdd { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bullhorn { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bell { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-certificate { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hand-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hand-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hand-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hand-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle-arrow-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle-arrow-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle-arrow-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle-arrow-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-globe { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-wrench { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tasks { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-filter { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-briefcase { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fullscreen { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-group { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-link { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cloud { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-beaker { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cut { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-copy { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-paper-clip { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-paperclip { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-save { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sign-blank { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-reorder { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-list-ul { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-list-ol { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-strikethrough { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-underline { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-table { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-magic { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-truck { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-pinterest { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-pinterest-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-google-plus-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-google-plus { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-money { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-caret-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-caret-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-caret-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-caret-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-columns { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-envelope { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-linkedin { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-undo { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rotate-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-legal { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-dashboard { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-comment-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-comments-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bolt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sitemap { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-umbrella { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-paste { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-lightbulb { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-exchange { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cloud-download { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cloud-upload { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-user-md { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-stethoscope { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-suitcase { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bell-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-coffee { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-food { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-file-text-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-building { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-hospital { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ambulance { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-medkit { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fighter-jet { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-beer { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-h-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-plus-sign-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-double-angle-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-double-angle-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-double-angle-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-double-angle-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-angle-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-angle-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-angle-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-angle-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-desktop { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-laptop { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tablet { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-mobile-phone { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle-blank { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-quote-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-quote-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-spinner { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-circle { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-reply { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-mail-reply { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-github-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-folder-close-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-folder-open-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-expand-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-collapse-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-smile { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-frown { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-meh { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gamepad { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-keyboard { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-flag-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-flag-checkered { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-terminal { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-code { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-reply-all { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-mail-reply-all { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-star-half-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-star-half-full { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-location-arrow { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-crop { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-code-fork { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-unlink { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-question { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-info { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-exclamation { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-superscript { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-subscript { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-eraser { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-puzzle-piece { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-microphone { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-microphone-off { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-shield { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-calendar-empty { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-fire-extinguisher { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rocket { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-maxcdn { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-sign-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-sign-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-sign-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-chevron-sign-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-html5 { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-css3 { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-anchor { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-unlock-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bullseye { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ellipsis-horizontal { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ellipsis-vertical { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rss-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-play-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-ticket { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-minus-sign-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-check-minus { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-level-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-level-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-check-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-edit-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-external-link-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-share-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-compass { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-collapse { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-collapse-top { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-expand { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-eur { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-euro { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gbp { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-usd { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-dollar { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-inr { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-rupee { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-jpy { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-yen { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-cny { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-renminbi { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-krw { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-won { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-btc { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bitcoin { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-file { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-file-text { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-alphabet { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-alphabet-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-attributes { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-attributes-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-order { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sort-by-order-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-thumbs-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-thumbs-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-youtube-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-youtube { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-xing { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-xing-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-youtube-play { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-dropbox { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-stackexchange { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-instagram { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-flickr { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-adn { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bitbucket { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bitbucket-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tumblr { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-tumblr-sign { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-long-arrow-down { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-long-arrow-up { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-long-arrow-left { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-long-arrow-right { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-apple { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-windows { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-android { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-linux { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-dribbble { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-skype { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-foursquare { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-trello { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-female { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-male { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-gittip { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-sun { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-moon { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-archive { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-bug { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-vk { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-weibo { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-renren { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} diff --git a/branding/fonts/font-awesome/css/font-awesome-ie7.min.css b/branding/fonts/font-awesome/css/font-awesome-ie7.min.css deleted file mode 100644 index d3dae63..0000000 --- a/branding/fonts/font-awesome/css/font-awesome-ie7.min.css +++ /dev/null @@ -1,384 +0,0 @@ -.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;} -.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;} -.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;} -.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;} -.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;} -a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} -.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-music{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-search{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-envelope-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-heart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-user{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-film{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th-large{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-zoom-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-zoom-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-time{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-road{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-download-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-inbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-repeat{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rotate-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-refresh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-headphones{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-qrcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-barcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tags{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-book{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bookmark{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-print{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-camera{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-font{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bold{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-italic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-text-height{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-text-width{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-center{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-justify{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-indent-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-indent-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facetime-video{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-picture{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pencil{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-map-marker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-adjust{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tint{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-edit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-move{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-step-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fast-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pause{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fast-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-step-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eject{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-question-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-info-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-screenshot{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ban-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-small{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-asterisk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exclamation-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gift{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-leaf{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fire{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eye-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eye-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-warning-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plane{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-calendar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-random{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comment{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-magnet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-retweet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-shopping-cart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bar-chart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-twitter-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facebook-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-twitter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facebook{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-credit-card{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-globe{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-wrench{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tasks{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-filter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-briefcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fullscreen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-group{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-ol{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-strikethrough{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-underline{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-table{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-magic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-truck{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pinterest{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pinterest-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-google-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-google-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-money{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-columns{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-envelope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linkedin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-undo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rotate-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-legal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lightbulb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ambulance{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-medkit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fighter-jet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-beer{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-h-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-spinner{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-close-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-open-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-expand-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-smile{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-frown{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-meh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gamepad{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-keyboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag-checkered{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-terminal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-code{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-location-arrow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-crop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-code-fork{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlink{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-question{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-info{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exclamation{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-superscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-subscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eraser{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-puzzle-piece{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-microphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-microphone-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-shield{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-calendar-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fire-extinguisher{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rocket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-maxcdn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-html5{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-css3{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-anchor{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlock-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bullseye{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ellipsis-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ellipsis-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rss-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ticket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-level-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-level-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-edit-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gbp{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-usd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dollar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitcoin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-text{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-alphabet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-alphabet-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-attributes{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-attributes-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-order{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-order-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-xing{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitbucket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitbucket-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tumblr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tumblr-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-apple{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-female{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-male{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gittip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sun{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-moon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-archive{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bug{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} diff --git a/branding/fonts/font-awesome/css/font-awesome.css b/branding/fonts/font-awesome/css/font-awesome.css index 7ede182..fff309b 100644 --- a/branding/fonts/font-awesome/css/font-awesome.css +++ b/branding/fonts/font-awesome/css/font-awesome.css @@ -1,5 +1,5 @@ /*! - * Font Awesome 3.2.1 + * Font Awesome 4.0.1 * the iconic font designed for Bootstrap * ------------------------------------------------------------------------------ * The full suite of pictographic icons, examples, and documentation can be @@ -27,119 +27,64 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../font/fontawesome-webfont.eot?v=3.2.1'); - src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); + src: url('../fonts/fontawesome-webfont.eot?v=4.0.1'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } -/* FONT AWESOME CORE - * -------------------------- */ -[class^="icon-"], -[class*=" icon-"] { +.fa { + display: inline-block; font-family: FontAwesome; - font-weight: normal; font-style: normal; - text-decoration: inherit; + font-weight: normal; + line-height: 1; -webkit-font-smoothing: antialiased; - *margin-right: .3em; -} -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; + -moz-osx-font-smoothing: grayscale; } /* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; +.fa-lg { font-size: 1.3333333333333333em; + line-height: 0.75em; + vertical-align: -15%; } -/* makes sure icons active on rollover in links */ -a [class^="icon-"], -a [class*=" icon-"] { - display: inline; +.fa-2x { + font-size: 2em; } -/* increased font size for icon-large */ -[class^="icon-"].icon-fixed-width, -[class*=" icon-"].icon-fixed-width { - display: inline-block; - width: 1.1428571428571428em; - text-align: right; - padding-right: 0.2857142857142857em; +.fa-3x { + font-size: 3em; +} +.fa-4x { + font-size: 4em; } -[class^="icon-"].icon-fixed-width.icon-large, -[class*=" icon-"].icon-fixed-width.icon-large { - width: 1.4285714285714286em; +.fa-5x { + font-size: 5em; +} +.fa-fw { + width: 1.2857142857142858em; + text-align: center; } -.icons-ul { +.fa-ul { + padding-left: 0; margin-left: 2.142857142857143em; list-style-type: none; } -.icons-ul > li { +.fa-ul > li { position: relative; } -.icons-ul .icon-li { +.fa-li { position: absolute; left: -2.142857142857143em; width: 2.142857142857143em; + top: 0.14285714285714285em; text-align: center; - line-height: inherit; -} -[class^="icon-"].hide, -[class*=" icon-"].hide { - display: none; } -.icon-muted { - color: #eeeeee; +.fa-li.fa-lg { + left: -1.8571428571428572em; } -.icon-light { - color: #ffffff; -} -.icon-dark { - color: #333333; -} -.icon-border { - border: solid 1px #eeeeee; +.fa-border { padding: .2em .25em .15em; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.icon-2x { - font-size: 2em; -} -.icon-2x.icon-border { - border-width: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.icon-3x { - font-size: 3em; -} -.icon-3x.icon-border { - border-width: 3px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.icon-4x { - font-size: 4em; -} -.icon-4x.icon-border { - border-width: 4px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.icon-5x { - font-size: 5em; -} -.icon-5x.icon-border { - border-width: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + border: solid 0.08em #eeeeee; + border-radius: .1em; } .pull-right { float: right; @@ -147,147 +92,18 @@ a [class*=" icon-"] { .pull-left { float: left; } -[class^="icon-"].pull-left, -[class*=" icon-"].pull-left { +.fa.pull-left { margin-right: .3em; } -[class^="icon-"].pull-right, -[class*=" icon-"].pull-right { +.fa.pull-right { margin-left: .3em; } -/* BOOTSTRAP SPECIFIC CLASSES - * -------------------------- */ -/* Bootstrap 2.0 sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} -/* more sprites.less reset */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} -/* keeps Bootstrap styles with and without icons the same */ -.btn [class^="icon-"].icon-large, -.nav [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - line-height: .9em; -} -.btn [class^="icon-"].icon-spin, -.nav [class^="icon-"].icon-spin, -.btn [class*=" icon-"].icon-spin, -.nav [class*=" icon-"].icon-spin { - display: inline-block; -} -.nav-tabs [class^="icon-"], -.nav-pills [class^="icon-"], -.nav-tabs [class*=" icon-"], -.nav-pills [class*=" icon-"], -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large { - line-height: .9em; -} -.btn [class^="icon-"].pull-left.icon-2x, -.btn [class*=" icon-"].pull-left.icon-2x, -.btn [class^="icon-"].pull-right.icon-2x, -.btn [class*=" icon-"].pull-right.icon-2x { - margin-top: .18em; -} -.btn [class^="icon-"].icon-spin.icon-large, -.btn [class*=" icon-"].icon-spin.icon-large { - line-height: .8em; -} -.btn.btn-small [class^="icon-"].pull-left.icon-2x, -.btn.btn-small [class*=" icon-"].pull-left.icon-2x, -.btn.btn-small [class^="icon-"].pull-right.icon-2x, -.btn.btn-small [class*=" icon-"].pull-right.icon-2x { - margin-top: .25em; -} -.btn.btn-large [class^="icon-"], -.btn.btn-large [class*=" icon-"] { - margin-top: 0; -} -.btn.btn-large [class^="icon-"].pull-left.icon-2x, -.btn.btn-large [class*=" icon-"].pull-left.icon-2x, -.btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-top: .05em; -} -.btn.btn-large [class^="icon-"].pull-left.icon-2x, -.btn.btn-large [class*=" icon-"].pull-left.icon-2x { - margin-right: .2em; -} -.btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-left: .2em; -} -/* Fixes alignment in nav lists */ -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - line-height: inherit; -} -/* EXTRAS - * -------------------------- */ -/* Stacked and layered icon */ -.icon-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: -35%; -} -.icon-stack [class^="icon-"], -.icon-stack [class*=" icon-"] { - display: block; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - font-size: 1em; - line-height: inherit; - *line-height: 2em; -} -.icon-stack .icon-stack-base { - font-size: 2em; - *line-height: 1em; -} -/* Animated rotating icon */ -.icon-spin { - display: inline-block; +.fa-spin { + -webkit-animation: spin 2s infinite linear; -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } -/* Prevent stack and spinners from being taken inline when inside a link */ -a .icon-stack, -a .icon-spin { - display: inline-block; - text-decoration: none; -} @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); @@ -328,1152 +144,1218 @@ a .icon-spin { transform: rotate(359deg); } } -/* Icon rotations and mirroring */ -.icon-rotate-90:before { +.fa-rotate-90 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -webkit-transform: rotate(90deg); -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); -o-transform: rotate(90deg); transform: rotate(90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); } -.icon-rotate-180:before { +.fa-rotate-180 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); -o-transform: rotate(180deg); transform: rotate(180deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); } -.icon-rotate-270:before { +.fa-rotate-270 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -o-transform: rotate(270deg); transform: rotate(270deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); } -.icon-flip-horizontal:before { +.fa-flip-horizontal { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); -webkit-transform: scale(-1, 1); -moz-transform: scale(-1, 1); -ms-transform: scale(-1, 1); -o-transform: scale(-1, 1); transform: scale(-1, 1); } -.icon-flip-vertical:before { +.fa-flip-vertical { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); -webkit-transform: scale(1, -1); -moz-transform: scale(1, -1); -ms-transform: scale(1, -1); -o-transform: scale(1, -1); transform: scale(1, -1); } -/* ensure rotation occurs inside anchor tags */ -a .icon-rotate-90:before, -a .icon-rotate-180:before, -a .icon-rotate-270:before, -a .icon-flip-horizontal:before, -a .icon-flip-vertical:before { +.fa-stack { + position: relative; display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.fa-stack-1x, +.fa-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.fa-stack-1x { + line-height: inherit; +} +.fa-stack-2x { + font-size: 2em; +} +.fa-inverse { + color: #ffffff; } /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ -.icon-glass:before { +.fa-glass:before { content: "\f000"; } -.icon-music:before { +.fa-music:before { content: "\f001"; } -.icon-search:before { +.fa-search:before { content: "\f002"; } -.icon-envelope-alt:before { +.fa-envelope-o:before { content: "\f003"; } -.icon-heart:before { +.fa-heart:before { content: "\f004"; } -.icon-star:before { +.fa-star:before { content: "\f005"; } -.icon-star-empty:before { +.fa-star-o:before { content: "\f006"; } -.icon-user:before { +.fa-user:before { content: "\f007"; } -.icon-film:before { +.fa-film:before { content: "\f008"; } -.icon-th-large:before { +.fa-th-large:before { content: "\f009"; } -.icon-th:before { +.fa-th:before { content: "\f00a"; } -.icon-th-list:before { +.fa-th-list:before { content: "\f00b"; } -.icon-ok:before { +.fa-check:before { content: "\f00c"; } -.icon-remove:before { +.fa-times:before { content: "\f00d"; } -.icon-zoom-in:before { +.fa-search-plus:before { content: "\f00e"; } -.icon-zoom-out:before { +.fa-search-minus:before { content: "\f010"; } -.icon-power-off:before, -.icon-off:before { +.fa-power-off:before { content: "\f011"; } -.icon-signal:before { +.fa-signal:before { content: "\f012"; } -.icon-gear:before, -.icon-cog:before { +.fa-gear:before, +.fa-cog:before { content: "\f013"; } -.icon-trash:before { +.fa-trash-o:before { content: "\f014"; } -.icon-home:before { +.fa-home:before { content: "\f015"; } -.icon-file-alt:before { +.fa-file-o:before { content: "\f016"; } -.icon-time:before { +.fa-clock-o:before { content: "\f017"; } -.icon-road:before { +.fa-road:before { content: "\f018"; } -.icon-download-alt:before { +.fa-download:before { content: "\f019"; } -.icon-download:before { +.fa-arrow-circle-o-down:before { content: "\f01a"; } -.icon-upload:before { +.fa-arrow-circle-o-up:before { content: "\f01b"; } -.icon-inbox:before { +.fa-inbox:before { content: "\f01c"; } -.icon-play-circle:before { +.fa-play-circle-o:before { content: "\f01d"; } -.icon-rotate-right:before, -.icon-repeat:before { +.fa-rotate-right:before, +.fa-repeat:before { content: "\f01e"; } -.icon-refresh:before { +.fa-refresh:before { content: "\f021"; } -.icon-list-alt:before { +.fa-list-alt:before { content: "\f022"; } -.icon-lock:before { +.fa-lock:before { content: "\f023"; } -.icon-flag:before { +.fa-flag:before { content: "\f024"; } -.icon-headphones:before { +.fa-headphones:before { content: "\f025"; } -.icon-volume-off:before { +.fa-volume-off:before { content: "\f026"; } -.icon-volume-down:before { +.fa-volume-down:before { content: "\f027"; } -.icon-volume-up:before { +.fa-volume-up:before { content: "\f028"; } -.icon-qrcode:before { +.fa-qrcode:before { content: "\f029"; } -.icon-barcode:before { +.fa-barcode:before { content: "\f02a"; } -.icon-tag:before { +.fa-tag:before { content: "\f02b"; } -.icon-tags:before { +.fa-tags:before { content: "\f02c"; } -.icon-book:before { +.fa-book:before { content: "\f02d"; } -.icon-bookmark:before { +.fa-bookmark:before { content: "\f02e"; } -.icon-print:before { +.fa-print:before { content: "\f02f"; } -.icon-camera:before { +.fa-camera:before { content: "\f030"; } -.icon-font:before { +.fa-font:before { content: "\f031"; } -.icon-bold:before { +.fa-bold:before { content: "\f032"; } -.icon-italic:before { +.fa-italic:before { content: "\f033"; } -.icon-text-height:before { +.fa-text-height:before { content: "\f034"; } -.icon-text-width:before { +.fa-text-width:before { content: "\f035"; } -.icon-align-left:before { +.fa-align-left:before { content: "\f036"; } -.icon-align-center:before { +.fa-align-center:before { content: "\f037"; } -.icon-align-right:before { +.fa-align-right:before { content: "\f038"; } -.icon-align-justify:before { +.fa-align-justify:before { content: "\f039"; } -.icon-list:before { +.fa-list:before { content: "\f03a"; } -.icon-indent-left:before { +.fa-dedent:before, +.fa-outdent:before { content: "\f03b"; } -.icon-indent-right:before { +.fa-indent:before { content: "\f03c"; } -.icon-facetime-video:before { +.fa-video-camera:before { content: "\f03d"; } -.icon-picture:before { +.fa-picture-o:before { content: "\f03e"; } -.icon-pencil:before { +.fa-pencil:before { content: "\f040"; } -.icon-map-marker:before { +.fa-map-marker:before { content: "\f041"; } -.icon-adjust:before { +.fa-adjust:before { content: "\f042"; } -.icon-tint:before { +.fa-tint:before { content: "\f043"; } -.icon-edit:before { +.fa-edit:before, +.fa-pencil-square-o:before { content: "\f044"; } -.icon-share:before { +.fa-share-square-o:before { content: "\f045"; } -.icon-check:before { +.fa-check-square-o:before { content: "\f046"; } -.icon-move:before { +.fa-move:before { content: "\f047"; } -.icon-step-backward:before { +.fa-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { +.fa-fast-backward:before { content: "\f049"; } -.icon-backward:before { +.fa-backward:before { content: "\f04a"; } -.icon-play:before { +.fa-play:before { content: "\f04b"; } -.icon-pause:before { +.fa-pause:before { content: "\f04c"; } -.icon-stop:before { +.fa-stop:before { content: "\f04d"; } -.icon-forward:before { +.fa-forward:before { content: "\f04e"; } -.icon-fast-forward:before { +.fa-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { +.fa-step-forward:before { content: "\f051"; } -.icon-eject:before { +.fa-eject:before { content: "\f052"; } -.icon-chevron-left:before { +.fa-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { +.fa-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { +.fa-plus-circle:before { content: "\f055"; } -.icon-minus-sign:before { +.fa-minus-circle:before { content: "\f056"; } -.icon-remove-sign:before { +.fa-times-circle:before { content: "\f057"; } -.icon-ok-sign:before { +.fa-check-circle:before { content: "\f058"; } -.icon-question-sign:before { +.fa-question-circle:before { content: "\f059"; } -.icon-info-sign:before { +.fa-info-circle:before { content: "\f05a"; } -.icon-screenshot:before { +.fa-crosshairs:before { content: "\f05b"; } -.icon-remove-circle:before { +.fa-times-circle-o:before { content: "\f05c"; } -.icon-ok-circle:before { +.fa-check-circle-o:before { content: "\f05d"; } -.icon-ban-circle:before { +.fa-ban:before { content: "\f05e"; } -.icon-arrow-left:before { +.fa-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { +.fa-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { +.fa-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { +.fa-arrow-down:before { content: "\f063"; } -.icon-mail-forward:before, -.icon-share-alt:before { +.fa-mail-forward:before, +.fa-share:before { content: "\f064"; } -.icon-resize-full:before { +.fa-resize-full:before { content: "\f065"; } -.icon-resize-small:before { +.fa-resize-small:before { content: "\f066"; } -.icon-plus:before { +.fa-plus:before { content: "\f067"; } -.icon-minus:before { +.fa-minus:before { content: "\f068"; } -.icon-asterisk:before { +.fa-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { +.fa-exclamation-circle:before { content: "\f06a"; } -.icon-gift:before { +.fa-gift:before { content: "\f06b"; } -.icon-leaf:before { +.fa-leaf:before { content: "\f06c"; } -.icon-fire:before { +.fa-fire:before { content: "\f06d"; } -.icon-eye-open:before { +.fa-eye:before { content: "\f06e"; } -.icon-eye-close:before { +.fa-eye-slash:before { content: "\f070"; } -.icon-warning-sign:before { +.fa-warning:before, +.fa-exclamation-triangle:before { content: "\f071"; } -.icon-plane:before { +.fa-plane:before { content: "\f072"; } -.icon-calendar:before { +.fa-calendar:before { content: "\f073"; } -.icon-random:before { +.fa-random:before { content: "\f074"; } -.icon-comment:before { +.fa-comment:before { content: "\f075"; } -.icon-magnet:before { +.fa-magnet:before { content: "\f076"; } -.icon-chevron-up:before { +.fa-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { +.fa-chevron-down:before { content: "\f078"; } -.icon-retweet:before { +.fa-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { +.fa-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { +.fa-folder:before { content: "\f07b"; } -.icon-folder-open:before { +.fa-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { +.fa-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { +.fa-resize-horizontal:before { content: "\f07e"; } -.icon-bar-chart:before { +.fa-bar-chart-o:before { content: "\f080"; } -.icon-twitter-sign:before { +.fa-twitter-square:before { content: "\f081"; } -.icon-facebook-sign:before { +.fa-facebook-square:before { content: "\f082"; } -.icon-camera-retro:before { +.fa-camera-retro:before { content: "\f083"; } -.icon-key:before { +.fa-key:before { content: "\f084"; } -.icon-gears:before, -.icon-cogs:before { +.fa-gears:before, +.fa-cogs:before { content: "\f085"; } -.icon-comments:before { +.fa-comments:before { content: "\f086"; } -.icon-thumbs-up-alt:before { +.fa-thumbs-o-up:before { content: "\f087"; } -.icon-thumbs-down-alt:before { +.fa-thumbs-o-down:before { content: "\f088"; } -.icon-star-half:before { +.fa-star-half:before { content: "\f089"; } -.icon-heart-empty:before { +.fa-heart-o:before { content: "\f08a"; } -.icon-signout:before { +.fa-sign-out:before { content: "\f08b"; } -.icon-linkedin-sign:before { +.fa-linkedin-square:before { content: "\f08c"; } -.icon-pushpin:before { +.fa-thumb-tack:before { content: "\f08d"; } -.icon-external-link:before { +.fa-external-link:before { content: "\f08e"; } -.icon-signin:before { +.fa-sign-in:before { content: "\f090"; } -.icon-trophy:before { +.fa-trophy:before { content: "\f091"; } -.icon-github-sign:before { +.fa-github-square:before { content: "\f092"; } -.icon-upload-alt:before { +.fa-upload:before { content: "\f093"; } -.icon-lemon:before { +.fa-lemon-o:before { content: "\f094"; } -.icon-phone:before { +.fa-phone:before { content: "\f095"; } -.icon-unchecked:before, -.icon-check-empty:before { +.fa-square-o:before { content: "\f096"; } -.icon-bookmark-empty:before { +.fa-bookmark-o:before { content: "\f097"; } -.icon-phone-sign:before { +.fa-phone-square:before { content: "\f098"; } -.icon-twitter:before { +.fa-twitter:before { content: "\f099"; } -.icon-facebook:before { +.fa-facebook:before { content: "\f09a"; } -.icon-github:before { +.fa-github:before { content: "\f09b"; } -.icon-unlock:before { +.fa-unlock:before { content: "\f09c"; } -.icon-credit-card:before { +.fa-credit-card:before { content: "\f09d"; } -.icon-rss:before { +.fa-rss:before { content: "\f09e"; } -.icon-hdd:before { +.fa-hdd-o:before { content: "\f0a0"; } -.icon-bullhorn:before { +.fa-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { - content: "\f0a2"; +.fa-bell:before { + content: "\f0f3"; } -.icon-certificate:before { +.fa-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { +.fa-hand-o-right:before { content: "\f0a4"; } -.icon-hand-left:before { +.fa-hand-o-left:before { content: "\f0a5"; } -.icon-hand-up:before { +.fa-hand-o-up:before { content: "\f0a6"; } -.icon-hand-down:before { +.fa-hand-o-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { +.fa-arrow-circle-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { +.fa-arrow-circle-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { +.fa-arrow-circle-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { +.fa-arrow-circle-down:before { content: "\f0ab"; } -.icon-globe:before { +.fa-globe:before { content: "\f0ac"; } -.icon-wrench:before { +.fa-wrench:before { content: "\f0ad"; } -.icon-tasks:before { +.fa-tasks:before { content: "\f0ae"; } -.icon-filter:before { +.fa-filter:before { content: "\f0b0"; } -.icon-briefcase:before { +.fa-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { +.fa-fullscreen:before { content: "\f0b2"; } -.icon-group:before { +.fa-group:before { content: "\f0c0"; } -.icon-link:before { +.fa-chain:before, +.fa-link:before { content: "\f0c1"; } -.icon-cloud:before { +.fa-cloud:before { content: "\f0c2"; } -.icon-beaker:before { +.fa-flask:before { content: "\f0c3"; } -.icon-cut:before { +.fa-cut:before, +.fa-scissors:before { content: "\f0c4"; } -.icon-copy:before { +.fa-copy:before, +.fa-files-o:before { content: "\f0c5"; } -.icon-paperclip:before, -.icon-paper-clip:before { +.fa-paperclip:before { content: "\f0c6"; } -.icon-save:before { +.fa-save:before, +.fa-floppy-o:before { content: "\f0c7"; } -.icon-sign-blank:before { +.fa-square:before { content: "\f0c8"; } -.icon-reorder:before { +.fa-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { +.fa-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { +.fa-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { +.fa-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { +.fa-underline:before { content: "\f0cd"; } -.icon-table:before { +.fa-table:before { content: "\f0ce"; } -.icon-magic:before { +.fa-magic:before { content: "\f0d0"; } -.icon-truck:before { +.fa-truck:before { content: "\f0d1"; } -.icon-pinterest:before { +.fa-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { +.fa-pinterest-square:before { content: "\f0d3"; } -.icon-google-plus-sign:before { +.fa-google-plus-square:before { content: "\f0d4"; } -.icon-google-plus:before { +.fa-google-plus:before { content: "\f0d5"; } -.icon-money:before { +.fa-money:before { content: "\f0d6"; } -.icon-caret-down:before { +.fa-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { +.fa-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { +.fa-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { +.fa-caret-right:before { content: "\f0da"; } -.icon-columns:before { +.fa-columns:before { content: "\f0db"; } -.icon-sort:before { +.fa-unsorted:before, +.fa-sort:before { content: "\f0dc"; } -.icon-sort-down:before { +.fa-sort-down:before, +.fa-sort-asc:before { content: "\f0dd"; } -.icon-sort-up:before { +.fa-sort-up:before, +.fa-sort-desc:before { content: "\f0de"; } -.icon-envelope:before { +.fa-envelope:before { content: "\f0e0"; } -.icon-linkedin:before { +.fa-linkedin:before { content: "\f0e1"; } -.icon-rotate-left:before, -.icon-undo:before { +.fa-rotate-left:before, +.fa-undo:before { content: "\f0e2"; } -.icon-legal:before { +.fa-legal:before, +.fa-gavel:before { content: "\f0e3"; } -.icon-dashboard:before { +.fa-dashboard:before, +.fa-tachometer:before { content: "\f0e4"; } -.icon-comment-alt:before { +.fa-comment-o:before { content: "\f0e5"; } -.icon-comments-alt:before { +.fa-comments-o:before { content: "\f0e6"; } -.icon-bolt:before { +.fa-flash:before, +.fa-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { +.fa-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { +.fa-umbrella:before { content: "\f0e9"; } -.icon-paste:before { +.fa-paste:before, +.fa-clipboard:before { content: "\f0ea"; } -.icon-lightbulb:before { +.fa-lightbulb-o:before { content: "\f0eb"; } -.icon-exchange:before { +.fa-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { +.fa-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { +.fa-cloud-upload:before { content: "\f0ee"; } -.icon-user-md:before { +.fa-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { +.fa-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { +.fa-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { - content: "\f0f3"; +.fa-bell-o:before { + content: "\f0a2"; } -.icon-coffee:before { +.fa-coffee:before { content: "\f0f4"; } -.icon-food:before { +.fa-cutlery:before { content: "\f0f5"; } -.icon-file-text-alt:before { +.fa-file-text-o:before { content: "\f0f6"; } -.icon-building:before { +.fa-building:before { content: "\f0f7"; } -.icon-hospital:before { +.fa-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { +.fa-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { +.fa-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { +.fa-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { +.fa-beer:before { content: "\f0fc"; } -.icon-h-sign:before { +.fa-h-square:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { +.fa-plus-square:before { content: "\f0fe"; } -.icon-double-angle-left:before { +.fa-angle-double-left:before { content: "\f100"; } -.icon-double-angle-right:before { +.fa-angle-double-right:before { content: "\f101"; } -.icon-double-angle-up:before { +.fa-angle-double-up:before { content: "\f102"; } -.icon-double-angle-down:before { +.fa-angle-double-down:before { content: "\f103"; } -.icon-angle-left:before { +.fa-angle-left:before { content: "\f104"; } -.icon-angle-right:before { +.fa-angle-right:before { content: "\f105"; } -.icon-angle-up:before { +.fa-angle-up:before { content: "\f106"; } -.icon-angle-down:before { +.fa-angle-down:before { content: "\f107"; } -.icon-desktop:before { +.fa-desktop:before { content: "\f108"; } -.icon-laptop:before { +.fa-laptop:before { content: "\f109"; } -.icon-tablet:before { +.fa-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { +.fa-mobile-phone:before, +.fa-mobile:before { content: "\f10b"; } -.icon-circle-blank:before { +.fa-circle-o:before { content: "\f10c"; } -.icon-quote-left:before { +.fa-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { +.fa-quote-right:before { content: "\f10e"; } -.icon-spinner:before { +.fa-spinner:before { content: "\f110"; } -.icon-circle:before { +.fa-circle:before { content: "\f111"; } -.icon-mail-reply:before, -.icon-reply:before { +.fa-mail-reply:before, +.fa-reply:before { content: "\f112"; } -.icon-github-alt:before { +.fa-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { +.fa-folder-o:before { content: "\f114"; } -.icon-folder-open-alt:before { +.fa-folder-open-o:before { content: "\f115"; } -.icon-expand-alt:before { +.fa-expand-o:before { content: "\f116"; } -.icon-collapse-alt:before { +.fa-collapse-o:before { content: "\f117"; } -.icon-smile:before { +.fa-smile-o:before { content: "\f118"; } -.icon-frown:before { +.fa-frown-o:before { content: "\f119"; } -.icon-meh:before { +.fa-meh-o:before { content: "\f11a"; } -.icon-gamepad:before { +.fa-gamepad:before { content: "\f11b"; } -.icon-keyboard:before { +.fa-keyboard-o:before { content: "\f11c"; } -.icon-flag-alt:before { +.fa-flag-o:before { content: "\f11d"; } -.icon-flag-checkered:before { +.fa-flag-checkered:before { content: "\f11e"; } -.icon-terminal:before { +.fa-terminal:before { content: "\f120"; } -.icon-code:before { +.fa-code:before { content: "\f121"; } -.icon-reply-all:before { +.fa-reply-all:before { content: "\f122"; } -.icon-mail-reply-all:before { +.fa-mail-reply-all:before { content: "\f122"; } -.icon-star-half-full:before, -.icon-star-half-empty:before { +.fa-star-half-empty:before, +.fa-star-half-full:before, +.fa-star-half-o:before { content: "\f123"; } -.icon-location-arrow:before { +.fa-location-arrow:before { content: "\f124"; } -.icon-crop:before { +.fa-crop:before { content: "\f125"; } -.icon-code-fork:before { +.fa-code-fork:before { content: "\f126"; } -.icon-unlink:before { +.fa-unlink:before, +.fa-chain-broken:before { content: "\f127"; } -.icon-question:before { +.fa-question:before { content: "\f128"; } -.icon-info:before { +.fa-info:before { content: "\f129"; } -.icon-exclamation:before { +.fa-exclamation:before { content: "\f12a"; } -.icon-superscript:before { +.fa-superscript:before { content: "\f12b"; } -.icon-subscript:before { +.fa-subscript:before { content: "\f12c"; } -.icon-eraser:before { +.fa-eraser:before { content: "\f12d"; } -.icon-puzzle-piece:before { +.fa-puzzle-piece:before { content: "\f12e"; } -.icon-microphone:before { +.fa-microphone:before { content: "\f130"; } -.icon-microphone-off:before { +.fa-microphone-slash:before { content: "\f131"; } -.icon-shield:before { +.fa-shield:before { content: "\f132"; } -.icon-calendar-empty:before { +.fa-calendar-o:before { content: "\f133"; } -.icon-fire-extinguisher:before { +.fa-fire-extinguisher:before { content: "\f134"; } -.icon-rocket:before { +.fa-rocket:before { content: "\f135"; } -.icon-maxcdn:before { +.fa-maxcdn:before { content: "\f136"; } -.icon-chevron-sign-left:before { +.fa-chevron-circle-left:before { content: "\f137"; } -.icon-chevron-sign-right:before { +.fa-chevron-circle-right:before { content: "\f138"; } -.icon-chevron-sign-up:before { +.fa-chevron-circle-up:before { content: "\f139"; } -.icon-chevron-sign-down:before { +.fa-chevron-circle-down:before { content: "\f13a"; } -.icon-html5:before { +.fa-html5:before { content: "\f13b"; } -.icon-css3:before { +.fa-css3:before { content: "\f13c"; } -.icon-anchor:before { +.fa-anchor:before { content: "\f13d"; } -.icon-unlock-alt:before { +.fa-unlock-o:before { content: "\f13e"; } -.icon-bullseye:before { +.fa-bullseye:before { content: "\f140"; } -.icon-ellipsis-horizontal:before { +.fa-ellipsis-horizontal:before { content: "\f141"; } -.icon-ellipsis-vertical:before { +.fa-ellipsis-vertical:before { content: "\f142"; } -.icon-rss-sign:before { +.fa-rss-square:before { content: "\f143"; } -.icon-play-sign:before { +.fa-play-circle:before { content: "\f144"; } -.icon-ticket:before { +.fa-ticket:before { content: "\f145"; } -.icon-minus-sign-alt:before { +.fa-minus-square:before { content: "\f146"; } -.icon-check-minus:before { +.fa-minus-square-o:before { content: "\f147"; } -.icon-level-up:before { +.fa-level-up:before { content: "\f148"; } -.icon-level-down:before { +.fa-level-down:before { content: "\f149"; } -.icon-check-sign:before { +.fa-check-square:before { content: "\f14a"; } -.icon-edit-sign:before { +.fa-pencil-square:before { content: "\f14b"; } -.icon-external-link-sign:before { +.fa-external-link-square:before { content: "\f14c"; } -.icon-share-sign:before { +.fa-share-square:before { content: "\f14d"; } -.icon-compass:before { +.fa-compass:before { content: "\f14e"; } -.icon-collapse:before { +.fa-toggle-down:before, +.fa-caret-square-o-down:before { content: "\f150"; } -.icon-collapse-top:before { +.fa-toggle-up:before, +.fa-caret-square-o-up:before { content: "\f151"; } -.icon-expand:before { +.fa-toggle-right:before, +.fa-caret-square-o-right:before { content: "\f152"; } -.icon-euro:before, -.icon-eur:before { +.fa-euro:before, +.fa-eur:before { content: "\f153"; } -.icon-gbp:before { +.fa-gbp:before { content: "\f154"; } -.icon-dollar:before, -.icon-usd:before { +.fa-dollar:before, +.fa-usd:before { content: "\f155"; } -.icon-rupee:before, -.icon-inr:before { +.fa-rupee:before, +.fa-inr:before { content: "\f156"; } -.icon-yen:before, -.icon-jpy:before { +.fa-cny:before, +.fa-rmb:before, +.fa-yen:before, +.fa-jpy:before { content: "\f157"; } -.icon-renminbi:before, -.icon-cny:before { +.fa-ruble:before, +.fa-rouble:before, +.fa-rub:before { content: "\f158"; } -.icon-won:before, -.icon-krw:before { +.fa-won:before, +.fa-krw:before { content: "\f159"; } -.icon-bitcoin:before, -.icon-btc:before { +.fa-bitcoin:before, +.fa-btc:before { content: "\f15a"; } -.icon-file:before { +.fa-file:before { content: "\f15b"; } -.icon-file-text:before { +.fa-file-text:before { content: "\f15c"; } -.icon-sort-by-alphabet:before { +.fa-sort-alpha-asc:before { content: "\f15d"; } -.icon-sort-by-alphabet-alt:before { +.fa-sort-alpha-desc:before { content: "\f15e"; } -.icon-sort-by-attributes:before { +.fa-sort-amount-asc:before { content: "\f160"; } -.icon-sort-by-attributes-alt:before { +.fa-sort-amount-desc:before { content: "\f161"; } -.icon-sort-by-order:before { +.fa-sort-numeric-asc:before { content: "\f162"; } -.icon-sort-by-order-alt:before { +.fa-sort-numeric-desc:before { content: "\f163"; } -.icon-thumbs-up:before { +.fa-thumbs-up:before { content: "\f164"; } -.icon-thumbs-down:before { +.fa-thumbs-down:before { content: "\f165"; } -.icon-youtube-sign:before { +.fa-youtube-square:before { content: "\f166"; } -.icon-youtube:before { +.fa-youtube:before { content: "\f167"; } -.icon-xing:before { +.fa-xing:before { content: "\f168"; } -.icon-xing-sign:before { +.fa-xing-square:before { content: "\f169"; } -.icon-youtube-play:before { +.fa-youtube-play:before { content: "\f16a"; } -.icon-dropbox:before { +.fa-dropbox:before { content: "\f16b"; } -.icon-stackexchange:before { +.fa-stack-overflow:before { content: "\f16c"; } -.icon-instagram:before { +.fa-instagram:before { content: "\f16d"; } -.icon-flickr:before { +.fa-flickr:before { content: "\f16e"; } -.icon-adn:before { +.fa-adn:before { content: "\f170"; } -.icon-bitbucket:before { +.fa-bitbucket:before { content: "\f171"; } -.icon-bitbucket-sign:before { +.fa-bitbucket-square:before { content: "\f172"; } -.icon-tumblr:before { +.fa-tumblr:before { content: "\f173"; } -.icon-tumblr-sign:before { +.fa-tumblr-square:before { content: "\f174"; } -.icon-long-arrow-down:before { +.fa-long-arrow-down:before { content: "\f175"; } -.icon-long-arrow-up:before { +.fa-long-arrow-up:before { content: "\f176"; } -.icon-long-arrow-left:before { +.fa-long-arrow-left:before { content: "\f177"; } -.icon-long-arrow-right:before { +.fa-long-arrow-right:before { content: "\f178"; } -.icon-apple:before { +.fa-apple:before { content: "\f179"; } -.icon-windows:before { +.fa-windows:before { content: "\f17a"; } -.icon-android:before { +.fa-android:before { content: "\f17b"; } -.icon-linux:before { +.fa-linux:before { content: "\f17c"; } -.icon-dribbble:before { +.fa-dribbble:before { content: "\f17d"; } -.icon-skype:before { +.fa-skype:before { content: "\f17e"; } -.icon-foursquare:before { +.fa-foursquare:before { content: "\f180"; } -.icon-trello:before { +.fa-trello:before { content: "\f181"; } -.icon-female:before { +.fa-female:before { content: "\f182"; } -.icon-male:before { +.fa-male:before { content: "\f183"; } -.icon-gittip:before { +.fa-gittip:before { content: "\f184"; } -.icon-sun:before { +.fa-sun-o:before { content: "\f185"; } -.icon-moon:before { +.fa-moon-o:before { content: "\f186"; } -.icon-archive:before { +.fa-archive:before { content: "\f187"; } -.icon-bug:before { +.fa-bug:before { content: "\f188"; } -.icon-vk:before { +.fa-vk:before { content: "\f189"; } -.icon-weibo:before { +.fa-weibo:before { content: "\f18a"; } -.icon-renren:before { +.fa-renren:before { content: "\f18b"; } +.fa-pagelines:before { + content: "\f18c"; +} +.fa-stack-exchange:before { + content: "\f18d"; +} +.fa-arrow-circle-o-right:before { + content: "\f18e"; +} +.fa-arrow-circle-o-left:before { + content: "\f190"; +} +.fa-toggle-left:before, +.fa-caret-square-o-left:before { + content: "\f191"; +} +.fa-dot-circle-o:before { + content: "\f192"; +} +.fa-wheelchair:before { + content: "\f193"; +} +.fa-vimeo-square:before { + content: "\f194"; +} +.fa-turkish-lira:before, +.fa-try:before { + content: "\f195"; +} diff --git a/branding/fonts/font-awesome/css/font-awesome.min.css b/branding/fonts/font-awesome/css/font-awesome.min.css index 866437f..a93257a 100644 --- a/branding/fonts/font-awesome/css/font-awesome.min.css +++ b/branding/fonts/font-awesome/css/font-awesome.min.css @@ -1,403 +1,395 @@ -@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} -[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;} -.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;} -a [class^="icon-"],a [class*=" icon-"]{display:inline;} -[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;} -.icons-ul{margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;} -.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit;} -[class^="icon-"].hide,[class*=" icon-"].hide{display:none;} -.icon-muted{color:#eeeeee;} -.icon-light{color:#ffffff;} -.icon-dark{color:#333333;} -.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.icon-2x{font-size:2em;}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.icon-3x{font-size:3em;}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.icon-5x{font-size:5em;}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px;} -.pull-right{float:right;} -.pull-left{float:left;} -[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;} -[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;} -[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;} -.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;} -.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;} -.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;} -.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;} -.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;} -.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;} -.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;} -.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;} -.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;} -.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;} -.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;} -.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;} -.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;} -.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;} -a .icon-stack,a .icon-spin{display:inline-block;text-decoration:none;} -@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);} -.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);} -.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);} -.icon-flip-horizontal:before{-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1);} -.icon-flip-vertical:before{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1);} -a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block;} -.icon-glass:before{content:"\f000";} -.icon-music:before{content:"\f001";} -.icon-search:before{content:"\f002";} -.icon-envelope-alt:before{content:"\f003";} -.icon-heart:before{content:"\f004";} -.icon-star:before{content:"\f005";} -.icon-star-empty:before{content:"\f006";} -.icon-user:before{content:"\f007";} -.icon-film:before{content:"\f008";} -.icon-th-large:before{content:"\f009";} -.icon-th:before{content:"\f00a";} -.icon-th-list:before{content:"\f00b";} -.icon-ok:before{content:"\f00c";} -.icon-remove:before{content:"\f00d";} -.icon-zoom-in:before{content:"\f00e";} -.icon-zoom-out:before{content:"\f010";} -.icon-power-off:before,.icon-off:before{content:"\f011";} -.icon-signal:before{content:"\f012";} -.icon-gear:before,.icon-cog:before{content:"\f013";} -.icon-trash:before{content:"\f014";} -.icon-home:before{content:"\f015";} -.icon-file-alt:before{content:"\f016";} -.icon-time:before{content:"\f017";} -.icon-road:before{content:"\f018";} -.icon-download-alt:before{content:"\f019";} -.icon-download:before{content:"\f01a";} -.icon-upload:before{content:"\f01b";} -.icon-inbox:before{content:"\f01c";} -.icon-play-circle:before{content:"\f01d";} -.icon-rotate-right:before,.icon-repeat:before{content:"\f01e";} -.icon-refresh:before{content:"\f021";} -.icon-list-alt:before{content:"\f022";} -.icon-lock:before{content:"\f023";} -.icon-flag:before{content:"\f024";} -.icon-headphones:before{content:"\f025";} -.icon-volume-off:before{content:"\f026";} -.icon-volume-down:before{content:"\f027";} -.icon-volume-up:before{content:"\f028";} -.icon-qrcode:before{content:"\f029";} -.icon-barcode:before{content:"\f02a";} -.icon-tag:before{content:"\f02b";} -.icon-tags:before{content:"\f02c";} -.icon-book:before{content:"\f02d";} -.icon-bookmark:before{content:"\f02e";} -.icon-print:before{content:"\f02f";} -.icon-camera:before{content:"\f030";} -.icon-font:before{content:"\f031";} -.icon-bold:before{content:"\f032";} -.icon-italic:before{content:"\f033";} -.icon-text-height:before{content:"\f034";} -.icon-text-width:before{content:"\f035";} -.icon-align-left:before{content:"\f036";} -.icon-align-center:before{content:"\f037";} -.icon-align-right:before{content:"\f038";} -.icon-align-justify:before{content:"\f039";} -.icon-list:before{content:"\f03a";} -.icon-indent-left:before{content:"\f03b";} -.icon-indent-right:before{content:"\f03c";} -.icon-facetime-video:before{content:"\f03d";} -.icon-picture:before{content:"\f03e";} -.icon-pencil:before{content:"\f040";} -.icon-map-marker:before{content:"\f041";} -.icon-adjust:before{content:"\f042";} -.icon-tint:before{content:"\f043";} -.icon-edit:before{content:"\f044";} -.icon-share:before{content:"\f045";} -.icon-check:before{content:"\f046";} -.icon-move:before{content:"\f047";} -.icon-step-backward:before{content:"\f048";} -.icon-fast-backward:before{content:"\f049";} -.icon-backward:before{content:"\f04a";} -.icon-play:before{content:"\f04b";} -.icon-pause:before{content:"\f04c";} -.icon-stop:before{content:"\f04d";} -.icon-forward:before{content:"\f04e";} -.icon-fast-forward:before{content:"\f050";} -.icon-step-forward:before{content:"\f051";} -.icon-eject:before{content:"\f052";} -.icon-chevron-left:before{content:"\f053";} -.icon-chevron-right:before{content:"\f054";} -.icon-plus-sign:before{content:"\f055";} -.icon-minus-sign:before{content:"\f056";} -.icon-remove-sign:before{content:"\f057";} -.icon-ok-sign:before{content:"\f058";} -.icon-question-sign:before{content:"\f059";} -.icon-info-sign:before{content:"\f05a";} -.icon-screenshot:before{content:"\f05b";} -.icon-remove-circle:before{content:"\f05c";} -.icon-ok-circle:before{content:"\f05d";} -.icon-ban-circle:before{content:"\f05e";} -.icon-arrow-left:before{content:"\f060";} -.icon-arrow-right:before{content:"\f061";} -.icon-arrow-up:before{content:"\f062";} -.icon-arrow-down:before{content:"\f063";} -.icon-mail-forward:before,.icon-share-alt:before{content:"\f064";} -.icon-resize-full:before{content:"\f065";} -.icon-resize-small:before{content:"\f066";} -.icon-plus:before{content:"\f067";} -.icon-minus:before{content:"\f068";} -.icon-asterisk:before{content:"\f069";} -.icon-exclamation-sign:before{content:"\f06a";} -.icon-gift:before{content:"\f06b";} -.icon-leaf:before{content:"\f06c";} -.icon-fire:before{content:"\f06d";} -.icon-eye-open:before{content:"\f06e";} -.icon-eye-close:before{content:"\f070";} -.icon-warning-sign:before{content:"\f071";} -.icon-plane:before{content:"\f072";} -.icon-calendar:before{content:"\f073";} -.icon-random:before{content:"\f074";} -.icon-comment:before{content:"\f075";} -.icon-magnet:before{content:"\f076";} -.icon-chevron-up:before{content:"\f077";} -.icon-chevron-down:before{content:"\f078";} -.icon-retweet:before{content:"\f079";} -.icon-shopping-cart:before{content:"\f07a";} -.icon-folder-close:before{content:"\f07b";} -.icon-folder-open:before{content:"\f07c";} -.icon-resize-vertical:before{content:"\f07d";} -.icon-resize-horizontal:before{content:"\f07e";} -.icon-bar-chart:before{content:"\f080";} -.icon-twitter-sign:before{content:"\f081";} -.icon-facebook-sign:before{content:"\f082";} -.icon-camera-retro:before{content:"\f083";} -.icon-key:before{content:"\f084";} -.icon-gears:before,.icon-cogs:before{content:"\f085";} -.icon-comments:before{content:"\f086";} -.icon-thumbs-up-alt:before{content:"\f087";} -.icon-thumbs-down-alt:before{content:"\f088";} -.icon-star-half:before{content:"\f089";} -.icon-heart-empty:before{content:"\f08a";} -.icon-signout:before{content:"\f08b";} -.icon-linkedin-sign:before{content:"\f08c";} -.icon-pushpin:before{content:"\f08d";} -.icon-external-link:before{content:"\f08e";} -.icon-signin:before{content:"\f090";} -.icon-trophy:before{content:"\f091";} -.icon-github-sign:before{content:"\f092";} -.icon-upload-alt:before{content:"\f093";} -.icon-lemon:before{content:"\f094";} -.icon-phone:before{content:"\f095";} -.icon-unchecked:before,.icon-check-empty:before{content:"\f096";} -.icon-bookmark-empty:before{content:"\f097";} -.icon-phone-sign:before{content:"\f098";} -.icon-twitter:before{content:"\f099";} -.icon-facebook:before{content:"\f09a";} -.icon-github:before{content:"\f09b";} -.icon-unlock:before{content:"\f09c";} -.icon-credit-card:before{content:"\f09d";} -.icon-rss:before{content:"\f09e";} -.icon-hdd:before{content:"\f0a0";} -.icon-bullhorn:before{content:"\f0a1";} -.icon-bell:before{content:"\f0a2";} -.icon-certificate:before{content:"\f0a3";} -.icon-hand-right:before{content:"\f0a4";} -.icon-hand-left:before{content:"\f0a5";} -.icon-hand-up:before{content:"\f0a6";} -.icon-hand-down:before{content:"\f0a7";} -.icon-circle-arrow-left:before{content:"\f0a8";} -.icon-circle-arrow-right:before{content:"\f0a9";} -.icon-circle-arrow-up:before{content:"\f0aa";} -.icon-circle-arrow-down:before{content:"\f0ab";} -.icon-globe:before{content:"\f0ac";} -.icon-wrench:before{content:"\f0ad";} -.icon-tasks:before{content:"\f0ae";} -.icon-filter:before{content:"\f0b0";} -.icon-briefcase:before{content:"\f0b1";} -.icon-fullscreen:before{content:"\f0b2";} -.icon-group:before{content:"\f0c0";} -.icon-link:before{content:"\f0c1";} -.icon-cloud:before{content:"\f0c2";} -.icon-beaker:before{content:"\f0c3";} -.icon-cut:before{content:"\f0c4";} -.icon-copy:before{content:"\f0c5";} -.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6";} -.icon-save:before{content:"\f0c7";} -.icon-sign-blank:before{content:"\f0c8";} -.icon-reorder:before{content:"\f0c9";} -.icon-list-ul:before{content:"\f0ca";} -.icon-list-ol:before{content:"\f0cb";} -.icon-strikethrough:before{content:"\f0cc";} -.icon-underline:before{content:"\f0cd";} -.icon-table:before{content:"\f0ce";} -.icon-magic:before{content:"\f0d0";} -.icon-truck:before{content:"\f0d1";} -.icon-pinterest:before{content:"\f0d2";} -.icon-pinterest-sign:before{content:"\f0d3";} -.icon-google-plus-sign:before{content:"\f0d4";} -.icon-google-plus:before{content:"\f0d5";} -.icon-money:before{content:"\f0d6";} -.icon-caret-down:before{content:"\f0d7";} -.icon-caret-up:before{content:"\f0d8";} -.icon-caret-left:before{content:"\f0d9";} -.icon-caret-right:before{content:"\f0da";} -.icon-columns:before{content:"\f0db";} -.icon-sort:before{content:"\f0dc";} -.icon-sort-down:before{content:"\f0dd";} -.icon-sort-up:before{content:"\f0de";} -.icon-envelope:before{content:"\f0e0";} -.icon-linkedin:before{content:"\f0e1";} -.icon-rotate-left:before,.icon-undo:before{content:"\f0e2";} -.icon-legal:before{content:"\f0e3";} -.icon-dashboard:before{content:"\f0e4";} -.icon-comment-alt:before{content:"\f0e5";} -.icon-comments-alt:before{content:"\f0e6";} -.icon-bolt:before{content:"\f0e7";} -.icon-sitemap:before{content:"\f0e8";} -.icon-umbrella:before{content:"\f0e9";} -.icon-paste:before{content:"\f0ea";} -.icon-lightbulb:before{content:"\f0eb";} -.icon-exchange:before{content:"\f0ec";} -.icon-cloud-download:before{content:"\f0ed";} -.icon-cloud-upload:before{content:"\f0ee";} -.icon-user-md:before{content:"\f0f0";} -.icon-stethoscope:before{content:"\f0f1";} -.icon-suitcase:before{content:"\f0f2";} -.icon-bell-alt:before{content:"\f0f3";} -.icon-coffee:before{content:"\f0f4";} -.icon-food:before{content:"\f0f5";} -.icon-file-text-alt:before{content:"\f0f6";} -.icon-building:before{content:"\f0f7";} -.icon-hospital:before{content:"\f0f8";} -.icon-ambulance:before{content:"\f0f9";} -.icon-medkit:before{content:"\f0fa";} -.icon-fighter-jet:before{content:"\f0fb";} -.icon-beer:before{content:"\f0fc";} -.icon-h-sign:before{content:"\f0fd";} -.icon-plus-sign-alt:before{content:"\f0fe";} -.icon-double-angle-left:before{content:"\f100";} -.icon-double-angle-right:before{content:"\f101";} -.icon-double-angle-up:before{content:"\f102";} -.icon-double-angle-down:before{content:"\f103";} -.icon-angle-left:before{content:"\f104";} -.icon-angle-right:before{content:"\f105";} -.icon-angle-up:before{content:"\f106";} -.icon-angle-down:before{content:"\f107";} -.icon-desktop:before{content:"\f108";} -.icon-laptop:before{content:"\f109";} -.icon-tablet:before{content:"\f10a";} -.icon-mobile-phone:before{content:"\f10b";} -.icon-circle-blank:before{content:"\f10c";} -.icon-quote-left:before{content:"\f10d";} -.icon-quote-right:before{content:"\f10e";} -.icon-spinner:before{content:"\f110";} -.icon-circle:before{content:"\f111";} -.icon-mail-reply:before,.icon-reply:before{content:"\f112";} -.icon-github-alt:before{content:"\f113";} -.icon-folder-close-alt:before{content:"\f114";} -.icon-folder-open-alt:before{content:"\f115";} -.icon-expand-alt:before{content:"\f116";} -.icon-collapse-alt:before{content:"\f117";} -.icon-smile:before{content:"\f118";} -.icon-frown:before{content:"\f119";} -.icon-meh:before{content:"\f11a";} -.icon-gamepad:before{content:"\f11b";} -.icon-keyboard:before{content:"\f11c";} -.icon-flag-alt:before{content:"\f11d";} -.icon-flag-checkered:before{content:"\f11e";} -.icon-terminal:before{content:"\f120";} -.icon-code:before{content:"\f121";} -.icon-reply-all:before{content:"\f122";} -.icon-mail-reply-all:before{content:"\f122";} -.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123";} -.icon-location-arrow:before{content:"\f124";} -.icon-crop:before{content:"\f125";} -.icon-code-fork:before{content:"\f126";} -.icon-unlink:before{content:"\f127";} -.icon-question:before{content:"\f128";} -.icon-info:before{content:"\f129";} -.icon-exclamation:before{content:"\f12a";} -.icon-superscript:before{content:"\f12b";} -.icon-subscript:before{content:"\f12c";} -.icon-eraser:before{content:"\f12d";} -.icon-puzzle-piece:before{content:"\f12e";} -.icon-microphone:before{content:"\f130";} -.icon-microphone-off:before{content:"\f131";} -.icon-shield:before{content:"\f132";} -.icon-calendar-empty:before{content:"\f133";} -.icon-fire-extinguisher:before{content:"\f134";} -.icon-rocket:before{content:"\f135";} -.icon-maxcdn:before{content:"\f136";} -.icon-chevron-sign-left:before{content:"\f137";} -.icon-chevron-sign-right:before{content:"\f138";} -.icon-chevron-sign-up:before{content:"\f139";} -.icon-chevron-sign-down:before{content:"\f13a";} -.icon-html5:before{content:"\f13b";} -.icon-css3:before{content:"\f13c";} -.icon-anchor:before{content:"\f13d";} -.icon-unlock-alt:before{content:"\f13e";} -.icon-bullseye:before{content:"\f140";} -.icon-ellipsis-horizontal:before{content:"\f141";} -.icon-ellipsis-vertical:before{content:"\f142";} -.icon-rss-sign:before{content:"\f143";} -.icon-play-sign:before{content:"\f144";} -.icon-ticket:before{content:"\f145";} -.icon-minus-sign-alt:before{content:"\f146";} -.icon-check-minus:before{content:"\f147";} -.icon-level-up:before{content:"\f148";} -.icon-level-down:before{content:"\f149";} -.icon-check-sign:before{content:"\f14a";} -.icon-edit-sign:before{content:"\f14b";} -.icon-external-link-sign:before{content:"\f14c";} -.icon-share-sign:before{content:"\f14d";} -.icon-compass:before{content:"\f14e";} -.icon-collapse:before{content:"\f150";} -.icon-collapse-top:before{content:"\f151";} -.icon-expand:before{content:"\f152";} -.icon-euro:before,.icon-eur:before{content:"\f153";} -.icon-gbp:before{content:"\f154";} -.icon-dollar:before,.icon-usd:before{content:"\f155";} -.icon-rupee:before,.icon-inr:before{content:"\f156";} -.icon-yen:before,.icon-jpy:before{content:"\f157";} -.icon-renminbi:before,.icon-cny:before{content:"\f158";} -.icon-won:before,.icon-krw:before{content:"\f159";} -.icon-bitcoin:before,.icon-btc:before{content:"\f15a";} -.icon-file:before{content:"\f15b";} -.icon-file-text:before{content:"\f15c";} -.icon-sort-by-alphabet:before{content:"\f15d";} -.icon-sort-by-alphabet-alt:before{content:"\f15e";} -.icon-sort-by-attributes:before{content:"\f160";} -.icon-sort-by-attributes-alt:before{content:"\f161";} -.icon-sort-by-order:before{content:"\f162";} -.icon-sort-by-order-alt:before{content:"\f163";} -.icon-thumbs-up:before{content:"\f164";} -.icon-thumbs-down:before{content:"\f165";} -.icon-youtube-sign:before{content:"\f166";} -.icon-youtube:before{content:"\f167";} -.icon-xing:before{content:"\f168";} -.icon-xing-sign:before{content:"\f169";} -.icon-youtube-play:before{content:"\f16a";} -.icon-dropbox:before{content:"\f16b";} -.icon-stackexchange:before{content:"\f16c";} -.icon-instagram:before{content:"\f16d";} -.icon-flickr:before{content:"\f16e";} -.icon-adn:before{content:"\f170";} -.icon-bitbucket:before{content:"\f171";} -.icon-bitbucket-sign:before{content:"\f172";} -.icon-tumblr:before{content:"\f173";} -.icon-tumblr-sign:before{content:"\f174";} -.icon-long-arrow-down:before{content:"\f175";} -.icon-long-arrow-up:before{content:"\f176";} -.icon-long-arrow-left:before{content:"\f177";} -.icon-long-arrow-right:before{content:"\f178";} -.icon-apple:before{content:"\f179";} -.icon-windows:before{content:"\f17a";} -.icon-android:before{content:"\f17b";} -.icon-linux:before{content:"\f17c";} -.icon-dribbble:before{content:"\f17d";} -.icon-skype:before{content:"\f17e";} -.icon-foursquare:before{content:"\f180";} -.icon-trello:before{content:"\f181";} -.icon-female:before{content:"\f182";} -.icon-male:before{content:"\f183";} -.icon-gittip:before{content:"\f184";} -.icon-sun:before{content:"\f185";} -.icon-moon:before{content:"\f186";} -.icon-archive:before{content:"\f187";} -.icon-bug:before{content:"\f188";} -.icon-vk:before{content:"\f189";} -.icon-weibo:before{content:"\f18a";} -.icon-renren:before{content:"\f18b";} +@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.1');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.1') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} +.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%} +.fa-2x{font-size:2em} +.fa-3x{font-size:3em} +.fa-4x{font-size:4em} +.fa-5x{font-size:5em} +.fa-fw{width:1.2857142857142858em;text-align:center} +.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative} +.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em} +.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em} +.pull-right{float:right} +.pull-left{float:left} +.fa.pull-left{margin-right:.3em} +.fa.pull-right{margin-left:.3em} +.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear} +@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)} 100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)} 100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)} 100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)} 100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)} 100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)} +.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)} +.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)} +.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)} +.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)} +.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle} +.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center} +.fa-stack-1x{line-height:inherit} +.fa-stack-2x{font-size:2em} +.fa-inverse{color:#fff} +.fa-glass:before{content:"\f000"} +.fa-music:before{content:"\f001"} +.fa-search:before{content:"\f002"} +.fa-envelope-o:before{content:"\f003"} +.fa-heart:before{content:"\f004"} +.fa-star:before{content:"\f005"} +.fa-star-o:before{content:"\f006"} +.fa-user:before{content:"\f007"} +.fa-film:before{content:"\f008"} +.fa-th-large:before{content:"\f009"} +.fa-th:before{content:"\f00a"} +.fa-th-list:before{content:"\f00b"} +.fa-check:before{content:"\f00c"} +.fa-times:before{content:"\f00d"} +.fa-search-plus:before{content:"\f00e"} +.fa-search-minus:before{content:"\f010"} +.fa-power-off:before{content:"\f011"} +.fa-signal:before{content:"\f012"} +.fa-gear:before,.fa-cog:before{content:"\f013"} +.fa-trash-o:before{content:"\f014"} +.fa-home:before{content:"\f015"} +.fa-file-o:before{content:"\f016"} +.fa-clock-o:before{content:"\f017"} +.fa-road:before{content:"\f018"} +.fa-download:before{content:"\f019"} +.fa-arrow-circle-o-down:before{content:"\f01a"} +.fa-arrow-circle-o-up:before{content:"\f01b"} +.fa-inbox:before{content:"\f01c"} +.fa-play-circle-o:before{content:"\f01d"} +.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"} +.fa-refresh:before{content:"\f021"} +.fa-list-alt:before{content:"\f022"} +.fa-lock:before{content:"\f023"} +.fa-flag:before{content:"\f024"} +.fa-headphones:before{content:"\f025"} +.fa-volume-off:before{content:"\f026"} +.fa-volume-down:before{content:"\f027"} +.fa-volume-up:before{content:"\f028"} +.fa-qrcode:before{content:"\f029"} +.fa-barcode:before{content:"\f02a"} +.fa-tag:before{content:"\f02b"} +.fa-tags:before{content:"\f02c"} +.fa-book:before{content:"\f02d"} +.fa-bookmark:before{content:"\f02e"} +.fa-print:before{content:"\f02f"} +.fa-camera:before{content:"\f030"} +.fa-font:before{content:"\f031"} +.fa-bold:before{content:"\f032"} +.fa-italic:before{content:"\f033"} +.fa-text-height:before{content:"\f034"} +.fa-text-width:before{content:"\f035"} +.fa-align-left:before{content:"\f036"} +.fa-align-center:before{content:"\f037"} +.fa-align-right:before{content:"\f038"} +.fa-align-justify:before{content:"\f039"} +.fa-list:before{content:"\f03a"} +.fa-dedent:before,.fa-outdent:before{content:"\f03b"} +.fa-indent:before{content:"\f03c"} +.fa-video-camera:before{content:"\f03d"} +.fa-picture-o:before{content:"\f03e"} +.fa-pencil:before{content:"\f040"} +.fa-map-marker:before{content:"\f041"} +.fa-adjust:before{content:"\f042"} +.fa-tint:before{content:"\f043"} +.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"} +.fa-share-square-o:before{content:"\f045"} +.fa-check-square-o:before{content:"\f046"} +.fa-move:before{content:"\f047"} +.fa-step-backward:before{content:"\f048"} +.fa-fast-backward:before{content:"\f049"} +.fa-backward:before{content:"\f04a"} +.fa-play:before{content:"\f04b"} +.fa-pause:before{content:"\f04c"} +.fa-stop:before{content:"\f04d"} +.fa-forward:before{content:"\f04e"} +.fa-fast-forward:before{content:"\f050"} +.fa-step-forward:before{content:"\f051"} +.fa-eject:before{content:"\f052"} +.fa-chevron-left:before{content:"\f053"} +.fa-chevron-right:before{content:"\f054"} +.fa-plus-circle:before{content:"\f055"} +.fa-minus-circle:before{content:"\f056"} +.fa-times-circle:before{content:"\f057"} +.fa-check-circle:before{content:"\f058"} +.fa-question-circle:before{content:"\f059"} +.fa-info-circle:before{content:"\f05a"} +.fa-crosshairs:before{content:"\f05b"} +.fa-times-circle-o:before{content:"\f05c"} +.fa-check-circle-o:before{content:"\f05d"} +.fa-ban:before{content:"\f05e"} +.fa-arrow-left:before{content:"\f060"} +.fa-arrow-right:before{content:"\f061"} +.fa-arrow-up:before{content:"\f062"} +.fa-arrow-down:before{content:"\f063"} +.fa-mail-forward:before,.fa-share:before{content:"\f064"} +.fa-resize-full:before{content:"\f065"} +.fa-resize-small:before{content:"\f066"} +.fa-plus:before{content:"\f067"} +.fa-minus:before{content:"\f068"} +.fa-asterisk:before{content:"\f069"} +.fa-exclamation-circle:before{content:"\f06a"} +.fa-gift:before{content:"\f06b"} +.fa-leaf:before{content:"\f06c"} +.fa-fire:before{content:"\f06d"} +.fa-eye:before{content:"\f06e"} +.fa-eye-slash:before{content:"\f070"} +.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"} +.fa-plane:before{content:"\f072"} +.fa-calendar:before{content:"\f073"} +.fa-random:before{content:"\f074"} +.fa-comment:before{content:"\f075"} +.fa-magnet:before{content:"\f076"} +.fa-chevron-up:before{content:"\f077"} +.fa-chevron-down:before{content:"\f078"} +.fa-retweet:before{content:"\f079"} +.fa-shopping-cart:before{content:"\f07a"} +.fa-folder:before{content:"\f07b"} +.fa-folder-open:before{content:"\f07c"} +.fa-resize-vertical:before{content:"\f07d"} +.fa-resize-horizontal:before{content:"\f07e"} +.fa-bar-chart-o:before{content:"\f080"} +.fa-twitter-square:before{content:"\f081"} +.fa-facebook-square:before{content:"\f082"} +.fa-camera-retro:before{content:"\f083"} +.fa-key:before{content:"\f084"} +.fa-gears:before,.fa-cogs:before{content:"\f085"} +.fa-comments:before{content:"\f086"} +.fa-thumbs-o-up:before{content:"\f087"} +.fa-thumbs-o-down:before{content:"\f088"} +.fa-star-half:before{content:"\f089"} +.fa-heart-o:before{content:"\f08a"} +.fa-sign-out:before{content:"\f08b"} +.fa-linkedin-square:before{content:"\f08c"} +.fa-thumb-tack:before{content:"\f08d"} +.fa-external-link:before{content:"\f08e"} +.fa-sign-in:before{content:"\f090"} +.fa-trophy:before{content:"\f091"} +.fa-github-square:before{content:"\f092"} +.fa-upload:before{content:"\f093"} +.fa-lemon-o:before{content:"\f094"} +.fa-phone:before{content:"\f095"} +.fa-square-o:before{content:"\f096"} +.fa-bookmark-o:before{content:"\f097"} +.fa-phone-square:before{content:"\f098"} +.fa-twitter:before{content:"\f099"} +.fa-facebook:before{content:"\f09a"} +.fa-github:before{content:"\f09b"} +.fa-unlock:before{content:"\f09c"} +.fa-credit-card:before{content:"\f09d"} +.fa-rss:before{content:"\f09e"} +.fa-hdd-o:before{content:"\f0a0"} +.fa-bullhorn:before{content:"\f0a1"} +.fa-bell:before{content:"\f0f3"} +.fa-certificate:before{content:"\f0a3"} +.fa-hand-o-right:before{content:"\f0a4"} +.fa-hand-o-left:before{content:"\f0a5"} +.fa-hand-o-up:before{content:"\f0a6"} +.fa-hand-o-down:before{content:"\f0a7"} +.fa-arrow-circle-left:before{content:"\f0a8"} +.fa-arrow-circle-right:before{content:"\f0a9"} +.fa-arrow-circle-up:before{content:"\f0aa"} +.fa-arrow-circle-down:before{content:"\f0ab"} +.fa-globe:before{content:"\f0ac"} +.fa-wrench:before{content:"\f0ad"} +.fa-tasks:before{content:"\f0ae"} +.fa-filter:before{content:"\f0b0"} +.fa-briefcase:before{content:"\f0b1"} +.fa-fullscreen:before{content:"\f0b2"} +.fa-group:before{content:"\f0c0"} +.fa-chain:before,.fa-link:before{content:"\f0c1"} +.fa-cloud:before{content:"\f0c2"} +.fa-flask:before{content:"\f0c3"} +.fa-cut:before,.fa-scissors:before{content:"\f0c4"} +.fa-copy:before,.fa-files-o:before{content:"\f0c5"} +.fa-paperclip:before{content:"\f0c6"} +.fa-save:before,.fa-floppy-o:before{content:"\f0c7"} +.fa-square:before{content:"\f0c8"} +.fa-reorder:before{content:"\f0c9"} +.fa-list-ul:before{content:"\f0ca"} +.fa-list-ol:before{content:"\f0cb"} +.fa-strikethrough:before{content:"\f0cc"} +.fa-underline:before{content:"\f0cd"} +.fa-table:before{content:"\f0ce"} +.fa-magic:before{content:"\f0d0"} +.fa-truck:before{content:"\f0d1"} +.fa-pinterest:before{content:"\f0d2"} +.fa-pinterest-square:before{content:"\f0d3"} +.fa-google-plus-square:before{content:"\f0d4"} +.fa-google-plus:before{content:"\f0d5"} +.fa-money:before{content:"\f0d6"} +.fa-caret-down:before{content:"\f0d7"} +.fa-caret-up:before{content:"\f0d8"} +.fa-caret-left:before{content:"\f0d9"} +.fa-caret-right:before{content:"\f0da"} +.fa-columns:before{content:"\f0db"} +.fa-unsorted:before,.fa-sort:before{content:"\f0dc"} +.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"} +.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"} +.fa-envelope:before{content:"\f0e0"} +.fa-linkedin:before{content:"\f0e1"} +.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"} +.fa-legal:before,.fa-gavel:before{content:"\f0e3"} +.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"} +.fa-comment-o:before{content:"\f0e5"} +.fa-comments-o:before{content:"\f0e6"} +.fa-flash:before,.fa-bolt:before{content:"\f0e7"} +.fa-sitemap:before{content:"\f0e8"} +.fa-umbrella:before{content:"\f0e9"} +.fa-paste:before,.fa-clipboard:before{content:"\f0ea"} +.fa-lightbulb-o:before{content:"\f0eb"} +.fa-exchange:before{content:"\f0ec"} +.fa-cloud-download:before{content:"\f0ed"} +.fa-cloud-upload:before{content:"\f0ee"} +.fa-user-md:before{content:"\f0f0"} +.fa-stethoscope:before{content:"\f0f1"} +.fa-suitcase:before{content:"\f0f2"} +.fa-bell-o:before{content:"\f0a2"} +.fa-coffee:before{content:"\f0f4"} +.fa-cutlery:before{content:"\f0f5"} +.fa-file-text-o:before{content:"\f0f6"} +.fa-building:before{content:"\f0f7"} +.fa-hospital:before{content:"\f0f8"} +.fa-ambulance:before{content:"\f0f9"} +.fa-medkit:before{content:"\f0fa"} +.fa-fighter-jet:before{content:"\f0fb"} +.fa-beer:before{content:"\f0fc"} +.fa-h-square:before{content:"\f0fd"} +.fa-plus-square:before{content:"\f0fe"} +.fa-angle-double-left:before{content:"\f100"} +.fa-angle-double-right:before{content:"\f101"} +.fa-angle-double-up:before{content:"\f102"} +.fa-angle-double-down:before{content:"\f103"} +.fa-angle-left:before{content:"\f104"} +.fa-angle-right:before{content:"\f105"} +.fa-angle-up:before{content:"\f106"} +.fa-angle-down:before{content:"\f107"} +.fa-desktop:before{content:"\f108"} +.fa-laptop:before{content:"\f109"} +.fa-tablet:before{content:"\f10a"} +.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"} +.fa-circle-o:before{content:"\f10c"} +.fa-quote-left:before{content:"\f10d"} +.fa-quote-right:before{content:"\f10e"} +.fa-spinner:before{content:"\f110"} +.fa-circle:before{content:"\f111"} +.fa-mail-reply:before,.fa-reply:before{content:"\f112"} +.fa-github-alt:before{content:"\f113"} +.fa-folder-o:before{content:"\f114"} +.fa-folder-open-o:before{content:"\f115"} +.fa-expand-o:before{content:"\f116"} +.fa-collapse-o:before{content:"\f117"} +.fa-smile-o:before{content:"\f118"} +.fa-frown-o:before{content:"\f119"} +.fa-meh-o:before{content:"\f11a"} +.fa-gamepad:before{content:"\f11b"} +.fa-keyboard-o:before{content:"\f11c"} +.fa-flag-o:before{content:"\f11d"} +.fa-flag-checkered:before{content:"\f11e"} +.fa-terminal:before{content:"\f120"} +.fa-code:before{content:"\f121"} +.fa-reply-all:before{content:"\f122"} +.fa-mail-reply-all:before{content:"\f122"} +.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"} +.fa-location-arrow:before{content:"\f124"} +.fa-crop:before{content:"\f125"} +.fa-code-fork:before{content:"\f126"} +.fa-unlink:before,.fa-chain-broken:before{content:"\f127"} +.fa-question:before{content:"\f128"} +.fa-info:before{content:"\f129"} +.fa-exclamation:before{content:"\f12a"} +.fa-superscript:before{content:"\f12b"} +.fa-subscript:before{content:"\f12c"} +.fa-eraser:before{content:"\f12d"} +.fa-puzzle-piece:before{content:"\f12e"} +.fa-microphone:before{content:"\f130"} +.fa-microphone-slash:before{content:"\f131"} +.fa-shield:before{content:"\f132"} +.fa-calendar-o:before{content:"\f133"} +.fa-fire-extinguisher:before{content:"\f134"} +.fa-rocket:before{content:"\f135"} +.fa-maxcdn:before{content:"\f136"} +.fa-chevron-circle-left:before{content:"\f137"} +.fa-chevron-circle-right:before{content:"\f138"} +.fa-chevron-circle-up:before{content:"\f139"} +.fa-chevron-circle-down:before{content:"\f13a"} +.fa-html5:before{content:"\f13b"} +.fa-css3:before{content:"\f13c"} +.fa-anchor:before{content:"\f13d"} +.fa-unlock-o:before{content:"\f13e"} +.fa-bullseye:before{content:"\f140"} +.fa-ellipsis-horizontal:before{content:"\f141"} +.fa-ellipsis-vertical:before{content:"\f142"} +.fa-rss-square:before{content:"\f143"} +.fa-play-circle:before{content:"\f144"} +.fa-ticket:before{content:"\f145"} +.fa-minus-square:before{content:"\f146"} +.fa-minus-square-o:before{content:"\f147"} +.fa-level-up:before{content:"\f148"} +.fa-level-down:before{content:"\f149"} +.fa-check-square:before{content:"\f14a"} +.fa-pencil-square:before{content:"\f14b"} +.fa-external-link-square:before{content:"\f14c"} +.fa-share-square:before{content:"\f14d"} +.fa-compass:before{content:"\f14e"} +.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"} +.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"} +.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"} +.fa-euro:before,.fa-eur:before{content:"\f153"} +.fa-gbp:before{content:"\f154"} +.fa-dollar:before,.fa-usd:before{content:"\f155"} +.fa-rupee:before,.fa-inr:before{content:"\f156"} +.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"} +.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"} +.fa-won:before,.fa-krw:before{content:"\f159"} +.fa-bitcoin:before,.fa-btc:before{content:"\f15a"} +.fa-file:before{content:"\f15b"} +.fa-file-text:before{content:"\f15c"} +.fa-sort-alpha-asc:before{content:"\f15d"} +.fa-sort-alpha-desc:before{content:"\f15e"} +.fa-sort-amount-asc:before{content:"\f160"} +.fa-sort-amount-desc:before{content:"\f161"} +.fa-sort-numeric-asc:before{content:"\f162"} +.fa-sort-numeric-desc:before{content:"\f163"} +.fa-thumbs-up:before{content:"\f164"} +.fa-thumbs-down:before{content:"\f165"} +.fa-youtube-square:before{content:"\f166"} +.fa-youtube:before{content:"\f167"} +.fa-xing:before{content:"\f168"} +.fa-xing-square:before{content:"\f169"} +.fa-youtube-play:before{content:"\f16a"} +.fa-dropbox:before{content:"\f16b"} +.fa-stack-overflow:before{content:"\f16c"} +.fa-instagram:before{content:"\f16d"} +.fa-flickr:before{content:"\f16e"} +.fa-adn:before{content:"\f170"} +.fa-bitbucket:before{content:"\f171"} +.fa-bitbucket-square:before{content:"\f172"} +.fa-tumblr:before{content:"\f173"} +.fa-tumblr-square:before{content:"\f174"} +.fa-long-arrow-down:before{content:"\f175"} +.fa-long-arrow-up:before{content:"\f176"} +.fa-long-arrow-left:before{content:"\f177"} +.fa-long-arrow-right:before{content:"\f178"} +.fa-apple:before{content:"\f179"} +.fa-windows:before{content:"\f17a"} +.fa-android:before{content:"\f17b"} +.fa-linux:before{content:"\f17c"} +.fa-dribbble:before{content:"\f17d"} +.fa-skype:before{content:"\f17e"} +.fa-foursquare:before{content:"\f180"} +.fa-trello:before{content:"\f181"} +.fa-female:before{content:"\f182"} +.fa-male:before{content:"\f183"} +.fa-gittip:before{content:"\f184"} +.fa-sun-o:before{content:"\f185"} +.fa-moon-o:before{content:"\f186"} +.fa-archive:before{content:"\f187"} +.fa-bug:before{content:"\f188"} +.fa-vk:before{content:"\f189"} +.fa-weibo:before{content:"\f18a"} +.fa-renren:before{content:"\f18b"} +.fa-pagelines:before{content:"\f18c"} +.fa-stack-exchange:before{content:"\f18d"} +.fa-arrow-circle-o-right:before{content:"\f18e"} +.fa-arrow-circle-o-left:before{content:"\f190"} +.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"} +.fa-dot-circle-o:before{content:"\f192"} +.fa-wheelchair:before{content:"\f193"} +.fa-vimeo-square:before{content:"\f194"} +.fa-turkish-lira:before,.fa-try:before{content:"\f195"} diff --git a/branding/fonts/font-awesome/font/FontAwesome.otf b/branding/fonts/font-awesome/font/FontAwesome.otf deleted file mode 100644 index 7012545..0000000 Binary files a/branding/fonts/font-awesome/font/FontAwesome.otf and /dev/null differ diff --git a/branding/fonts/font-awesome/font/fontawesome-webfont.eot b/branding/fonts/font-awesome/font/fontawesome-webfont.eot deleted file mode 100755 index 0662cb9..0000000 Binary files a/branding/fonts/font-awesome/font/fontawesome-webfont.eot and /dev/null differ diff --git a/branding/fonts/font-awesome/font/fontawesome-webfont.svg b/branding/fonts/font-awesome/font/fontawesome-webfont.svg deleted file mode 100755 index 2edb4ec..0000000 --- a/branding/fonts/font-awesome/font/fontawesome-webfont.svg +++ /dev/null @@ -1,399 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata></metadata> -<defs> -<font id="fontawesomeregular" horiz-adv-x="1536" > -<font-face units-per-em="1792" ascent="1536" descent="-256" /> -<missing-glyph horiz-adv-x="448" /> -<glyph unicode=" " horiz-adv-x="448" /> -<glyph unicode="	" horiz-adv-x="448" /> -<glyph unicode=" " horiz-adv-x="448" /> -<glyph unicode="¨" horiz-adv-x="1792" /> -<glyph unicode="©" horiz-adv-x="1792" /> -<glyph unicode="®" horiz-adv-x="1792" /> -<glyph unicode="´" horiz-adv-x="1792" /> -<glyph unicode="Æ" horiz-adv-x="1792" /> -<glyph unicode=" " horiz-adv-x="768" /> -<glyph unicode=" " /> -<glyph unicode=" " horiz-adv-x="768" /> -<glyph unicode=" " /> -<glyph unicode=" " horiz-adv-x="512" /> -<glyph unicode=" " horiz-adv-x="384" /> -<glyph unicode=" " horiz-adv-x="256" /> -<glyph unicode=" " horiz-adv-x="256" /> -<glyph unicode=" " horiz-adv-x="192" /> -<glyph unicode=" " horiz-adv-x="307" /> -<glyph unicode=" " horiz-adv-x="85" /> -<glyph unicode=" " horiz-adv-x="307" /> -<glyph unicode=" " horiz-adv-x="384" /> -<glyph unicode="™" horiz-adv-x="1792" /> -<glyph unicode="∞" horiz-adv-x="1792" /> -<glyph unicode="≠" horiz-adv-x="1792" /> -<glyph unicode="" horiz-adv-x="500" d="M0 0z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" /> -<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" /> -<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> -<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> -<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " /> -<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" /> -<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" /> -<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" /> -<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " /> -<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" /> -<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" /> -<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" /> -<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q -66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" /> -<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" /> -<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" /> -<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" /> -<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" /> -<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> -<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" /> -<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" /> -<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" /> -<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" /> -<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9. 5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" /> -<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> -<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" /> -<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" /> -<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" /> -<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" /> -<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> -<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> -<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" /> -<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" /> -<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" /> -<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" /> -<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" /> -<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" /> -<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" /> -<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" /> -<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" /> -<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" /> -<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" /> -<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" /> -<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " /> -<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" /> -<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> -<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" /> -<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " /> -<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" /> -<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> -<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" /> -<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" /> -<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" /> -<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" /> -<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" /> -<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" /> -<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" /> -<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" /> -<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 - 103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" /> -<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> -<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" /> -<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" /> -<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" /> -<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" /> -<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> -<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" /> -<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" /> -<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" /> -<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" /> -<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 - 2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14 t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" /> -<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" /> -<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" /> -<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " /> -<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " /> -<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" /> -<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l- 128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" /> -<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" /> -<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -2 2.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" /> -<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" /> -<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 4 7t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" /> -<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" /> -<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" /> -<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" /> -<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" /> -<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" /> -<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" /> -<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" /> -<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" /> -<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" /> -<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" /> -<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" /> -<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" /> -<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" /> -<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t- 9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h- 64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t -9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" /> -<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" /> -<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> -<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" /> -<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" /> -<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> -<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" /> -<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" /> -<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" /> -<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" /> -<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " /> -<glyph unicode="" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" /> -<glyph unicode="" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" /> -<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" /> -<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> -<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> -<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" /> -<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" /> -<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" /> -<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" /> -<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" /> -<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" /> -<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" /> -<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" /> -<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> -<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" /> -<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" /> -<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" /> -<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" /> -<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> -<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> -<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" /> -<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" /> -<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" /> -<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" /> -<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" /> -<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" /> -<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" /> -<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" /> -<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" /> -<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" /> -<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" /> -<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" /> -<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" /> -<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" /> -<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" /> -<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" /> -<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" /> -<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" /> -<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " /> -<glyph unicode="" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> -<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" /> -<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" /> -<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" /> -<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" /> -<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" /> -<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 3 7 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 - 6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" /> -<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" /> -<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" /> -<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" /> -<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" /> -<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" /> -<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" /> -<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" /> -<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" /> -<glyph unicode="" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" /> -<glyph unicode="" horiz-adv-x="1792" /> -<glyph unicode="" horiz-adv-x="1792" /> -<glyph unicode="" horiz-adv-x="1792" /> -<glyph unicode="" horiz-adv-x="1792" /> -</font> -</defs></svg> \ No newline at end of file diff --git a/branding/fonts/font-awesome/font/fontawesome-webfont.ttf b/branding/fonts/font-awesome/font/fontawesome-webfont.ttf deleted file mode 100755 index d365924..0000000 Binary files a/branding/fonts/font-awesome/font/fontawesome-webfont.ttf and /dev/null differ diff --git a/branding/fonts/font-awesome/font/fontawesome-webfont.woff b/branding/fonts/font-awesome/font/fontawesome-webfont.woff deleted file mode 100755 index b9bd17e..0000000 Binary files a/branding/fonts/font-awesome/font/fontawesome-webfont.woff and /dev/null differ diff --git a/branding/fonts/font-awesome/fonts/FontAwesome.otf b/branding/fonts/font-awesome/fonts/FontAwesome.otf new file mode 100644 index 0000000..4dfe30a Binary files /dev/null and b/branding/fonts/font-awesome/fonts/FontAwesome.otf differ diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot b/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot new file mode 100755 index 0000000..e054c93 Binary files /dev/null and b/branding/fonts/font-awesome/fonts/fontawesome-webfont.eot differ diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg b/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg new file mode 100755 index 0000000..36d43b8 --- /dev/null +++ b/branding/fonts/font-awesome/fonts/fontawesome-webfont.svg @@ -0,0 +1,414 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata></metadata> +<defs> +<font id="fontawesomeregular" horiz-adv-x="1536" > +<font-face units-per-em="1792" ascent="1536" descent="-256" /> +<missing-glyph horiz-adv-x="448" /> +<glyph unicode=" " horiz-adv-x="448" /> +<glyph unicode="	" horiz-adv-x="448" /> +<glyph unicode=" " horiz-adv-x="448" /> +<glyph unicode="¨" horiz-adv-x="1792" /> +<glyph unicode="©" horiz-adv-x="1792" /> +<glyph unicode="®" horiz-adv-x="1792" /> +<glyph unicode="´" horiz-adv-x="1792" /> +<glyph unicode="Æ" horiz-adv-x="1792" /> +<glyph unicode=" " horiz-adv-x="768" /> +<glyph unicode=" " /> +<glyph unicode=" " horiz-adv-x="768" /> +<glyph unicode=" " /> +<glyph unicode=" " horiz-adv-x="512" /> +<glyph unicode=" " horiz-adv-x="384" /> +<glyph unicode=" " horiz-adv-x="256" /> +<glyph unicode=" " horiz-adv-x="256" /> +<glyph unicode=" " horiz-adv-x="192" /> +<glyph unicode=" " horiz-adv-x="307" /> +<glyph unicode=" " horiz-adv-x="85" /> +<glyph unicode=" " horiz-adv-x="307" /> +<glyph unicode=" " horiz-adv-x="384" /> +<glyph unicode="™" horiz-adv-x="1792" /> +<glyph unicode="∞" horiz-adv-x="1792" /> +<glyph unicode="≠" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="500" d="M0 0z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" /> +<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " /> +<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" /> +<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " /> +<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" /> +<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" /> +<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" /> +<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q -66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" /> +<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" /> +<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" /> +<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" /> +<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> +<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" /> +<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" /> +<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" /> +<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" /> +<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9. 5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" /> +<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" /> +<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" /> +<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" /> +<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" /> +<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" /> +<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" /> +<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" /> +<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" /> +<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" /> +<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" /> +<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" /> +<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" /> +<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" /> +<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " /> +<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" /> +<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" /> +<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" /> +<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" /> +<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" /> +<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" /> +<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" /> +<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 - 103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" /> +<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> +<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" /> +<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" /> +<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" /> +<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" /> +<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> +<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" /> +<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 - 2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14 t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" /> +<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " /> +<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " /> +<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" /> +<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l- 128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" /> +<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" /> +<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -2 2.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" /> +<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" /> +<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 4 7t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" /> +<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" /> +<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" /> +<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" /> +<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" /> +<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" /> +<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" /> +<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" /> +<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" /> +<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" /> +<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t- 9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h- 64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t -9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" /> +<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" /> +<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" /> +<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> +<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" /> +<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" /> +<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " /> +<glyph unicode="" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" /> +<glyph unicode="" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" /> +<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" /> +<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> +<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> +<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" /> +<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" /> +<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" /> +<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" /> +<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" /> +<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" /> +<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" /> +<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" /> +<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" /> +<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> +<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" /> +<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" /> +<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" /> +<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" /> +<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" /> +<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" /> +<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" /> +<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" /> +<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" /> +<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" /> +<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" /> +<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" /> +<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" /> +<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" /> +<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" /> +<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" /> +<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" /> +<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " /> +<glyph unicode="" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" /> +<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" /> +<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" /> +<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" /> +<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 3 7 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 - 6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" /> +<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" /> +<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" /> +<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" /> +<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" /> +<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " /> +<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" /> +<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +</font> +</defs></svg> \ No newline at end of file diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf b/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf new file mode 100755 index 0000000..7ec2e1d Binary files /dev/null and b/branding/fonts/font-awesome/fonts/fontawesome-webfont.ttf differ diff --git a/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff b/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff new file mode 100755 index 0000000..27d80b1 Binary files /dev/null and b/branding/fonts/font-awesome/fonts/fontawesome-webfont.woff differ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java index fb9c5d4..dc14bc7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java @@ -19,8 +19,8 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.dto.SystemCurrency; +import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.manager.system.SystemManager; @@ -64,7 +64,6 @@ public class SystemListHelper { next.getEntitlement().isEmpty()) { message = ls.getMessage("systemlist.jsp.unentitled"); i.setAttribute("class", "spacewalk-icon-unknown-system"); - //img.setAttribute("alt", message); i.setAttribute("title", message); if (user.hasRole(RoleFactory.ORG_ADMIN)) { url.setAttribute("href", "/rhn/systems/details/Edit.do?sid=" + @@ -77,7 +76,6 @@ public class SystemListHelper { "/rhn/help/reference/en-US/s1-sm-systems.jsp"); message = ls.getMessage("systemlist.jsp.notcheckingin"); i.setAttribute("class", "spacewalk-icon-unknown-system"); - //img.setAttribute("alt", message); i.setAttribute("title", message); if (makeLinks) { makeLinks = ConfigDefaults.get().isDocAvailable(); @@ -90,9 +88,8 @@ public class SystemListHelper { "/rhn/systems/details/kickstart/SessionStatus.do?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.kickstart"); - i.setAttribute("class", "icon-rocket"); + i.setAttribute("class", "fa fa-rocket"); i.setAttribute("title", message); - //i.setAttribute("alt", message); } else if (next.getEnhancementErrata() + next.getBugErrata() + next.getSecurityErrata() > 0 && @@ -103,9 +100,8 @@ public class SystemListHelper { "/network/systems/details/history/pending.pxt?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.updatesscheduled"); - i.setAttribute("class", "icon-time"); + i.setAttribute("class", "fa fa-clock-o"); i.setAttribute("title", message); - //i.setAttribute("alt", message); } else if (SystemManager.countActions(new Long(next.getId().longValue())) > 0) { //status = "actions scheduled"; @@ -113,9 +109,8 @@ public class SystemListHelper { "/network/systems/details/history/pending.pxt?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.actionsscheduled"); - i.setAttribute("class", "icon-time"); + i.setAttribute("class", "fa fa-clock-o"); i.setAttribute("title", message); - //img.setAttribute("alt", message); } else if ((next.getEnhancementErrata() + next.getBugErrata() + next.getSecurityErrata()) == 0 && @@ -125,7 +120,7 @@ public class SystemListHelper { //status = "up2date"; message = ls.getMessage("systemlist.jsp.up2date"); - i.setAttribute("class", "icon-ok-sign"); + i.setAttribute("class", "fa fa-check-circle"); i.setAttribute("title", message); //i.setAttribute("alt", message); } @@ -136,7 +131,7 @@ public class SystemListHelper { next.getId() + "&type=" + LocalizationService.getInstance().getMessage(ErrataSetupAction.SECUR)); message = ls.getMessage("systemlist.jsp.critical"); - i.setAttribute("class", "icon-exclamation-sign"); + i.setAttribute("class", "fa fa-exclamation-circle"); i.setAttribute("title", message); } else if (next.getOutdatedPackages().intValue() > 0) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 2bbee74..3b8676f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -587,13 +587,13 @@ public class ListDisplayTag extends ListDisplayTagBase { if (canGoForward || canGoBack) { out.println(renderPaginationButton(FIRST, - "icon-fast-backward", " |< ", canGoBack)); - out.println(renderPaginationButton(PREV, "icon-backward", + "fa-fast-backward", " |< ", canGoBack)); + out.println(renderPaginationButton(PREV, "fa-backward", " < ", canGoBack)); - out.println(renderPaginationButton(NEXT, "icon-forward", + out.println(renderPaginationButton(NEXT, "fa-forward", " > ", canGoForward)); out.println(renderPaginationButton(LAST, - "icon-fast-forward", " >| ", canGoForward)); + "fa-fast-forward", " >| ", canGoForward)); } out.println("</div>\n"); } @@ -602,11 +602,15 @@ public class ListDisplayTag extends ListDisplayTagBase { String text, boolean active) { HtmlTag ret = new HtmlTag("button"); ret.setAttribute("name", name); - String styleClass = String.format("btn btn-default btn-xs %s", icon); + String styleClass = "btn btn-default btn-xs"; + HtmlTag iconTag = new HtmlTag("i"); + iconTag.setAttribute("class", "fa " + icon); + ret.addBody(iconTag); if (!active) { styleClass += " disabled"; } + ret.setAttribute("class", styleClass); ret.addBody(String.format("<span class=\"sr-only\">%s</span>", text)); return ret.render(); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java index 444f2a6..8ccdafc 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -306,11 +306,16 @@ public class ListDisplayTagBase extends BodyTagSupport { btnSpan.setAttribute("class", "input-group-btn"); HtmlTag btn = new HtmlTag("button"); - btn.setAttribute("class", "btn btn-default icon-eye-open"); + btn.setAttribute("class", "btn btn-default"); btn.setAttribute("type", "submit"); btn.setAttribute("name", FILTER_DISPATCH); btn.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); + HtmlTag icon = new HtmlTag("i"); + icon.setAttribute("class", "fa fa-eye"); + icon.addBody(" "); + btn.addBody(icon); + btnSpan.addBody(btn); buf.append(btnSpan.render()); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index 109410a..a18022d 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -533,15 +533,14 @@ public class ToolbarTag extends TagSupport { HtmlTag tag = new HtmlTag("a"); tag.setAttribute("href", getHelpUrl()); tag.setAttribute("target", "_new"); - //tag.setAttribute("class", "help-title"); HtmlTag stack = new HtmlTag("span"); - stack.setAttribute("class", "icon-stack"); - + stack.setAttribute("class", "fa-stack"); + HtmlTag iBack = new HtmlTag("i"); - iBack.setAttribute("class", "icon-circle icon-stack-base"); + iBack.setAttribute("class", "fa fa-circle fa-stack-1x"); HtmlTag iFront = new HtmlTag("i"); - iFront.setAttribute("class", "icon-question icon-light"); + iFront.setAttribute("class", "fa fa-question fa-stack-1x fa-inverse"); stack.addBody(iBack.renderOpenTag()); stack.addBody(iBack.renderCloseTag()); @@ -571,7 +570,7 @@ public class ToolbarTag extends TagSupport { private String renderIcon() { if (assertNotEmpty(getIcon())) { HtmlTag tag = new HtmlTag("i"); - tag.setAttribute("class", getIcon()); + tag.setAttribute("class", "fa " + getIcon()); tag.addBody(" "); return tag.render(); } @@ -584,7 +583,7 @@ public class ToolbarTag extends TagSupport { String create = "toolbar.create." + getCreationType(); return renderActionLink(getCreationUrl(), create, - create, "icon-plus", null); + create, "fa-plus", null); } return ""; } @@ -595,7 +594,7 @@ public class ToolbarTag extends TagSupport { String clone = "toolbar.clone." + getCloneType(); return renderActionLink(getCloneUrl(), clone, - clone, "icon-copy", null); + clone, "fa-files-o", null); } return ""; } @@ -605,7 +604,7 @@ public class ToolbarTag extends TagSupport { assertNotEmpty(getDeletionUrl())) { String del = "toolbar.delete." + getDeletionType(); - return renderActionLink(getDeletionUrl(), del, del, "icon-trash", null); + return renderActionLink(getDeletionUrl(), del, del, "fa-trash-o", null); } return ""; } @@ -615,7 +614,7 @@ public class ToolbarTag extends TagSupport { assertNotEmpty(getUploadUrl())) { String del = "toolbar.upload." + getUploadType(); - return renderActionLink(getUploadUrl(), del, del, "icon-upload", null); + return renderActionLink(getUploadUrl(), del, del, "fa-upload", null); } return ""; } @@ -652,7 +651,7 @@ public class ToolbarTag extends TagSupport { if(assertNotEmpty(iconName)) { HtmlTag i = new HtmlTag("i"); - i.setAttribute("class", iconName); + i.setAttribute("class", "fa " + iconName); a.addBody(i.renderOpenTag()); a.addBody(i.renderCloseTag()); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java index 8db7fba..2aee70e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java @@ -15,15 +15,6 @@ package com.redhat.rhn.frontend.taglibs.list; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.DynamicComparator; -import com.redhat.rhn.common.util.MethodUtil; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.struts.RequestContext; - -import org.apache.commons.lang.StringUtils; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -37,6 +28,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.DynamicComparator; +import com.redhat.rhn.common.util.MethodUtil; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.struts.RequestContext; + /** * Provides a bunch of helper methods to make working with lists easier from a * custom tag POV. @@ -65,10 +65,10 @@ public class DataSetManipulator { private final boolean searchChild; private String defaultSortAttribute; - private static final String ICON_FIRST = "icon-fast-backward"; - private static final String ICON_PREV = "icon-backward"; - private static final String ICON_NEXT = "icon-forward"; - private static final String ICON_LAST = "icon-fast-forward"; + private static final String ICON_FIRST = "fa-fast-backward"; + private static final String ICON_PREV = "fa-backward"; + private static final String ICON_NEXT = "fa-forward"; + private static final String ICON_LAST = "fa-fast-forward"; /** diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 665d4ae..0b1d7b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -692,7 +692,7 @@ public class ListTagUtil { )); sb.append("<span class=\"input-group-btn\">"); sb.append(String.format("<button value=\"%s\" type=\"submit\" name=\"%s\" " + - " class=\"btn btn-default spacewalk-button-filter\"><i class=\"icon-eye-open\"></i>", + " class=\"btn btn-default spacewalk-button-filter\"><i class=\"fa fa-eye\"></i>", ls.getMessage(RequestContext.FILTER_KEY), filterName)); sb.append("</button>"); diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 508c968..d65fe3d 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -29,16 +29,16 @@ </ul> <ul class="nav nav-pills"> <li> - <a href="/rhn/account/UserDetails.do"><i class="icon-user"></i><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a> + <a href="/rhn/account/UserDetails.do"><i class="fa fa-user"></i><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a> </li> <li> - <a><i class="icon-sitemap"></i><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></a> + <a><i class="fa fa-sitemap"></i><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></a> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="icon-cogs"></i></a> + <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs"></i></a> </li> <li> - <html:link forward="logout"><i class="icon-signout"></i></html:link> + <html:link forward="logout"><i class="fa fa-sign-out"></i></html:link> </li> </ul> @@ -59,7 +59,7 @@ <div class="form-group"> <input type="hidden" name="submitted" value="true" /> <button type="submit" class="btn btn-info input-sm"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> </button> </div> </form> diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp index 2cc92f7..21c65a9 100644 --- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp @@ -3,8 +3,8 @@ <div class="sideleg"> <h4><bean:message key="errata-legend.jsp.title"/></h4> <ul> - <li><i class="icon-shield icon-1-5x"></i><bean:message key="errata-legend.jsp.security"/></li> - <li><i class="icon-bug icon-1-5x"></i><bean:message key="errata-legend.jsp.bugfix"/></li> - <li><i class="spacewalk-icon-enhancement icon-1-5x"></i><bean:message key="errata-legend.jsp.enhancement"/></li> + <li><i class="fa fa-shield fa-1-5x"></i><bean:message key="errata-legend.jsp.security"/></li> + <li><i class="fa fa-bug fa-1-5x"></i><bean:message key="errata-legend.jsp.bugfix"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp index 53918cc..6425102 100644 --- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp @@ -3,19 +3,19 @@ <div class="sideleg"> <h4><bean:message key="probes-list-legend.jsp.title"/></h4> <ul> - <li><i class="spacewalk-icon-health spacewalk-icon-green icon-1-5x"></i> + <li><i class="fa fa-1-5x spacewalk-icon-health text-success"></i> <bean:message key="probes-list-legend.jsp.ok"/> </li> - <li><i class="spacewalk-icon-health spacewalk-icon-yellow icon-1-5x"></i> + <li><i class="fa fa-1-5x spacewalk-icon-health text-warning"></i> <bean:message key="probes-list-legend.jsp.warning"/> </li> - <li><i class="spacewalk-icon-health spacewalk-icon-red icon-1-5x"></i> + <li><i class="fa fa-1-5x spacewalk-icon-health text-danger"></i> <bean:message key="probes-list-legend.jsp.critical"/> </li> - <li><i class="spacewalk-icon-health-unknown icon-1-5x"></i> + <li><i class="fa fa-1-5x spacewalk-icon-health-unknown"></i> <bean:message key="probes-list-legend.jsp.unknown"/> </li> - <li><i class="spacewalk-icon-health-pending icon-1-5x"></i> + <li><i class="fa fa-1-5x spacewalk-icon-health-pending"></i> <bean:message key="probes-list-legend.jsp.pending"/> </li> </ul> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp index fac80f8..4930bf0 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp @@ -3,8 +3,8 @@ <div class="sideleg"> <h4><bean:message key="system-group-legend.jsp.title"/></h4> <ul> - <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-group-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-group-legend.jsp.updates"/></li> - <li><i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-group-legend.jsp.critical"/></li> + <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-group-legend.jsp.fully"/></li> + <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-group-legend.jsp.updates"/></li> + <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-group-legend.jsp.critical"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index a04e942..61a702d 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -4,23 +4,23 @@ <div class="sideleg"> <h4><bean:message key="system-legend.jsp.title"/></h4> <ul> - <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-legend.jsp.critical"/></li> - <li><i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-legend.jsp.updates"/></li> - <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin"/></li> + <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-legend.jsp.fully"/></li> + <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-legend.jsp.critical"/></li> + <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-legend.jsp.updates"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin"/></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked"/></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><i class="icon-rocket icon-1-5x"></i><bean:message key="system-legend.jsp.kickstarting"/></li> + <li><i class="fa fa-rocket fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting"/></li> </rhn:require> - <li><i class="icon-time icon-1-5x"></i><bean:message key="system-legend.jsp.pending"/></li> - <li><i class="spacewalk-icon-Unentitled icon-1-5x"></i><bean:message key="system-legend.jsp.unentitled"/></li> + <li><i class="fa fa-clock-o fa-1-5x"></i><bean:message key="system-legend.jsp.pending"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i><bean:message key="system-legend.jsp.unentitled"/></li> <rhn:require acl="org_entitlement(rhn_monitor)"> - <li><i class="spacewalk-icon-monitoring-status icon-1-5x"></i><bean:message key="system-legend.jsp.monitoring"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring"/></li> </rhn:require> - <li><i class="spacewalk-icon-virtual-host icon-1-5x"></i><bean:message key="systemlist.jsp.virthost"/></li> - <li><i class="spacewalk-icon-virtual-guest icon-1-5x"></i><bean:message key="systemlist.jsp.virtguest"/></li> - <li><i class="icon-laptop icon-1-5x"></i><bean:message key="systemlist.jsp.nonvirt"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-virtual-host"></i><bean:message key="systemlist.jsp.virthost"/></li> + <li><i class="fa fa-1-5x spacewalk-icon-virtual-guest"></i><bean:message key="systemlist.jsp.virtguest"/></li> + <li><i class="fa fa-laptop fa-1-5x"></i><bean:message key="systemlist.jsp.nonvirt"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp index d7f057c..f065739 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -4,24 +4,24 @@ <div class="sideleg"> <h4><bean:message key="yourrhn-legend.jsp.title" /></h4> <ul> - <li><i class="icon-ok-sign icon-1-5x spacewalk-icon-green"></i><bean:message key="system-legend.jsp.fully" /></li> - <li><i class="icon-exclamation-sign icon-1-5x spacewalk-icon-red"></i><bean:message key="system-legend.jsp.critical" /></li> - <li><i class="icon-warning-sign icon-1-5x spacewalk-icon-yellow"></i><bean:message key="system-legend.jsp.updates" /></li> - <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin" /></li> + <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-legend.jsp.fully" /></li> + <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-legend.jsp.critical" /></li> + <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-legend.jsp.updates" /></li> + <li><i class="fa fa-1-5x spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin" /></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked" /></li> + <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked" /></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><i class="icon-rocket icon-1-5x"></i><bean:message key="system-legend.jsp.kickstarting" /></li> + <li><i class="fa fa-rocket fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting" /></li> </rhn:require> - <li><i class="icon-time icon-1-5x"></i><bean:message key="system-legend.jsp.pending" /></li> - <li><i class="icon-remove-circle icon-1-5x"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> - <li><i class="icon-ok-circle icon-1-5x"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> + <li><i class="fa fa-clock-o fa-1-5x"></i><bean:message key="system-legend.jsp.pending" /></li> + <li><i class="fa fa-times-circle-o fa-1-5x"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> + <li><i class="fa fa-check-circle-o fa-1-5x"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> <rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> - <li><i class="spacewalk-icon-monitoring-status icon-1-5x"></i><bean:message key="system-legend.jsp.monitoring" /></li> + <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring" /></li> </rhn:require> - <li><i class="icon-shield icon-1-5x"></i><bean:message key="errata-legend.jsp.security" /></li> - <li><i class="icon-bug icon-1-5x"></i><bean:message key="errata-legend.jsp.bugfix" /></li> - <li><i class="spacewalk-icon-enhancement icon-1-5x"></i><bean:message key="errata-legend.jsp.enhancement" /></li> + <li><i class="fa fa-shield fa-1-5x"></i><bean:message key="errata-legend.jsp.security" /></li> + <li><i class="fa fa-bug fa-1-5x"></i><bean:message key="errata-legend.jsp.bugfix" /></li> + <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement" /></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp index f8b3475..e2bee4f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp @@ -22,7 +22,7 @@ editAreaLoader.init({ <body> <rhn:require acl="user_role(satellite_admin)"/> - <h1><i class="icon-list"></i> Tomcat</h1> + <h1><i class="fa fa-list"></i> Tomcat</h1> <form action="/rhn/admin/Catalina.do"> <rhn:csrf /> <div class="panel panel-default"> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 2727ddc..7cec460 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -83,7 +83,7 @@ <rhn:submitted /> <div class="text-right form-group"> <button type="submit" class="btn btn-success"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> <bean:message key="button.search"/> </button> </div> @@ -173,7 +173,7 @@ </div> <div class="text-right"> <button type="submit" class="btn btn-success"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> <bean:message key="button.search"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index 5e7322a..f55def8 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -45,7 +45,7 @@ </div> <div class="form-group"> <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> <bean:message key="button.search"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 9e65133..a6b0473 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -27,7 +27,7 @@ name="search_string" value="${search_string}" accesskey="4"/> <span class="input-group-btn"> <button type="submit" class="btn btn-default"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> </button> </span> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index db9a700..172b13c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <h2> - <i class="icon-desktop"></i> + <i class="fa fa-desktop"></i> <bean:message key="channelsystems.jsp.header2"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf index 516cecc..d8db56c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf @@ -5,7 +5,7 @@ <rhn:column header="system.common.systemName" url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <i class="icon-desktop"></i> + <i class="fa fa-desktop"></i> ${fn:escapeXml(current.name)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf index 476e67a..6876ae7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf @@ -16,7 +16,7 @@ </tr> <tr> <td> - <i class="icon-desktop"></i> + <i class="fa fa-desktop"></i> </td> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf index f2f4b33..43b2ff9 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf @@ -16,10 +16,10 @@ <div class="col-lg-offset-3 col-lg-6"> <div class="btn-group"> <button type="button" class="btn btn-default" value="up" name="dispatch" onclick="return config_channel_up('ranksWidget');"> - <i class="icon-circle-arrow-up"></i> + <i class="fa fa-arrow-circle-up"></i> </button> <button type="button" class="btn btn-default" value="down" name="dispatch" onclick="return config_channel_down('ranksWidget');"> - <i class="icon-circle-arrow-down"></i> + <i class="fa fa-arrow-circle-down"></i> </button> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf index cc759fa..e5e83a6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf @@ -45,7 +45,7 @@ <button type="submit" name="dispatch" class="btn btn-default"> - <i class="icon-trash"></i> <bean:message key="erratalist.jsp.deleteerrata"/> + <i class="fa fa-trash-o"></i> <bean:message key="erratalist.jsp.deleteerrata"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf index 3c6ac6d..3f876ee 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf @@ -79,7 +79,7 @@ <c:choose> <c:when test="${!empty mailableAddress}"> <a class="btn btn-default btn-sm" href="<c:out value="${email_link}"/>"> - <i class="icon-refresh"></i> + <i class="fa fa-refresh"></i> <%-- <bean:message key="${email_display}"/> --%> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp index 0bef486..6a77f57 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp @@ -19,7 +19,7 @@ domainClass="systems"> <rhn:column header="probesuitesystemsedit.jsp.systemname" url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <i class="icon-question-sign"></i> + <i class="fa fa-question-circle"></i> <c:out value="${current.name}" escapeXml="true" /> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 92b9741..5e34b94 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -18,13 +18,13 @@ <a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}"> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <i class="icon-warning-sign icon-1-5x spacewalk-icon-red" title="<bean:message key="grouplist.jsp.security"/>"></i> + <i class="fa fa-exclamation-triangle fa-1-5x text-danger" title="<bean:message key="grouplist.jsp.security"/>"></i> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <i class="icon-exclamation-sign icon-1-5x spacewalk-icon-yellow" title="<bean:message key="grouplist.jsp.updates"/>"></i> + <i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key="grouplist.jsp.updates"/>"></i> </c:when> <c:otherwise> - <i class="icon-ok-sign icon-1-5x spacewalk-icon-green" title="<bean:message key="grouplist.jsp.noerrata"/>"></i> + <i class="fa fa-check-circle fa-1-5x text-success" title="<bean:message key="grouplist.jsp.noerrata"/>"></i> </c:otherwise> </c:choose> </a> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 99a01ac..b6f0750 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -18,7 +18,7 @@ <rhn:require acl="not user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> </a> @@ -29,7 +29,7 @@ <rhn:require acl="user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <bean:message + <i class="fa fa-caret-right"></i> <bean:message key="yourrhn.jsp.task.manage_subscriptions" /> <br> &ensp; &ensp;<a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="header.jsp.my_organization" /> @@ -42,7 +42,7 @@ <rhn:require acl="user_role(satellite_admin)"> <rhn:require acl="not user_role(org_admin)"> - <li class="list-group-item"><i class="icon-caret-right"></i> <a + <li class="list-group-item"><i class="fa fa-caret-right"></i> <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> </a> @@ -52,7 +52,7 @@ <c:if test="${documentation == 'true'}"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/help/client-config/en-US/index.jsp"> <bean:message key="yourrhn.jsp.tasks.registersystem" /> </a> @@ -62,7 +62,7 @@ <rhn:require acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/activationkeys/List.do"> <bean:message key="yourrhn.jsp.tasks.activationkeys" /> </a> @@ -73,14 +73,14 @@ <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/kickstart/KickstartOverview.do"> <bean:message key="yourrhn.jsp.tasks.kickstart" /> </a> </li> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/configuration/file/GlobalConfigFileList.do"> <bean:message key="yourrhn.jsp.tasks.configuration" /> </a> @@ -89,7 +89,7 @@ <rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/monitoring/ProbeList.do"> <bean:message key="yourrhn.jsp.tasks.monitoring" /> </a> @@ -98,7 +98,7 @@ <rhn:require acl="user_role(satellite_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/admin/multiorg/Organizations.do"> <bean:message key="yourrhn.jsp.tasks.manage_sat_orgs" /> </a> @@ -109,7 +109,7 @@ <rhn:require acl="user_role(satellite_admin)"> <li class="list-group-item"> - <i class="icon-caret-right"></i> <a + <i class="fa fa-caret-right"></i> <a href="/rhn/admin/config/GeneralConfig.do"> <bean:message key="yourrhn.jsp.tasks.config_sat" /> </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp index 123c807..1ad16d6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp @@ -58,7 +58,7 @@ </span> <span> <a href="/rhn/configuration/file/DownloadDiff.do?cfid=${file.id}&crid=${revision.id}&ocrid=${orevision.id}"> - <i class="icon-download-alt" + <i class="fa fa-download" aria-hidden='true'></i> <bean:message key="diff.jsp.download" /> </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index bed42c8..c569266 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -28,7 +28,7 @@ <rhn:column header="localfilelist.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <i class="icon-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.serverName} </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index e7264bb..edf7bc2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -50,15 +50,15 @@ url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> <c:choose> <c:when test="${current.type == 'file'}"> - <i class="icon-file-text-alt"></i> + <i class="fa fa-file-text-o"></i> ${fn:escapeXml(current.path)} </c:when> <c:when test="${current.type == 'directory'}"> - <i class="icon-folder-close"></i> + <i class="fa fa-folder"></i> ${fn:escapeXml(current.path)} </c:when> <c:otherwise> - <i class="icon-list-alt"></i> + <i class="fa fa-list-alt"></i> ${fn:escapeXml(current.path)} </c:otherwise> </c:choose> @@ -73,12 +73,12 @@ </c:if> <c:if test="${current.configChannelType == 'local_override'}"> - <i class="icon-desktop"></i> + <i class="fa fa-desktop"></i> ${current.channelNameDisplay} </c:if> <c:if test="${current.configChannelType == 'server_import'}"> - <i class="icon-beaker"></i> + <i class="fa fa-flask"></i> ${current.channelNameDisplay} </c:if> @@ -102,7 +102,7 @@ <rhn:listdisplay> <rhn:column header="configoverview.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <i class="icon-desktop"></i> + <i class="fa fa-desktop"></i> ${fn:escapeXml(current.serverName)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index d181eeb..6354011 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -145,7 +145,7 @@ </td> <td> <button type="submit" class="btn btn-success btn-sm"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> <bean:message key="button.search"/> </button> </td> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 064b881..1f210eb 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -53,7 +53,7 @@ <div class="form-group"> <div class="col-md-offset-2 col-md-10"> <button type="submit" class="btn btn-success btn-sm"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> <bean:message key="button.search"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp index 8112142..c07e0c8 100644 --- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp @@ -13,11 +13,11 @@ <div class="spacewalk-content-nav"> <ul class="nav nav-tabs"> - <li class="${criticalClass}"><a href="/rhn/monitoring/ProbeList.do?state=CRITICAL"><i class="icon-exclamation-sign text-error"></i><bean:message key="Critical"/><span class="badge">${criticalCount}</span></a></li> - <li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><i class="icon-warning-sign text-warning"></i><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li> - <li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><i class="icon-question-sign text-info"></i><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li> - <li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><i class="icon-time text-info"></i><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li> - <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><i class="icon-ok text-success"></i><bean:message key="OK"/><span class="badge">${okCount}</span></a></li> + <li class="${criticalClass}"><a href="/rhn/monitoring/ProbeList.do?state=CRITICAL"><i class="fa fa-exclamation-circle text-error"></i><bean:message key="Critical"/><span class="badge">${criticalCount}</span></a></li> + <li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><i class="fa fa-exclamation-triangle text-warning"></i><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li> + <li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><i class="fa fa-question-circle text-info"></i><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li> + <li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><i class="fa fa-clock-o text-info"></i><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li> + <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><i class="fa fa-check text-success"></i><bean:message key="OK"/><span class="badge">${okCount}</span></a></li> <li class="${allClass}"><a href="/rhn/monitoring/ProbeList.do"><bean:message key="All"/><span class="badge">${allCount}</span></a></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index f76c9a7..ee9d0be 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -15,7 +15,7 @@ <c:choose> <c:when test="${not empty param.cnid}"> <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> - <i class="icon-trash" + <i class="fa fa-trash-o" title="<bean:message key="toolbar.delete.note"/>" ></i> <bean:message key="toolbar.delete.note"/> </a> @@ -23,7 +23,7 @@ </c:when> </c:choose> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <i class="icon-trash" + <i class="fa fa-trash-o" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index 31c4a2c..19c8a7a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -13,7 +13,7 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <i class="icon-trash" + <i class="fa fa-trash-o" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index ba37585..e10497e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -10,14 +10,14 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"> - <i class="icon-trash" title="delete key"></i>delete key</a> + <i class="fa fa-trash-o" title="delete key"></i>delete key</a> </span> </div> <img src="/img/rhn-icon-keyring.gif" alt="" /> <bean:message key="system.jsp.customkey.updatetitle"/> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> - <i class="icon-question-sign" title="Help icon"></i> + <i class="fa fa-question-circle" title="Help icon"></i> </a> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp index 0720883..9c026b7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp @@ -30,7 +30,7 @@ <c:if test="${testResult.deletable}"> <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> - <i class="icon-trash" + <i class="fa fa-trash-o" title="<bean:message key="system.audit.xccdfdelete"/>"></i> <bean:message key="system.audit.xccdfdelete"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp index 8daf769..12aa35f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -75,7 +75,7 @@ <div class="text-right"> <hr /> - <button type="submit" class="btn btn-default" name="refresh"><i class="icon-refresh"></i> <bean:message key='Refresh Comparison'/></button> + <button type="submit" class="btn btn-default" name="refresh"><i class="fa fa-refresh"></i> <bean:message key='Refresh Comparison'/></button> </div> <rhn:submitted/> <br/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 5b510d1..60adaf8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -27,10 +27,10 @@ <c:when test="${hasUpdates}"> <c:choose> <c:when test="${criticalErrataCount > 0}"> - <i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i> + <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> </c:when> <c:otherwise> - <i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i> + <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> </c:otherwise> </c:choose> @@ -48,7 +48,7 @@ </c:when> <c:otherwise> - <i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i> <bean:message key="sdc.details.overview.updated"/> + <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/> </c:otherwise> </c:choose> @@ -195,14 +195,14 @@ <td> <c:choose> <c:when test="${serverLock != null}"> - <i class="icon-lock"></i> + <i class="fa fa-lock"></i> <bean:message key="sdc.details.overview.locked" arg0="${serverLock.locker.login}" arg1="${serverLock.reason}" /><br/> <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> </c:when> <c:otherwise> - <i class="icon-unlock"></i> + <i class="fa fa-unlock"></i> <bean:message key="sdc.details.overview.unlocked"/><br/> <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp index 23eb0ef..2e4c7da 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp @@ -16,11 +16,11 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/DeleteCustomData.do?sid=${sid}&cikid=${cikid}"> - <i class="icon-trash" title="delete value"></i>delete value + <i class="fa fa-trash-o" title="delete value"></i>delete value </a> </span> </div> - <i class="icon-info-sign"></i> + <i class="fa fa-info-circle"></i> <bean:message key="system.jsp.customkey.updatetitle"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index 0b60e8e..3705c49 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -29,7 +29,7 @@ value="${search_string}" maxlength="100" accesskey="4"/> <span class="input-group-btn"> <button type="submit" class="btn btn-default"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> </button> </span> </div> commit 6438b2ecf6e26c4e4a3e549f05856969c3c0f3d3 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 29 11:26:42 2013 +0100 panels, buttons and icons styles added diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp index 5b9df67..3233ba6 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp @@ -11,61 +11,64 @@ </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> -<h2><img src="${cfg:channelHeaderIcon('central')}" - alt="${cfg:channelAlt('central')}"/> +<h2><i class="spacewalk-icon-software-channels"></i> <bean:message key="sdc.configlist.jsp.header"/></h2> -<p> - <bean:message key="activation-key.config.jsp.para1"/> -</p> +<div class="panel panel-default"> + <div class="panel-body"> + <p> + <bean:message key="activation-key.config.jsp.para1"/> + </p> -<c:set var="pageList" value="${requestScope.all}" /> -<rl:listset name="channelListSet"> -<rhn:csrf /> -<c:choose> -<c:when test="${not empty pageList}"> - <rl:list dataset="pageList" - width="100%" - name="list" - emptykey="activation-keys.config.jsp.noChannels" - alphabarcolumn="name"> - <rl:decorator name="PageSizeDecorator"/> - <rl:decorator name="SelectableDecorator"/> - <rl:decorator name="ElaborationDecorator"/> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" - disabled="${not current.selectable}"/> + <c:set var="pageList" value="${requestScope.all}" /> + <rl:listset name="channelListSet"> + <rhn:csrf /> + <c:choose> + <c:when test="${not empty pageList}"> + <rl:list dataset="pageList" + width="100%" + name="list" + emptykey="activation-keys.config.jsp.noChannels" + alphabarcolumn="name"> + <rl:decorator name="PageSizeDecorator"/> + <rl:decorator name="SelectableDecorator"/> + <rl:decorator name="ElaborationDecorator"/> + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" + disabled="${not current.selectable}"/> - <rl:column headerkey="sdc.config.subscriptions.jsp.channel" - sortattr="name" - sortable="true" filterattr="name"> - <cfg:channel id = "${current.id}" - name ="${current.nameDisplay}" - type = "central" nolink="${not current.canAccess}"/> - </rl:column> - <rl:column headerkey="sdc.config.subscriptions.jsp.files" - attr="filesAndDirsDisplayString" bound="true"/> + <rl:column headerkey="sdc.config.subscriptions.jsp.channel" + sortattr="name" + sortable="true" filterattr="name"> + <cfg:channel id = "${current.id}" + name ="${current.nameDisplay}" + type = "central" nolink="${not current.canAccess}"/> + </rl:column> + <rl:column headerkey="sdc.config.subscriptions.jsp.files" + attr="filesAndDirsDisplayString" bound="true"/> - <rl:column headerkey="sdc.configlist.jsp.rank" - attr="position" bound="true"/> - </rl:list> - -<c:if test="${not empty requestScope.all}"> -<div class="text-right"> - <rhn:submitted/> - <hr/> - - <input type="submit" - name ="dispatch" - value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> + <rl:column headerkey="sdc.configlist.jsp.rank" + attr="position" bound="true"/> + </rl:list> + + <c:if test="${not empty requestScope.all}"> + <div class="text-right"> + <rhn:submitted/> + <hr/> + + <input type="submit" + name ="dispatch" + value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> + </div> + </c:if> + </c:when> + <c:otherwise> + <p><strong> <bean:message key="activation-keys.config.jsp.noChannels" + arg0="/rhn/activationkeys/configuration/Subscribe.do?tid=${param.tid}"/></strong> + </p> + </c:otherwise> + </c:choose> + </rl:listset> +</div> </div> -</c:if> -</c:when> -<c:otherwise> -<p><strong> <bean:message key="activation-keys.config.jsp.noChannels" - arg0="/rhn/activationkeys/configuration/Subscribe.do?tid=${param.tid}"/></strong> -</p> -</c:otherwise> -</c:choose> -</rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp index 880403e..327e311 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp @@ -15,7 +15,7 @@ action="/activationkeys/configuration/Rank.do?tid=${param.tid}"> <rhn:csrf /> <h2> - <img src="${cfg:channelHeaderIcon('central')}" alt="${cfg:channelAlt('central')}"/> + <i class="spacewalk-icon-software-channels"></i> <bean:message key="sdc.config.rank.jsp.header"/> </h2> <c:if test="${not empty param.wizardMode}"> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp index db7cdfb..31ce4c7 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp @@ -11,63 +11,74 @@ </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> -<h2> <img src="${cfg:channelHeaderIcon('central')}" - alt="${cfg:channelAlt('central')}"/> - <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> -<h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3> -<p><bean:message key="activation-key.config.subscriptions.jsp.para1" - arg0="${rhn:localize('sdc.config.subscriptions.jsp.continue')}"/></p> -<noscript> - <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> -</noscript> +<h2><i class="spacewalk-icon-software-channels"></i> <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="ssm.config.subscribe.jsp.step"/></h4> + </div> + <div class="panel-body"> + <p> + <bean:message key="activation-key.config.subscriptions.jsp.para1" + arg0="${rhn:localize('sdc.config.subscriptions.jsp.continue')}"/> + </p> + <noscript> + <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> + </noscript> -<c:set var="pageList" value="${requestScope.all}" /> -<rl:listset name="channelListSet"> -<rhn:csrf /> -<c:choose> -<c:when test="${not empty pageList}"> - <rl:list dataset="pageList" - width="100%" - name="list" - emptykey="activation-keys.config.subscriptions.jsp.noChannels" - alphabarcolumn="name"> - <rl:decorator name="PageSizeDecorator"/> - <rl:decorator name="SelectableDecorator"/> - <rl:decorator name="ElaborationDecorator"/> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" - disabled="${not current.selectable}"/> + <c:set var="pageList" value="${requestScope.all}" /> - <rl:column headerkey="sdc.config.subscriptions.jsp.channel" bound="false" - sortattr="name" - sortable="true" filterattr="name"> - <cfg:channel id = "${current.id}" - name ="${current.nameDisplay}" - type = "central" nolink="${not current.canAccess}"/> - </rl:column> - <rl:column headerkey="sdc.config.subscriptions.jsp.files" - attr="filesAndDirsDisplayString" bound="true"/> - </rl:list> - -<c:if test="${not empty requestScope.all}"> -<div class="text-right"> - <rhn:submitted/> - <hr/> - - <input type="submit" - name ="dispatch" - value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> + <rl:listset name="channelListSet"> + <rhn:csrf /> + <c:choose> + <c:when test="${not empty pageList}"> + <rl:list dataset="pageList" + width="100%" + name="list" + emptykey="activation-keys.config.subscriptions.jsp.noChannels" + alphabarcolumn="name"> + <rl:decorator name="PageSizeDecorator"/> + <rl:decorator name="SelectableDecorator"/> + <rl:decorator name="ElaborationDecorator"/> + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" + disabled="${not current.selectable}"/> + + <rl:column headerkey="sdc.config.subscriptions.jsp.channel" bound="false" + sortattr="name" + sortable="true" filterattr="name"> + <cfg:channel id = "${current.id}" + name ="${current.nameDisplay}" + type = "central" nolink="${not current.canAccess}"/> + </rl:column> + <rl:column headerkey="sdc.config.subscriptions.jsp.files" + attr="filesAndDirsDisplayString" bound="true"/> + </rl:list> + + <c:if test="${not empty requestScope.all}"> + <div class="text-right"> + <rhn:submitted/> + <hr/> + + <input type="submit" + name ="dispatch" + class="btn btn-success" + value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> + </div> + </c:if> + </c:when> + <c:otherwise> + <p><strong><bean:message key="activation-keys.config.subscriptions.jsp.noChannels" + arg0="/rhn/activationkeys/configuration/List.do?tid=${param.tid}"/> + </strong></p> + </c:otherwise> + </c:choose> + </rl:listset> + </div> </div> -</c:if> -</c:when> -<c:otherwise> - <p><strong><bean:message key="activation-keys.config.subscriptions.jsp.noChannels" - arg0="/rhn/activationkeys/configuration/List.do?tid=${param.tid}"/> - </strong></p> -</c:otherwise> -</c:choose> -</rl:listset> + + + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 8fd5c04..5fb8e23 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -20,22 +20,16 @@ </rhn:toolbar> -<p> - <bean:message key="activation-keys.jsp.para1"/> -</p> - -<p> +<p><bean:message key="activation-keys.jsp.para1"/></p> <h2><bean:message key="activation-key.jsp.universal-default"/></h2> -<p> - <bean:message key="activation-keys.jsp.universal-default-text"/> -</p> +<p><bean:message key="activation-keys.jsp.universal-default-text"/></p> <c:choose> - <c:when test="${not empty requestScope['default']}"> -<table class="details"> + <c:when test="${not empty requestScope['default']}"> + <table class="table"> <tr> - <th> + <td> <bean:message key="kickstart.activationkeys.jsp.description"/> - </th> + </td> <td> <c:choose> <c:when test="${requestScope['default'].note != null}"> @@ -51,20 +45,19 @@ </td> </tr> - <tr> - <th> + <td> <bean:message key="kickstart.activationkeys.jsp.key"/> - </th> + </td> <td> <c:out value="${requestScope['default'].token}"/> </td> </tr> <tr> - <th> + <td> <bean:message key="kickstart.activationkeys.jsp.usagelimit"/> - </th> + </td> <td> <c:choose> <c:when test="${requestScope['default'].usageLimit != null}"> @@ -78,9 +71,9 @@ </td> </tr> <tr> - <th> + <td> <bean:message key="Status"/> - </th> + </td> <td> <c:choose> <c:when test="${not requestScope['default'].disabled}"> @@ -164,6 +157,7 @@ <rhn:submitted/> <input type="submit" name ="dispatch" + class="btn btn-default" value="${rhn:localize('kickstart.activationkeys.jsp.submit')}"/> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index dd1de11..642d153 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -9,14 +9,12 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-dashboard" - helpUrl=""> +<rhn:toolbar base="h1" icon="icon-dashboard"> <bean:message key="bunch.edit.jsp.toolbar" arg0="${label}"/> </rhn:toolbar> <rl:listset name="runList"> - <div> <h2><bean:message key="bunch.edit.jsp.bunchdescription"/></h2> <div class="page-summary"> <c:out value="${bunchdescription}"/> @@ -32,7 +30,6 @@ <div class="page-summary"> <bean:message key="bunch.jsp.generaldescription"/> </div> - </div> <br/> <rl:list emptykey="schedule.jsp.noruns" @@ -62,8 +59,7 @@ <rl:column bound="false" headerkey="kickstart.jsp.status" - sortattr="status" - > + sortattr="status"> <c:out value="${current.status}" /> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp index 7eec951..8536e97 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp @@ -10,16 +10,13 @@ <h2><bean:message key="channelManagementPerms.title" /></h2> -<div class="page-summary"> <p><bean:message key="channelManagementPerms.summary" /></p> <p> -(<span class="ok-explanation"><img src="/img/rhn-listicon-ok.gif" alt="Permission granted" title="Permission granted" /></span> +(<span class="ok-explanation"><i class="icon-ok" title="Permission granted"></i></span> <bean:message key="channelManagementPerms.granted" />) </p> -</div> - <html:form action="/users/ChannelPermsSubmit"> <rhn:csrf /> <input type="hidden" name="role" value="${role}" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp index a40188f..82020ff 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp @@ -10,14 +10,11 @@ <h2><bean:message key="channelperms.jsp.title" /></h2> -<div class="page-summary"> <p><bean:message key="channelperms.jsp.summary"/></p> <p> -(<span class="ok-explanation"><img src="/img/rhn-listicon-ok.gif" - alt="<bean:message key="channelperms.jsp.permGranted.short"/>" - title="<bean:message key="channelperms.jsp.permGranted.short"/>" /></span> +(<span class="ok-explanation"><i class="icon-ok" title="<bean:message key="channelperms.jsp.permGranted.short"/>"></i></span> <bean:message key="channelperms.jsp.permGranted" />) </p> @@ -30,7 +27,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf" %> </html:form> -</div> + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf index b564fed..3212f7b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf @@ -2,14 +2,10 @@ <rhn:listdisplay filterBy="channelperms.jsp.channelname" button="channelperms.jsp.submitpermissions"> <rhn:column header="channelperms.jsp.permission" width="5%"> <c:if test="${userIsChannelAdmin}"> - <img src="/img/rhn-listicon-ok.gif" - title="<bean:message key="channelperms.jsp.permAdmin"/>" - alt="<bean:message key="channelperms.jsp.permAdmin"/>" /> + <i class="icon-ok" title="<bean:message key="channelperms.jsp.permAdmin"/>"></i> </c:if> <c:if test="${current.globallySubscribable and not (userIsChannelAdmin)}"> - <img src="/img/rhn-listicon-ok.gif" - title="<bean:message key="channelperms.jsp.permGlobal"/>" - alt="<bean:message key="channelperms.jsp.permGlobal"/>" /> + <i class="icon-ok" title="<bean:message key="channelperms.jsp.permGlobal"/>"></i> </c:if> <c:if test="${not (userIsChannelAdmin or current.globallySubscribable)}"> <html:multibox property="selectedChannels">${current.id}</html:multibox> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp index a40ba83..127bdfa 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp @@ -6,87 +6,91 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.details.edit.header"/></h2> - <html:form method="post" action="/systems/details/Edit.do?sid=${system.id}" styleClass="form-horizontal"> - <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - - <div class="form-group"> - <label for="system_name" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.profilename"/> - </label> - <div class="col-lg-6"> - <html:text property="system_name" styleClass="form-control" styleId="system_name"/> - </div> - </div> - - <div class="form-group"> - <label for="baseentitlement" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.baseentitlement"/> - </label> - <div class="col-lg-6"> - <c:choose> - <c:when test="${!base_entitlement_permanent}"> - <rhn:require acl="user_role(org_admin)"> - <html:select property="base_entitlement" styleId="baseentitlement" styleClass="form-control"> - <html:options collection="base_entitlement_options" property="value" labelProperty="label"/> - </html:select> - </rhn:require> - <rhn:require acl="not user_role(org_admin)"> - <c:out value="${base_entitlement}"/> - </rhn:require> - </c:when> - <c:otherwise> - <c:out value="${base_entitlement}"/> - </c:otherwise> - </c:choose> - </div> - </div> - - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.addonentitlements"/> - </label> - <div class="col-lg-6"> - <c:choose> - <c:when test="${system.baseEntitlement == null}"> - <bean:message key="sdc.details.edit.nobase"/> - </c:when> - <c:otherwise> - <c:forEach items="${addon_entitlements}" var="entitlement"> - <div class="checkbox"> - <label for="${entitlement.entitlement.label}"> - <html:checkbox property="${entitlement.entitlement.label}" - styleId="${entitlement.entitlement.label}"/> - <strong> - <c:out value="${entitlement.entitlement.humanReadableLabel}"/> - </strong> - (${entitlement.availbleEntitlements} <bean:message key="sdc.channels.edit.available"/>) - </label> - </div> - </c:forEach> - </c:otherwise> - </c:choose> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.edit.header"/></h4> </div> - - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.notifications"/> - </label> - <div class="col-lg-6"> - <c:choose> - <c:when test="${notifications_disabled}"> - <bean:message key="sdc.details.overview.notifications.disabled"/> - </c:when> - <c:when test="${system.baseEntitlement == null}"> - <bean:message key="sdc.details.edit.notifications.unentitled"/> - </c:when> - <c:otherwise> - <label for="receive_notifications"> - <html:checkbox property="receive_notifications" styleId="receive_notifications"/> - <bean:message key="sdc.details.edit.updates"/> + <div class="panel-body"> + <html:form method="post" action="/systems/details/Edit.do?sid=${system.id}" styleClass="form-horizontal"> + <rhn:csrf /> + <html:hidden property="submitted" value="true"/> + + <div class="form-group"> + <label for="system_name" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.profilename"/> + </label> + <div class="col-lg-6"> + <html:text property="system_name" styleClass="form-control" styleId="system_name"/> + </div> + </div> + + <div class="form-group"> + <label for="baseentitlement" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.baseentitlement"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${!base_entitlement_permanent}"> + <rhn:require acl="user_role(org_admin)"> + <html:select property="base_entitlement" styleId="baseentitlement" styleClass="form-control"> + <html:options collection="base_entitlement_options" property="value" labelProperty="label"/> + </html:select> + </rhn:require> + <rhn:require acl="not user_role(org_admin)"> + <c:out value="${base_entitlement}"/> + </rhn:require> + </c:when> + <c:otherwise> + <c:out value="${base_entitlement}"/> + </c:otherwise> + </c:choose> + </div> + </div> + + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.addonentitlements"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${system.baseEntitlement == null}"> + <bean:message key="sdc.details.edit.nobase"/> + </c:when> + <c:otherwise> + <c:forEach items="${addon_entitlements}" var="entitlement"> + <div class="checkbox"> + <label for="${entitlement.entitlement.label}"> + <html:checkbox property="${entitlement.entitlement.label}" + styleId="${entitlement.entitlement.label}"/> + <strong> + <c:out value="${entitlement.entitlement.humanReadableLabel}"/> + </strong> + (${entitlement.availbleEntitlements} <bean:message key="sdc.channels.edit.available"/>) + </label> + </div> + </c:forEach> + </c:otherwise> + </c:choose> + </div> + </div> + + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.notifications"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${notifications_disabled}"> + <bean:message key="sdc.details.overview.notifications.disabled"/> + </c:when> + <c:when test="${system.baseEntitlement == null}"> + <bean:message key="sdc.details.edit.notifications.unentitled"/> + </c:when> + <c:otherwise> + <label for="receive_notifications"> + <html:checkbox property="receive_notifications" styleId="receive_notifications"/> + <bean:message key="sdc.details.edit.updates"/> </label> <label for="summary"> <html:checkbox property="include_in_daily_summary" styleId="summary"/> @@ -199,5 +203,7 @@ </div> </div> </html:form> + </div> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp index c9caa55..59de3f7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp @@ -6,33 +6,35 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.details.migrate.header"/></h2> - - <html:form method="post" action="/systems/details/SystemMigrate.do?sid=${system.id}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - <table class="details"> - <tr> - <th> - <bean:message key="sdc.details.migrate.org"/> - </th> - <td> - <html:select property="to_org"> - <html:option value="">-- None --</html:option> - <c:forEach var="orgVar" items="${orgs}"> - <html:option value="${orgVar.name}">${orgVar.name}</html:option> - </c:forEach> - </html:select> - </td> - </tr> - </table> - - <hr/> - <div class="text-right"> - <html:submit> - <bean:message key="sdc.details.migrate.migrate"/> - </html:submit> - </div> - </html:form> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.migrate.header"/></h4> + </div> + <div class="panel-body"> + <html:form method="post" action="/systems/details/SystemMigrate.do?sid=${system.id}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true"/> + <div class="row-0 form-group"> + <div class="col-md-2"> + <bean:message key="sdc.details.migrate.org"/> + </div> + <div class="col-md-3"> + <html:select property="to_org" styleClass="form-control"> + <html:option value="">-- None --</html:option> + <c:forEach var="orgVar" items="${orgs}"> + <html:option value="${orgVar.name}">${orgVar.name}</html:option> + </c:forEach> + </html:select> + </div> + </div> + <hr/> + <div class="text-right"> + <html:submit styleClass="btn btn-success"> + <bean:message key="sdc.details.migrate.migrate"/> + </html:submit> + </div> + </html:form> + </div> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp index 668779c..bfce6fb 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp @@ -7,16 +7,13 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif" + <rhn:toolbar base="h2" icon="icon-pushpin" creationUrl="/rhn/systems/details/EditNote.do?sid=${system.id}" - creationType="note" - > + creationType="note"> <bean:message key="sdc.details.notes.header"/> </rhn:toolbar> - <div class="page-summary"> - <p><bean:message key="sdc.details.notes.message"/></p> - </div> + <p><bean:message key="sdc.details.notes.message"/></p> <rhn:list pageList="${requestScope.pageList}" noDataText="sdc.details.notes.nonotes"> @@ -39,6 +36,5 @@ </rhn:list> - </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp index 2a96541..eace722 100644 --- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp @@ -11,78 +11,84 @@ <head><meta name="page-decorator" content="none" /></head> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="ssm.overview.provisioning.remotecommand.header" arg0="${system.name}"/></h2> - <form action="/rhn/systems/details/SystemRemoteCommand.do" method="post" class="form-horizontal" role="form"> - <rhn:csrf /> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fUidInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.uid.label"/> - <span class="required-form-field">*</span>: - </label> - <div class="col-lg-3"> - <input type="text" name="uid" maxlength="32" class="form-control" - value="${formData.uid}" size="" id="fUidInput"/> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="ssm.overview.provisioning.remotecommand.header" arg0="${system.name}"/></h4> </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fGidInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.gid.label"/> - <span class="required-form-field">*</span>: - </label> - <div class="col-lg-3"> - <input type="text" name="gid" maxlength="32" class="form-control" - value="${formData.gid}" size="" id="fGidInput"/> - </div> + <div class="panel-body"> + <form action="/rhn/systems/details/SystemRemoteCommand.do" method="post" class="form-horizontal" role="form"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fUidInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.uid.label"/> + <span class="required-form-field">*</span>: + </label> + <div class="col-lg-3"> + <input type="text" name="uid" maxlength="32" class="form-control" + value="${formData.uid}" size="" id="fUidInput"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fGidInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.gid.label"/> + <span class="required-form-field">*</span>: + </label> + <div class="col-lg-3"> + <input type="text" name="gid" maxlength="32" class="form-control" + value="${formData.gid}" size="" id="fGidInput"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fTmoInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.timeout.label"/>: + </label> + <div class="col-lg-3"> + <input type="text" name="timeout" maxlength="10" class="form-control" + value="${formData.timeout}" size="" id="fTmoInput"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fLblInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.lbl.label"/>: + </label> + <div class="col-lg-6"> + <input type="text" name="lbl" maxlength="10" class="form-control" + value="${formData.label}" size="" id="fLblInput"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fSptInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.script_body.label"/> + <span class="required-form-field">*</span>: + </label> + <div class="col-lg-6"> + <textarea name="script_body" class="form-control" id="fSptInput" + rows="8" wrap="off" style="width: 100%;">${formData.scriptBody}</textarea> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="fLblInput"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.date.label"/>: + </label> + <div class="col-lg-6"> + <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> + <jsp:param name="widget" value="date"/> + </jsp:include> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" name="schedule" class="btn btn-success" + value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> + <bean:message key="ssm.operations.provisioning.remotecommand.form.submit" /> + </button> + </div> + </div> + <hidden name="sid" value="${system.id}" /> + <hidden name="submitted" value="true" /> + <hidden name="use_date" value="true" /> + </form> </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fTmoInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.timeout.label"/>: - </label> - <div class="col-lg-3"> - <input type="text" name="timeout" maxlength="10" class="form-control" - value="${formData.timeout}" size="" id="fTmoInput"/> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fLblInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.lbl.label"/>: - </label> - <div class="col-lg-6"> - <input type="text" name="lbl" maxlength="10" class="form-control" - value="${formData.label}" size="" id="fLblInput"/> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fSptInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.script_body.label"/> - <span class="required-form-field">*</span>: - </label> - <div class="col-lg-6"> - <textarea name="script_body" class="form-control" id="fSptInput" - rows="8" wrap="off" style="width: 100%;">${formData.scriptBody}</textarea> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="fLblInput"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.date.label"/>: - </label> - <div class="col-lg-6"> - <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> - <jsp:param name="widget" value="date"/> - </jsp:include> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" name="schedule" class="btn btn-success" - value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> - <bean:message key="ssm.operations.provisioning.remotecommand.form.submit" /> - </button> - </div> - </div> - <hidden name="sid" value="${system.id}" /> - <hidden name="submitted" value="true" /> - <hidden name="use_date" value="true" /> - </form> + </div> </body> </html> commit 1eb2bd259d83fe2318a5153deef398749575899f Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Oct 28 17:44:15 2013 +0100 TB3: Configuration/Add files/Create File form diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index 12fb582..335d48f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -21,128 +21,204 @@ toggleElement(document.getElementById(linkId + 'Hide')); } </script> - <table class="details"> - <tr> - <th><bean:message key="addfiles.jsp.type-name" /></th> - <td> - <html:radio property="filetype" value="file" styleId="file_radio" /><bean:message - key="addfiles.jsp.type.text" /> <br /> - <html:radio - property="filetype" value="directory" styleId="dir_radio" /><bean:message - key="addfiles.jsp.type.directory" /><br /> - <html:radio property="filetype" value="symlink" styleId="symlink_radio" /><bean:message - key="addfiles.jsp.type.symlink" /><br /> - <script type="text/javascript"> - $(document).ready(function() { - $('#symlink_radio').click(function() { - $('#cffUid').attr('disabled', true); - $('#cffGid').attr('disabled', true); - $('#cffPermissions').attr('disabled', true); - $('#cffMacroStart').attr('disabled', true); - $('#cffMacroEnd').attr('disabled', true); - $('#targetPath').attr('disabled', false); - $('#contentsRow').hide(); - $('#hiddenContentsRow').show(); - }); + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="addfiles.jsp.type-name" /> + </label> + <div class="col-lg-6"> + <div class="checkbox"> + <label> + <html:radio property="filetype" value="file" styleId="file_radio" /> + <bean:message key="addfiles.jsp.type.text" /> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:radio property="filetype" value="directory" styleId="dir_radio" /> + <bean:message key="addfiles.jsp.type.directory" /> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:radio property="filetype" value="symlink" styleId="symlink_radio" /> + <bean:message key="addfiles.jsp.type.symlink" /> + </label> + </div> + </div> + </div> + <script type="text/javascript"> + $(document).ready(function() { + $('#symlink_radio').click(function() { + $('#cffUid').attr('disabled', true); + $('#cffGid').attr('disabled', true); + $('#cffPermissions').attr('disabled', true); + $('#cffMacroStart').attr('disabled', true); + $('#cffMacroEnd').attr('disabled', true); + $('#targetPath').attr('disabled', false); + $('#contentsRow').hide(); + $('#hiddenContentsRow').show(); + }); - $('#file_radio').click(function() { - $('#cffUid').attr('disabled', false); - $('#cffGid').attr('disabled', false); - $('#cffPermissions').attr('disabled', false); - $('#cffMacroStart').attr('disabled', false); - $('#cffMacroEnd').attr('disabled', false); - $('#targetPath').attr('disabled', true); - $('#contentsRow').show(); - $('#hiddenContentsRow').hide(); - }); + $('#file_radio').click(function() { + $('#cffUid').attr('disabled', false); + $('#cffGid').attr('disabled', false); + $('#cffPermissions').attr('disabled', false); + $('#cffMacroStart').attr('disabled', false); + $('#cffMacroEnd').attr('disabled', false); + $('#targetPath').attr('disabled', true); + $('#contentsRow').show(); + $('#hiddenContentsRow').hide(); + }); - $('#dir_radio').click(function() { - $('#cffUid').attr('disabled', false); - $('#cffGid').attr('disabled', false); - $('#cffPermissions').attr('disabled', false); - $('#cffMacroStart').attr('disabled', true); - $('#cffMacroEnd').attr('disabled', true); - $('#targetPath').attr('disabled', true); - $('#contentsRow').hide(); - $('#hiddenContentsRow').show(); - }); - }); - </script> - </td> - </tr> - <tr> - <th><bean:message key="filedetails.properties.jspf.path" /></th> - <td><html:text name="configFileForm" property="cffPath" size="30"/></td> - </tr> - <tr> - <th><bean:message key="filedetails.properties.jspf.targetpath" /></th> - <td><html:text name="configFileForm" property="targetPath" disabled = "${configFileForm.map.filetype != 'symlink'}" styleId="targetPath" size="30"/></td> - </tr> - <tr> - <th><bean:message key="filedetails.properties.jspf.ownership" /></th> - <td> - <table> - <tr> - <td><bean:message key="filedetails.properties.jspf.uid" /></td> - <td><html:text property="cffUid" size="6" styleId="cffUid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> - </tr> - <tr> - <td><bean:message key="filedetails.properties.jspf.gid" /></td> - <td><html:text property="cffGid" size="6" styleId="cffGid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> - </tr> - <tr> - <td colspan="2"><span class="small-text"><bean:message - key="filedetails.jsp.tip.ownership" /></span></td> - </tr> - </table> - </td> - </tr> - <tr> - <th><bean:message key="filedetails.properties.jspf.permissions" /></th> - <td><html:text property="cffPermissions" maxlength="4" size="4" styleId="cffPermissions" disabled = "${configFileForm.map.filetype == 'symlink'}"/><br /> - <span class="small-text"><bean:message - key="filedetails.jsp.tip.permissions" /></span></td> - </tr> - <tr> - <th>SELinux context</th> - <td><html:text property="cffSELinuxCtx" size="30" /><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.selinux" /></span></td> - </tr> - <tr> - <th><bean:message key="filedetails.add_details.jspf.macro" /></th> - <td nowrap="nowrap"> - <bean:message key="filedetails.add_details.jspf.macro.start" /> - <html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" /> + $('#dir_radio').click(function() { + $('#cffUid').attr('disabled', false); + $('#cffGid').attr('disabled', false); + $('#cffPermissions').attr('disabled', false); + $('#cffMacroStart').attr('disabled', true); + $('#cffMacroEnd').attr('disabled', true); + $('#targetPath').attr('disabled', true); + $('#contentsRow').hide(); + $('#hiddenContentsRow').show(); + }); + }); + </script> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="filedetails.properties.jspf.path" /> + </label> + <div class="col-lg-6"> + <html:text name="configFileForm" property="cffPath" size="30" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="filedetails.properties.jspf.targetpath" /> + </label> + <div class="col-lg-6"> + <html:text name="configFileForm" property="targetPath" + styleClass="form-control" + disabled = "${configFileForm.map.filetype != 'symlink'}" + styleId="targetPath" size="30"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="filedetails.properties.jspf.ownership" /> + </label> + <div class="col-lg-2"> + <bean:message key="filedetails.properties.jspf.uid" /> + </div> + <div class="col-lg-2"> + <html:text property="cffUid" size="6" + styleId="cffUid" styleClass="form-control" + disabled = "${configFileForm.map.filetype == 'symlink'}"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-2"> + <bean:message key="filedetails.properties.jspf.gid" /> + </div> + <div class="col-lg-2"> + <html:text property="cffGid" size="6" + styleId="cffGid" styleClass="form-control" + disabled = "${configFileForm.map.filetype == 'symlink'}"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <strong><bean:message key="filedetails.jsp.tip.ownership" /></strong> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="filedetails.properties.jspf.permissions" /> + </label> + <div class="col-lg-2"> + <html:text property="cffPermissions" maxlength="4" size="4" + styleId="cffPermissions" styleClass="form-control" + disabled = "${configFileForm.map.filetype == 'symlink'}"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <span class="help-block"> + <bean:message key="filedetails.jsp.tip.permissions" /> + </span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + SELinux context + </label> + <div class="col-lg-6"> + <html:text property="cffSELinuxCtx" styleClass="form-control" size="30" /> + <span class="help-block"><bean:message key="filedetails.jsp.tip.selinux" /></span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="filedetails.add_details.jspf.macro" /> + </label> + <div class="col-lg-1"> + <bean:message key="filedetails.add_details.jspf.macro.start" /> + </div> + <div class="col-lg-1"> + <html:text property="cffMacroStart" size="3" + styleId="cffMacroStart" styleClass="form-control" + disabled = "${configFileForm.map.filetype == 'symlink'}" /> + </div> + <div class="col-lg-1"> <bean:message key="filedetails.add_details.jspf.macro.end" /> - <html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br /> - <c:if test="${documentation == 'true'}"> - <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> - </span> - </c:if> - </td> - </tr> - <tr id = "contentsRow" - <c:if test="${configFileForm.map.filetype == 'symlink'}"> style="display:none"</c:if> - > - <th><bean:message key="addfiles.create.jspf.content-name" /></th> - <td> - <html:textarea property="contents" rows="20" cols="80" styleId="contents"/><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> - </td> - </tr> - <tr id = "hiddenContentsRow" - <c:if test="${configFileForm.map.filetype != 'symlink'}"> style="display:none"</c:if> - > - <th><bean:message key="addfiles.create.jspf.content-name" /></th> - <td> - <textarea name="dumb" cols="80" rows="20" disabled="true"></textarea><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> - </td> - </tr> - - </table> - <hr /> - <div class="text-right"><html:submit> - <bean:message key="addfiles.jsp.create.jspf.submit" /> - </html:submit></div> + </div> + <div class="col-lg-1"> + <html:text property="cffMacroEnd" size="3" + styleId="cffMacroEnd" styleClass="form-control" + disabled = "${configFileForm.map.filetype == 'symlink'}" /> + </div> + </div> + <c:if test="${documentation == 'true'}"> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <span class="help-block"> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + </span> + </div> + </div> + </c:if> + <div class="form-group" <c:if test="${configFileForm.map.filetype == 'symlink'}"> style="display:none"</c:if>> + <label class="col-lg-3 control-label"> + <bean:message key="addfiles.create.jspf.content-name" /> + </label> + <div class="col-lg-6"> + <html:textarea property="contents" rows="20" cols="80" styleClass="form-control" styleId="contents"/> + <span class="help-block"> + <bean:message key="filedetails.jsp.tip.edit"/> + </span> + </div> + </div> + <div class="form-group" <c:if test="${configFileForm.map.filetype != 'symlink'}"> style="display:none"</c:if>> + <label class="col-lg-3 control-label"> + <bean:message key="addfiles.create.jspf.content-name" /> + </label> + <div class="col-lg-6"> + <textarea name="dumb" cols="80" rows="20" disabled="true" styleClass="form-control"></textarea> + <span class="help-block"> + <bean:message key="filedetails.jsp.tip.edit"/> + </span> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="addfiles.jsp.create.jspf.submit" /> + </html:submit> + </div> + </div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp index 03d342d..a4aa60d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp @@ -3,23 +3,23 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> <html> -<body> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> + <body> + <%@ include + file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<div class="createfragment"> - -<h2><bean:message key="addfiles.jsp.create.jspf.title" /> </h2> -<html:form - action="/configuration/ChannelCreateFiles.do?ccid=${ccid}"> -<rhn:csrf /> -<rhn:submitted /> -<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/create.jspf" %> -</html:form> -</div> + <div class="createfragment"> +  + <h2><bean:message key="addfiles.jsp.create.jspf.title" /> </h2> + <html:form + styleClass="form-horizontal" + action="/configuration/ChannelCreateFiles.do?ccid=${ccid}"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/create.jspf" %> + </html:form> + </div> -</body> -</html> + </body> + </html> commit 26ae3b97e7939bd33cd28bbf24400bd2a5ed1ca3 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Oct 28 14:58:29 2013 +0100 TB3: Configuration edit channel properties form diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf index c2022d0..9fba4e0 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf @@ -1,38 +1,49 @@  -<h2><bean:message key="channelOverview.jsp.properties" /> - <rhn:require acl="config_channel_type(normal); user_role(config_admin)" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <c:if test="${channelOverviewForm.map.editing != 'true'}"> - (<a - href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&editing=true"><bean:message - key="channelOverview.jsp.choose-edit" /></a>) - </c:if> - </rhn:require> +<h2> + <bean:message key="channelOverview.jsp.properties" /> + <rhn:require acl="config_channel_type(normal); user_role(config_admin)" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <c:if test="${channelOverviewForm.map.editing != 'true'}"> + (<a + href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&editing=true"><bean:message + key="channelOverview.jsp.choose-edit" /></a>) + </c:if> + </rhn:require> </h2> <c:choose> - <c:when test="${channelOverviewForm.map.editing == 'true'}"> - <p><bean:message key="channelOverview.jsp.edit-instruction" /></p> - <html:form action="/configuration/ChannelOverview.do?ccid=${ccid}"> + <c:when test="${channelOverviewForm.map.editing == 'true'}"> + <p><bean:message key="channelOverview.jsp.edit-instruction" /></p> + <html:form action="/configuration/ChannelOverview.do?ccid=${ccid}" styleClass="form-horizontal"> <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - <html:hidden property="creating" value="false"/> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> - </html:form> - </c:when> - <c:otherwise> - <table class="details"> - <tr> - <th><bean:message key="channelOverview.jsp.name" /></th> - <td><bean:write name="channelOverviewForm" property="cofName"></bean:write></td> - </tr> - <tr> - <th><bean:message key="channelOverview.jsp.label" /></th> - <td><bean:write name="channelOverviewForm" property="cofLabel"></bean:write></td> - </tr> - <tr> - <th><bean:message key="channelOverview.jsp.descr" /></th> - <td><bean:write name="channelOverviewForm" property="cofDescription"></bean:write></td> - </tr> - </table> - </c:otherwise> + <html:hidden property="submitted" value="true"/> + <html:hidden property="creating" value="false"/> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> + </html:form> + </c:when> + <c:otherwise> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.name" /> + </label> + <div class="col-lg-6"> + <bean:write name="channelOverviewForm" property="cofName"></bean:write> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.label" /> + </label> + <div class="col-lg-6"> + <bean:write name="channelOverviewForm" property="cofLabel"></bean:write> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.descr" /> + </label> + <div class="col-lg-6"> + <bean:write name="channelOverviewForm" property="cofDescription"></bean:write> + </div> + </div> + </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf index 176fd7b..7095f29 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -1,6 +1,6 @@  <h2><bean:message key="channelOverview.jsp.information" /></h2> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="channelOverview.jsp.numfiles-header" /></th> <c:choose> @@ -76,7 +76,7 @@ <a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}"> <c:out value="${summary.mostRecentMod.configFile.configFileName.path}" /> </a><br /> - + <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy != null}"> <%-- The c:set here creates an image with a user name. It has a link around it if the logged in user is an org admin --%> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp index 3dd6a77..f6c98a7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp @@ -1,27 +1,23 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://struts.apache.org/tags-html" - prefix="html"%> + prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-bean" - prefix="bean"%> + prefix="bean"%> <html:xhtml /> <html> -<head> -</head> -<body> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<div class="left-column"> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf"%> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf"%> -</div> -<div class="right-column"> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf"%> -</div> -</body> + <head> + </head> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> + <div class="left-column"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf"%> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf"%> + </div> + <div class="right-column"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf"%> + </div> + </body> </html> commit 50f6dcaf1218e5b8a18b6afd6fa5d6e78c363964 Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 28 12:17:19 2013 +0100 h3 and h4 added diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index e800faa..d8e0251 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -99,6 +99,12 @@ h1 { h2 { font-size: 1.7em; } +h3 { + font-size: 1.4em; +} +h4 { + font-size: 1.2em; +} p { margin-bottom: 1em; } commit 79fc1996744beeebf34ff6082fb440feaf114a41 Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 28 12:11:37 2013 +0100 class lead removed diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp index a0b04ad..5ba38ae 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp @@ -14,7 +14,7 @@ <div class="page-summary"> - <h2><img src="/img/rhn-icon-system.gif" alt="${rhn:localize('system.common.systemAlt')}" /> + <h2><i class="icon-desktop"></i> <bean:message key="Systems"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp index dcb451b..47e443f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp @@ -10,7 +10,7 @@ <rhn:toolbar base="h2" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active"> <bean:message key="yourchangeemail.jsp.title" /> </rhn:toolbar> - <p class="lead">${pageinstructions}</p> + <p>${pageinstructions}</p> <html:form action="/users/ChangeEmailSubmit.do?uid=${param.uid}" styleClass="form-horizontal"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp index 0358265..15d31bd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> <h2><bean:message key="message.Update"/> ${editAddressForm.map.typedisplay}</h2> - <p class="lead"><bean:message key="edit_address.jsp.summary"/></p> + <p><bean:message key="edit_address.jsp.summary"/></p> <html:form action="/users/EditAddressSubmit" styleClass="form-horizontal"> <rhn:csrf /> <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf index 4e99b8e..105bc8f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf @@ -17,7 +17,7 @@ <div class="page-summary"> - <h2><img src="/img/rhn-icon-system_group.gif" alt="system group" /> + <h2><i class="spacewalk-icon-system-groups"></i> <bean:message key="${param.title_key}"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp index 2a191da..cc8824d 100644 --- a/java/code/webapp/WEB-INF/pages/groups/create.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/create.jsp @@ -12,7 +12,7 @@ <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> </a> </h1> - <p class="lead"><bean:message key="systemgroup.create.summary"/></p> + <p><bean:message key="systemgroup.create.summary"/></p> <c:if test="${not empty emptynameordesc}"> <div class="local-alert"><bean:message key="systemgroup.create.requirements"/><br /></div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index d64b4ac..441a62d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -16,7 +16,7 @@ <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> </a> </div> - <p class="lead"> + <p> <bean:message key="system.jsp.customkey.createmsg"/> </p> <form action="/rhn/systems/customdata/CreateCustomKey.do" diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index 46ce247..0b60e8e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -11,7 +11,7 @@ imgAlt="search.alt.img"> <bean:message key="systemsearch.jsp.toolbar"/> </rhn:toolbar> - <p class="lead"><bean:message key="systemsearch.jsp.summary"/></p> + <p><bean:message key="systemsearch.jsp.summary"/></p> <p><bean:message key="erratasearch.jsp.instructions"/></p> <html:form action="/systems/Search.do" styleClass="form-horizontal"> commit 90cce02cfe7d2c5decc7c6c0394fb1154a994e87 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 28 11:30:19 2013 +0100 Revert "Changed <table class="details"> to <table class="table">" This reverts commit dcc688befe7086c5ff9a063d5d295e672bfdc52a. It is obviously wrong, changing links and message keys. Conflicts: java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index d9f659a..8fd5c04 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -31,7 +31,7 @@ </p> <c:choose> <c:when test="${not empty requestScope['default']}"> -<table class="table"> +<table class="details"> <tr> <th> <bean:message key="kickstart.activationkeys.jsp.description"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp index 1545bcd..a3d9359 100644 --- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp @@ -19,7 +19,7 @@ <p><bean:message key="schedule.delete.jsp.introparagraph"/></p> </div> - <table class="table"> + <table class="details">  <tr> <th nowrap="nowrap"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf index 55f52e2..c002568 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf @@ -48,7 +48,7 @@ function showDestination() { //--> </script> - <table class="table"> + <table class="details"> <tr> <th> <label for="description"><rhn:required-field key="filter-form.jspf.description"/></label> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp index 23a0333..4d3b830 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp @@ -17,7 +17,7 @@ <html:form action="/monitoring/config/notification/MethodCreate" method="POST"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th> <rhn:required-field key="method-form.jspf.name"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index 57eb201..c1985d7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -77,7 +77,7 @@ imgAlt="users.jsp.imgAlt"> <h2><bean:message key="entitlementorgs.usage"/></h2> -<table class="table"> +<table class="details"> <tr> <th> <b><bean:message key="entitlementorgs.total_allocated"/>:</ diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp index 10ca39b..1830b01 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -139,7 +139,7 @@ <c:if test="${not empty requestScope.regularAvailable}"> <h2><bean:message key="softwareEntitlementSubs.systemWideCounts.header.regular"/></h2> -<table class="table"> +<table class="details"> <tr> <th> <strong><bean:message key="softwareEntitlementSubs.systemWideCounts.total"/>:</strong> @@ -174,7 +174,7 @@ <c:if test="${not empty requestScope.flexAvailable}"> <h2><bean:message key="softwareEntitlementSubs.systemWideCounts.header.flex"/></h2> -<table class="table"> +<table class="details"> <tr> <th> <strong><bean:message key="softwareEntitlementSubs.systemWideCounts.total"/>:</strong> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp index b80a4a7..3026487 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp @@ -13,7 +13,7 @@ <bean:message key="address.jsp.associated" /> </p> </div> - <table class="table"> + <table class="details"> <rhn:address type="M" action="user" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> </table> </body> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index 90919be..9246106 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -15,7 +15,7 @@ <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata.add"/> </h2> - <table class="table"> + <table class="details"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 4f853ae..0132ce6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -22,7 +22,7 @@ <div class="left-column"> <h2>Errata Summary:</h2> - <table class="table"> + <table class="details"> <tr> <th><img src="/img/wrh-bug.gif" alt="<bean:message key="erratalist.jsp.bugadvisory"/>" /> Bug Fix Advisory: @@ -55,7 +55,7 @@ </div> <div class="right-column"> <h2>Package Summary:</h2> - <table class="table"> + <table class="details"> <c:forEach var="option" items="${arch_count}"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp index 9bb94ab..895db28 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp @@ -24,7 +24,7 @@ <html:form method="post" action="/channels/manage/DistChannelMapDelete"> <rhn:csrf /> <rhn:submitted/> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="Operating System"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp index 0bb59fc..ca16caa 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp @@ -17,7 +17,7 @@ <form method="post" action="/rhn/channels/manage/repos/RepoDelete.do"> <rhn:csrf /> <h2><bean:message key="repos.jsp.delete.info.header"/></h2> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="repos.jsp.create.label"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf index c4c530f..449fb30 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf @@ -4,7 +4,7 @@ </c:if> <rhn:csrf/> -<table class="table"> +<table class="details"> <tr> <th><bean:message key="system.audit.schedulexccdf.jsp.command"/>:</th> <td>/usr/bin/oscap xccdf eval</td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index 792d4fb..12fb582 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -21,7 +21,7 @@ toggleElement(document.getElementById(linkId + 'Hide')); } </script> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="addfiles.jsp.type-name" /></th> <td> @@ -71,53 +71,53 @@ </td> </tr> <tr> - <th><bean:message key="filetable.properties.jspf.path" /></th> + <th><bean:message key="filedetails.properties.jspf.path" /></th> <td><html:text name="configFileForm" property="cffPath" size="30"/></td> </tr> <tr> - <th><bean:message key="filetable.properties.jspf.targetpath" /></th> + <th><bean:message key="filedetails.properties.jspf.targetpath" /></th> <td><html:text name="configFileForm" property="targetPath" disabled = "${configFileForm.map.filetype != 'symlink'}" styleId="targetPath" size="30"/></td> </tr> <tr> - <th><bean:message key="filetable.properties.jspf.ownership" /></th> + <th><bean:message key="filedetails.properties.jspf.ownership" /></th> <td> <table> <tr> - <td><bean:message key="filetable.properties.jspf.uid" /></td> + <td><bean:message key="filedetails.properties.jspf.uid" /></td> <td><html:text property="cffUid" size="6" styleId="cffUid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> </tr> <tr> - <td><bean:message key="filetable.properties.jspf.gid" /></td> + <td><bean:message key="filedetails.properties.jspf.gid" /></td> <td><html:text property="cffGid" size="6" styleId="cffGid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> </tr> <tr> <td colspan="2"><span class="small-text"><bean:message - key="filetable.jsp.tip.ownership" /></span></td> + key="filedetails.jsp.tip.ownership" /></span></td> </tr> </table> </td> </tr> <tr> - <th><bean:message key="filetable.properties.jspf.permissions" /></th> + <th><bean:message key="filedetails.properties.jspf.permissions" /></th> <td><html:text property="cffPermissions" maxlength="4" size="4" styleId="cffPermissions" disabled = "${configFileForm.map.filetype == 'symlink'}"/><br /> <span class="small-text"><bean:message - key="filetable.jsp.tip.permissions" /></span></td> + key="filedetails.jsp.tip.permissions" /></span></td> </tr> <tr> <th>SELinux context</th> <td><html:text property="cffSELinuxCtx" size="30" /><br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.selinux" /></span></td> + <span class="small-text"><bean:message key="filedetails.jsp.tip.selinux" /></span></td> </tr> <tr> - <th><bean:message key="filetable.add_details.jspf.macro" /></th> + <th><bean:message key="filedetails.add_details.jspf.macro" /></th> <td nowrap="nowrap"> - <bean:message key="filetable.add_details.jspf.macro.start" /> + <bean:message key="filedetails.add_details.jspf.macro.start" /> <html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" /> - <bean:message key="filetable.add_details.jspf.macro.end" /> + <bean:message key="filedetails.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br /> <c:if test="${documentation == 'true'}"> <span class="small-text"> - <bean:message key="filetable.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> </span> </c:if> </td> @@ -128,7 +128,7 @@ <th><bean:message key="addfiles.create.jspf.content-name" /></th> <td> <html:textarea property="contents" rows="20" cols="80" styleId="contents"/><br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.edit"/></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> </td> </tr> <tr id = "hiddenContentsRow" @@ -137,7 +137,7 @@ <th><bean:message key="addfiles.create.jspf.content-name" /></th> <td> <textarea name="dumb" cols="80" rows="20" disabled="true"></textarea><br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.edit"/></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf index 6f7ca12..c2022d0 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf @@ -20,7 +20,7 @@ </html:form> </c:when> <c:otherwise> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="channelOverview.jsp.name" /></th> <td><bean:write name="channelOverviewForm" property="cofName"></bean:write></td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf index eb5976c..176fd7b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -1,6 +1,6 @@  <h2><bean:message key="channelOverview.jsp.information" /></h2> -<table class="table"> +<table class="details"> <tr> <th><bean:message key="channelOverview.jsp.numfiles-header" /></th> <c:choose> @@ -46,7 +46,7 @@ <c:when test="${summary.numSystems > 0}"> <td> <img alt='<bean:message key="system.common.systemAlt" />' src="/img/rhn-listicon-system.gif" /> - <a href="/rhn/systems/table/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> + <a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> <c:out value="${summary.mostRecentSystem.name}" /> </a><br /> ${summary.systemDate} @@ -96,7 +96,7 @@ arg1="${summary.recentFileDate}"/> </c:if> <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy == null}"> - <bean:message key="filetable.details.jspf.modifiedBy-unknown" + <bean:message key="filedetails.details.jspf.modifiedBy-unknown" arg0="${summary.recentFileDate}"/> </c:if> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf index c26df6f..af4c355 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf @@ -1,16 +1,16 @@ <c:if test="${not empty revision.configContent}"> -<h2><bean:message key="filetable.add_details.jspf.header2" /></h2> -<table class="table"> +<h2><bean:message key="filedetails.add_details.jspf.header2" /></h2> +<table class="details"> <tr> - <th><bean:message key="filetable.add_details.jspf.md5" /></th> + <th><bean:message key="filedetails.add_details.jspf.md5" /></th> <td>${revision.configContent.checksum}</td> </tr> <c:if test="${!revision.configContent.binary && !revision.directory}"> <tr> - <th><bean:message key="filetable.add_details.jspf.macro" /></th> + <th><bean:message key="filedetails.add_details.jspf.macro" /></th> <td nowrap> - <bean:message key="filetable.add_details.jspf.macro.start" /> + <bean:message key="filedetails.add_details.jspf.macro.start" /> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <html:text property="cffMacroStart" value="${revision.configContent.delimStart}" size="3"/> @@ -20,7 +20,7 @@ <c:out value="${revision.configContent.delimStart}" /> </rhn:require> - <bean:message key="filetable.add_details.jspf.macro.end" /> + <bean:message key="filedetails.add_details.jspf.macro.end" /> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -32,7 +32,7 @@ </rhn:require> <br /> <c:if test="${documentation == 'true'}"> - <span class="small-text"><bean:message key="filetable.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> </c:if> </tr> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index 2bab2d7..e2289d3 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -2,19 +2,19 @@ <bean:message key="deploylocal.jspf.local" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" - arg2="${system}" arg3="/rhn/systems/table/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /> -<h2><bean:message key="deploy.jsp.filetable" /></h2> + arg2="${system}" arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /> +<h2><bean:message key="deploy.jsp.filedetails" /></h2> <html:form action="/configuration/file/RevisionDeploy.do?cfid=${cfid}&crid=${crid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="deploy.jsp.deploy-name" /></th> <td><bean:message key="deploy.jsp.deploy" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" arg2="${system}" - arg3="/rhn/systems/table/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> + arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> </tr> <tr> <th><bean:message key="deploy.jsp.latest-name" /></th> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index d0ffe5a..9151f12 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -3,10 +3,10 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<h2><bean:message key="filetable.details.jspf.header2" /></h2> -<table class="table"> +<h2><bean:message key="filedetails.details.jspf.header2" /></h2> +<table class="details"> <tr> - <th><bean:message key="filetable.details.jspf.channel-name" /></th> + <th><bean:message key="filedetails.details.jspf.channel-name" /></th> <td> <c:choose> <c:when test="${channel.configChannelType.label == 'normal'}"> @@ -26,18 +26,18 @@ </td> </tr> <tr> - <th><bean:message key="filetable.details.jspf.revision-name" /></th> + <th><bean:message key="filedetails.details.jspf.revision-name" /></th> <td> ${revision.revision} - (<a href="/rhn/configuration/file/ManageRevision.do?cfid=${file.id}"><bean:message key="table.jspf.other-revisions"/></a>) + (<a href="/rhn/configuration/file/ManageRevision.do?cfid=${file.id}"><bean:message key="details.jspf.other-revisions"/></a>) </td> </tr> <tr> - <th><bean:message key="filetable.details.jspf.creation-name" /></th> + <th><bean:message key="filedetails.details.jspf.creation-name" /></th> <td>${created}</td> </tr> <tr> - <th><bean:message key="filetable.details.jspf.modified-name" /></th> + <th><bean:message key="filedetails.details.jspf.modified-name" /></th> <td> <c:choose> <c:when test="${lastUser != null}"> @@ -59,51 +59,51 @@ </a> </rhn:require> </c:set> - <bean:message key="filetable.details.jspf.modifiedBy" + <bean:message key="filedetails.details.jspf.modifiedBy" arg0="${modified}" arg1='${beanarg}' /> </c:when> <c:otherwise> - <bean:message key="filetable.details.jspf.modifiedBy-unknown" arg0="${modified}"/> + <bean:message key="filedetails.details.jspf.modifiedBy-unknown" arg0="${modified}"/> </c:otherwise> </c:choose> </td> </tr> <tr> - <th><bean:message key="filetable.details.jspf.filetype-name" /></th> + <th><bean:message key="filedetails.details.jspf.filetype-name" /></th> <td> <c:choose> <c:when test="${revision.directory}"> - <bean:message key="filetable.details.jspf.directory" /> + <bean:message key="filedetails.details.jspf.directory" /> </c:when> <c:when test="${revision.symlink}"> - <bean:message key="filetable.details.jspf.symlink" /> + <bean:message key="filedetails.details.jspf.symlink" /> </c:when> <c:otherwise> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <html:select property="binary"> <html:option value="false"> - <bean:message key="filetable.details.jspf.textfile"/> + <bean:message key="filedetails.details.jspf.textfile"/> </html:option> <html:option value="true"> - <bean:message key="filetable.details.jspf.binfile"/> + <bean:message key="filedetails.details.jspf.binfile"/> </html:option> </html:select> </rhn:require> <rhn:require acl="not config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <c:if test="${form.map.binary}"> - <bean:message key="filetable.details.jspf.binfile"/> + <bean:message key="filedetails.details.jspf.binfile"/> </c:if> <c:if test="${not form.map.binary}"> - <bean:message key="filetable.details.jspf.textfile"/> + <bean:message key="filedetails.details.jspf.textfile"/> </c:if> </rhn:require> <br /> <c:if test="${documentation == 'true'}"> <span class="small-text"> - <bean:message key="filetable.jsp.binarytoggletip" + <bean:message key="filedetails.jsp.binarytoggletip" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp" /> </span> </c:if> @@ -114,7 +114,7 @@ <tr> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <th> <bean:message key="filetable.details.jspf.revnum"/> </th> + <th> <bean:message key="filedetails.details.jspf.revnum"/> </th> <td> <html:text property="revnum" size="7"/> </td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf index 6c44001..ed5b958 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf @@ -1,23 +1,23 @@ -<h2><bean:message key="filetable.properties.jspf.header2" /></h2> -<table class="table"> +<h2><bean:message key="filedetails.properties.jspf.header2" /></h2> +<table class="details"> <tr> - <th><bean:message key="filetable.properties.jspf.path" /></th> + <th><bean:message key="filedetails.properties.jspf.path" /></th> <td><bean:write name="configFileForm" property="cffPath"/></td> </tr> <c:choose> <c:when test="${revision.symlink}"> <tr> - <th><bean:message key="filetable.properties.jspf.targetpath" /></th> + <th><bean:message key="filedetails.properties.jspf.targetpath" /></th> <td><html:text name="configFileForm" property="targetPath" size="30"/></td> </tr> </c:when> <c:otherwise> <tr> - <th><bean:message key="filetable.properties.jspf.ownership" /></th> + <th><bean:message key="filedetails.properties.jspf.ownership" /></th> <td> <table> <tr> - <td><bean:message key="filetable.properties.jspf.uid" /></td> + <td><bean:message key="filedetails.properties.jspf.uid" /></td> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -30,7 +30,7 @@ </td> </tr> <tr> - <td><bean:message key="filetable.properties.jspf.gid" /></td> + <td><bean:message key="filedetails.properties.jspf.gid" /></td> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -42,12 +42,12 @@ </rhn:require> </td> </tr> - <tr><td colspan="2"><span class="small-text"><bean:message key="filetable.jsp.tip.ownership" /></span></td></tr> + <tr><td colspan="2"><span class="small-text"><bean:message key="filedetails.jsp.tip.ownership" /></span></td></tr> </table> </td> </tr> <tr> - <th><bean:message key="filetable.properties.jspf.permissions" /></th> + <th><bean:message key="filedetails.properties.jspf.permissions" /></th> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -58,7 +58,7 @@ ${form.map.cffPermissions} </rhn:require> <br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.permissions" /></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.permissions" /></span> </td> </tr> </c:otherwise> @@ -76,7 +76,7 @@ ${form.map.cffSELinuxCtx} </rhn:require> <br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.selinux" /></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.selinux" /></span> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf index 46fda67..466adc9 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf @@ -4,12 +4,12 @@ action="/configuration/file/ManageRevisionSubmit.do?cfid=${file.id}&csrf_token=${csrfToken}" enctype="multipart/form-data"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="manage.jsp.uploadtab"/></th> <td> <html:file property="cffUpload" size="30"/><br /> - <span class="small-text"><bean:message key="filetable.jsp.tip.upload" arg0="${maxbytes}"/></span> + <span class="small-text"><bean:message key="filedetails.jsp.tip.upload" arg0="${maxbytes}"/></span> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf index 222155b..755d202 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf @@ -19,9 +19,9 @@ <div class="page-summary"> <h2><bean:message key="kickstart.clone.jsp.header2"/></h2> <p><bean:message key="kickstart.clone.jsp.summary"/></p> - <table class="table"> + <table class="details"> <tr> - <th><rhn:required-field key="kickstarttable.jsp.label"/>:</th> + <th><rhn:required-field key="kickstartdetails.jsp.label"/>:</th> <td><html:text property="label" maxlength="64" size="32" /></td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf index 5948965..5142e5b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf @@ -14,7 +14,7 @@ <br> <html:form method="post" action="${param.post_url}"> <rhn:csrf /> - <table class="table"> + <table class="details"> <c:if test= "${not empty param.show_netboot}"> <tr> <th> @@ -27,7 +27,7 @@ </c:if> <tr> <th> - <bean:message key="kickstart.variable.jsp.variabletable"/>: + <bean:message key="kickstart.variable.jsp.variabledetails"/>: </th> <td> <html:textarea rows="25" cols="60" property="variables"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf index c297512..ccf4258 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf @@ -18,20 +18,20 @@ <div class="page-summary"> <h2><bean:message key="kickstartdelete.jsp.header2"/></h2> <p><bean:message key="kickstartdelete.jsp.summary1"/></p> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="kickstarttable.jsp.label" />:</th> + <th><bean:message key="kickstartdetails.jsp.label" />:</th> <td><strong>${ksdata.label}</strong></td> </tr> <c:if test="${not param.raw_mode}"> <tr> - <th><bean:message key="kickstarttable.jsp.install_type" /></th> + <th><bean:message key="kickstartdetails.jsp.install_type" /></th> <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong></td> </tr> </c:if> <tr> - <th><bean:message key="kickstarttable.jsp.active"/></th> + <th><bean:message key="kickstartdetails.jsp.active"/></th> <td><strong> <c:if test="${ksdata.active}"> <bean:message key="kickstart.jsp.active"/> @@ -43,7 +43,7 @@ </tr> <c:if test="${empty param.noComments}"> <tr> - <th><bean:message key="kickstarttable.jsp.comments"/></th> + <th><bean:message key="kickstartdetails.jsp.comments"/></th> <td><html:textarea disabled="true" property="comments" cols="80" rows="6" value="${ksdata.comments}" /> </td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf index a0f0892..898897b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf @@ -33,7 +33,7 @@ <bean:message key="kickstartips.jsp.ranges_summary"/> </p> - <table class="table"> + <table class="details"> <c:forEach items="${ranges}" var="ip_range"> <tr> <th><bean:message key="kickstartips.jsp.label" />:</th> @@ -45,7 +45,7 @@ <html:form method="post" action="${param.range_edit_url}"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="kickstartips.jsp.label" />:</th> <td><html:text property="octet1a" maxlength="3" size="3" />. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index 9157206..fd26029 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -65,7 +65,7 @@ function enableBondStaticIpAddress() { <html:hidden property="sid" /> <html:hidden property="guestName" /> <html:hidden property="proxyHost" /> - <table class="table"> + <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <c:if test="${!empty regularKS}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf index c4085d5..0aa6231 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf @@ -6,7 +6,7 @@ <h2><bean:message key="virtualization.provision.first.jsp.header3" /></h2> <bean:message key="virtualization.provision.override.jsp.message" /> <br/><br/> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="virtualization.provision.first.jsp.memory_allocation.header"/></th> <td> @@ -33,7 +33,7 @@ </td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.virt_bridge"/>:</th> + <th><bean:message key="kickstartdetails.jsp.virt_bridge"/>:</th> <td> <html:text property="virtBridge" maxlength="20" size="6" styleId="virtBridgeId"/> <bean:message key="virtualization.provision.first.jsp.virt_bridge.example"/> @@ -41,20 +41,20 @@ </td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.virt_disk_path"/>:</th> + <th><bean:message key="kickstartdetails.jsp.virt_disk_path"/>:</th> <td> <html:text property="diskPath" maxlength="64" size="20" styleId="diskPathId"/> <br/> - <bean:message key="kickstarttable.jsp.virt_disk_path.tip"/> + <bean:message key="kickstartdetails.jsp.virt_disk_path.tip"/> <br/><br/> </td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.mac_address"/>:</th> + <th><bean:message key="kickstartdetails.jsp.mac_address"/>:</th> <td> <html:text property="macAddress" maxlength="17" size="17" styleId="macAddressId"/> <br/> - <bean:message key="kickstarttable.jsp.mac_address.tip"/> + <bean:message key="kickstartdetails.jsp.mac_address.tip"/> <br/><br/> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf index 3668886..3ca51b7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf @@ -1,4 +1,4 @@ - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="crashes.jsp.component"/>: diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp index af6f3a2..bb7d587 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp @@ -8,13 +8,13 @@ <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/table-header.jspf"%> +<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> <html:form action="/configuration/DeleteChannel.do?ccid=${ccid}"> <rhn:csrf /> <html:hidden property="submitted" value="true" /> <p><bean:message key="channelOverview.jsp.deleteInstruction" /></p> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="channelOverview.jsp.name" /></th> <td><strong>${currChannel.name}</strong></td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 44a0827..d7d20c0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -15,7 +15,7 @@ <html:form action="/configuration/file/DeleteFile.do?cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="deleterev.jsp.channelname" /></th> <td>${file.configChannel.displayName}</td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index 5d35c75..37f8f2e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -17,7 +17,7 @@ <html:form action="/configuration/file/DeleteRevision.do?crid=${crid}&cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="deleterev.jsp.channelname" /></th> <td>${file.configChannel.displayName}</td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index ec9a883..358be7c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -57,7 +57,7 @@ <html:form method="post" action="/configuration/file/ManageRevisionSubmit.do?cfid=${file.id}&csrf_token=${csrfToken}" enctype="multipart/form-data"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="manage.jsp.uploadtab"/></th> <td><html:file property="cffUpload" /></td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index e565b3e..f4c7e35 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -27,13 +27,13 @@ </div> <html:form method="post" - action="/systems/table/configuration/addfiles/ImportFileSubmit.do?sid=${system.id}"> + action="/systems/details/configuration/addfiles/ImportFileSubmit.do?sid=${system.id}"> <rhn:csrf /> <h2><bean:message key="sdcimportfile.jsp.new"/></h2> <p><bean:message key="sdcimportfile.jsp.newsummary"/></p> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="sdcimportfile.jsp.paths"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp index 3e390df..3f71598 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp @@ -16,7 +16,7 @@ <td> <h2><bean:message key="sdc.config.header.overview"/></h2> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="sdc.config.centrally-managed"/>:</th> <td> @@ -44,13 +44,13 @@ </tr> <tr> <th><bean:message key="sdc.config.central-channel.subscriptions"/>:</th> - <td>${requestScope.globalConfigChannels}. [<a href="/rhn/systems/table/configuration/SubscriptionsSetup.do?sid=${param.sid}"><bean:message key="sdc.config.subscribe_to_channels"/></a>]</td> + <td>${requestScope.globalConfigChannels}. [<a href="/rhn/systems/details/configuration/SubscriptionsSetup.do?sid=${param.sid}"><bean:message key="sdc.config.subscribe_to_channels"/></a>]</td> </tr> </table>  <h2><bean:message key="sdc.config.header.recent-events"/></h2> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="sdc.config.last-config.deployment"/>:</th> @@ -92,14 +92,14 @@ <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.deploy.managed-files" - arg0 ="/rhn/systems/table/configuration/DeployFileConfirm.do?selectall=true&sid=${param.sid}" /> + arg0 ="/rhn/systems/details/configuration/DeployFileConfirm.do?selectall=true&sid=${param.sid}" /> </td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.deploy.selected-files" - arg0="/rhn/systems/table/configuration/DeployFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/details/configuration/DeployFile.do?sid=${param.sid}"/></td> <td></td> </tr> </table> @@ -115,12 +115,12 @@ </thead> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.compare.managed-files" - arg0="/rhn/systems/table/configuration/DiffFileConfirm.do?selectall=true&sid=${param.sid}"/></td> + arg0="/rhn/systems/details/configuration/DiffFileConfirm.do?selectall=true&sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.compare.selected-files" - arg0="/rhn/systems/table/configuration/DiffFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/details/configuration/DiffFile.do?sid=${param.sid}"/></td> <td></td> </tr> </table> @@ -134,25 +134,25 @@ </thead> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.new-files" - arg0 = "/rhn/systems/table/configuration/addfiles/CreateFile.do?sid=${param.sid}"/></td> + arg0 = "/rhn/systems/details/configuration/addfiles/CreateFile.do?sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.upload-files" - arg0 = "/rhn/systems/table/configuration//addfiles/UploadFile.do?sid=${param.sid}"/></td> + arg0 = "/rhn/systems/details/configuration//addfiles/UploadFile.do?sid=${param.sid}"/></td> <td></td> </tr> <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" acl="client_capable(configfiles.upload)"> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.import-all-files" - arg0 = "/rhn/systems/table/configuration/addfiles/ImportFileConfirm.do?selectall=true&sid=${param.sid}"/></td> + arg0 = "/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do?selectall=true&sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.import-selected-files" - arg0="/rhn/systems/table/configuration/addfiles/ImportFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/details/configuration/addfiles/ImportFile.do?sid=${param.sid}"/></td> <td></td> </tr> </rhn:require> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp index 1b6b6bc..107cd05 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp @@ -48,7 +48,7 @@ /></strong></c:set> -<table class="table"> +<table class="details"> <tr> <th><bean:message key="sdc.config.diff_result.original_file"/>:</th> <td><bean:message key="sdc.config.diff_result.original_file_value" diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index 9447abb..eb6778c 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -19,7 +19,7 @@ <hr /> <h2><bean:message key="credentials.jsp.susestudio" /></h2> -<table class="table"> +<table class="details"> <tr> <th><bean:message key="credentials.jsp.username" /></th> <td><c:out value="${creds.username}" /></td> diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp index a5e13b5..cdb9829 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -23,7 +23,7 @@ <p><bean:message key="delete.jsp.summary"/></p> </div> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="delete.jsp.erratum"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/errata/details.jsp b/java/code/webapp/WEB-INF/pages/errata/details.jsp index 3a1acf5..0a0bf62 100644 --- a/java/code/webapp/WEB-INF/pages/errata/details.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/details.jsp @@ -15,31 +15,31 @@ <h2><bean:message key="erratalist.jsp.synopsis"/></h2> <div class="page-summary">${errata.synopsis}</div> <br/> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="table.jsp.issued"/></th> + <th><bean:message key="details.jsp.issued"/></th> <td>${issued}</td> </tr> <tr> - <th><bean:message key="table.jsp.updated"/></th> + <th><bean:message key="details.jsp.updated"/></th> <td>${updated}</td> </tr> <tr> - <th><bean:message key="table.jsp.from"/></th> + <th><bean:message key="details.jsp.from"/></th> <td>${errataFrom}</td> </tr> </table> -<h2><bean:message key="table.jsp.topic"/></h2> +<h2><bean:message key="details.jsp.topic"/></h2> <div class="page-summary">${topic}</div> -<h2><bean:message key="table.jsp.description"/></h2> +<h2><bean:message key="details.jsp.description"/></h2> <div class="page-summary">${description}</div> -<h2><bean:message key="table.jsp.solution"/></h2> +<h2><bean:message key="details.jsp.solution"/></h2> <div class="page-summary">${solution}</div> -<h2><bean:message key="table.jsp.affectedchannels"/></h2> +<h2><bean:message key="details.jsp.affectedchannels"/></h2> <c:forEach items="${channels}" var="current"> <div class="page-summary"> <a href="/rhn/channels/ChannelPackages.do?cid=${current.id}"> @@ -48,11 +48,11 @@ </c:forEach> <c:if test="${empty channels}"> <div class="page-summary"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </div> </c:if> -<h2><bean:message key="table.jsp.fixes"/></h2> +<h2><bean:message key="details.jsp.fixes"/></h2> <c:forEach items="${fixed}" var="current"> <div class="page-summary"> <c:choose> @@ -61,7 +61,7 @@ <c:out value="${current.summary}"/></a> </c:when> <c:when test="${current.href == null && errata.org != null}"> - <bean:message key="table.jsp.bugnumber" arg0="${current.bugId}"/> <c:out value="${current.summary}"/> + <bean:message key="details.jsp.bugnumber" arg0="${current.bugId}"/> <c:out value="${current.summary}"/> </c:when> <c:otherwise> <a href="${current.href}"> @@ -72,19 +72,19 @@ </c:forEach> <c:if test="${empty fixed}"> <div class="page-summary"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </div> </c:if> -<h2><bean:message key="table.jsp.keywords"/></h2> +<h2><bean:message key="details.jsp.keywords"/></h2> <div class="page-summary"> ${keywords} <c:if test="${empty keywords}"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </c:if> </div> -<h2><bean:message key="table.jsp.cves"/></h2> +<h2><bean:message key="details.jsp.cves"/></h2> <c:forEach items="${cve}" var="current"> <div class="page-summary"> <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${current.name}"> @@ -93,7 +93,7 @@ </c:forEach> <c:if test="${empty cve}"> <div class="page-summary"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </div> </c:if> @@ -105,24 +105,24 @@ </c:if> <c:if test="${ovalFile == null}"> <div class="page-summary"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </div> </c:if> -<h2><bean:message key="table.jsp.references"/></h2> +<h2><bean:message key="details.jsp.references"/></h2> <div class="page-summary"> ${references} <c:if test="${empty references}"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </c:if> </div> -<h2><bean:message key="actiontable.jsp.notes"/></h2> +<h2><bean:message key="actiondetails.jsp.notes"/></h2> <div class="page-summary"> ${notes} <c:if test="${empty notes}"> - <bean:message key="table.jsp.none"/> + <bean:message key="details.jsp.none"/> </c:if> </div> diff --git a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf index 1baf018..01cc4a9 100644 --- a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf +++ b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf @@ -1,4 +1,4 @@ - <table class="table"> + <table class="details"> <tr> <th> <rhn:required-field key="keycreate.jsp.description"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp index e3b2041..e9a81c2 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -16,7 +16,7 @@ <form method="post" action="/rhn/kickstart/cobbler/CobblerSnippetDelete.do"> <rhn:csrf /> <h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="snippetcreate.jsp.contents"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp index d6160b3..e565c29 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -13,10 +13,10 @@ ${requestScope.snippet.displayName} </rhn:toolbar> -<h2><bean:message key="snippettable.jsp.header2"/></h2> +<h2><bean:message key="snippetdetails.jsp.header2"/></h2> <div> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="cobbler.snippet.path"/>: @@ -48,7 +48,7 @@ </table> <h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="snippetcreate.jsp.contents"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index 850188e..64d4342 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -8,33 +8,33 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> -<h2><bean:message key="kickstarttable.jsp.header2"/></h2> +<h2><bean:message key="kickstartdetails.jsp.header2"/></h2> <div> <c:choose><c:when test="${empty requestScope.invalid}"> - <bean:message key="kickstarttable.jsp.summary1"/> + <bean:message key="kickstartdetails.jsp.summary1"/> <html:form method="post" action="/kickstart/KickstartDetailsEdit.do"> <rhn:csrf /> <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> - <th><rhn:required-field key="kickstarttable.jsp.label"/>:</th> + <th><rhn:required-field key="kickstartdetails.jsp.label"/>:</th> <td><html:text property="label" maxlength="64" size="32" /><br/> - <span class="small-text"><bean:message key="kickstarttable.jsp.labelwarning" /></span></td> + <span class="small-text"><bean:message key="kickstartdetails.jsp.labelwarning" /></span></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.install_type" /></th> + <th><bean:message key="kickstartdetails.jsp.install_type" /></th> <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong> - <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstarttable.jsp.changeos"/>)</a></td> + <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstartdetails.jsp.changeos"/>)</a></td> </tr> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> <tr> - <th><bean:message key="kickstarttable.jsp.active"/></th> + <th><bean:message key="kickstartdetails.jsp.active"/></th> <td> <table> <tr> @@ -42,55 +42,55 @@ <html:checkbox property="active" /> </td> <td> - <span class="small-text"><bean:message key="kickstarttable.jsp.activeDescription"/></span> + <span class="small-text"><bean:message key="kickstartdetails.jsp.activeDescription"/></span> </td> </tr> </table> </td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.postlog"/></th> - <td><table><tr><td><html:checkbox property="post_log" /></td><td><bean:message key="kickstarttable.jsp.postlog.msg" /></td></tr></table></td> + <th><bean:message key="kickstartdetails.jsp.postlog"/></th> + <td><table><tr><td><html:checkbox property="post_log" /></td><td><bean:message key="kickstartdetails.jsp.postlog.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.prelog"/></th> - <td><table><tr><td><html:checkbox property="pre_log" /></td><td><bean:message key="kickstarttable.jsp.prelog.msg" /></td></tr></table></td> + <th><bean:message key="kickstartdetails.jsp.prelog"/></th> + <td><table><tr><td><html:checkbox property="pre_log" /></td><td><bean:message key="kickstartdetails.jsp.prelog.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.kscfg"/></th> - <td><table><tr><td><html:checkbox property="ksCfg" /></td><td><bean:message key="kickstarttable.jsp.kscfg.msg" /></td></tr></table></td> + <th><bean:message key="kickstartdetails.jsp.kscfg"/></th> + <td><table><tr><td><html:checkbox property="ksCfg" /></td><td><bean:message key="kickstartdetails.jsp.kscfg.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.org_default" /></th> - <td><table><tr><td><html:checkbox property="org_default" /></td><td><bean:message key="kickstarttable.jsp.summary2" arg0="${ksurl}" /></td></tr></table></td> + <th><bean:message key="kickstartdetails.jsp.org_default" /></th> + <td><table><tr><td><html:checkbox property="org_default" /></td><td><bean:message key="kickstartdetails.jsp.summary2" arg0="${ksurl}" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.kernel_options"/></th> + <th><bean:message key="kickstartdetails.jsp.kernel_options"/></th> <td><html:text property="kernel_options" maxlength="1024" size="32" /></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.post_kernel_options"/></th> + <th><bean:message key="kickstartdetails.jsp.post_kernel_options"/></th> <td><html:text property="post_kernel_options" maxlength="1024" size="32" /></td> </tr> <tr> - <th><bean:message key="kickstarttable.jsp.comments"/></th> + <th><bean:message key="kickstartdetails.jsp.comments"/></th> <td><html:textarea property="comments" cols="80" rows="6"/></td> </tr> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> </tr> </table> </html:form> </c:when> <c:otherwise> - <p><bean:message key="kickstarttable.invalid.jsp.summary"/> - <bean:message key="kickstarttable.invalid.jsp.summary-option1" + <p><bean:message key="kickstartdetails.invalid.jsp.summary"/> + <bean:message key="kickstartdetails.invalid.jsp.summary-option1" arg0="${ksdata.tree.label}" arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p> - <p><bean:message key="kickstarttable.invalid.jsp.summary-option2" + <p><bean:message key="kickstartdetails.invalid.jsp.summary-option2" arg0="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}"/></p> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp index 3719976..dd66653 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstartoptions.jsp.header1"/></h2> @@ -19,7 +19,7 @@ </p> <form method="post" action="/rhn/kickstart/KickstartOptionsEdit.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <c:forEach items="${options}" var="option"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index 9948fcc..c60375e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.partition.jsp.header"/></h2> @@ -21,10 +21,10 @@ </p> <html:form method="post" action="/kickstart/KickstartPartitionEdit.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th> - <rhn:required-field key="kickstart.partition.jsp.partitiontable"/>: + <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: </th> <td> <html:textarea rows="6" cols="80" property="partitions"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index b69e34d..cfbf027 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.locale.jsp.header1"/></h2> @@ -21,7 +21,7 @@ <rhn:csrf /> <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="kickstart.locale.jsp.timezone" /></th> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf index a077443..3c26690 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf +++ b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf @@ -1,4 +1,4 @@ - <table class="table"> + <table class="details"> <tr> <td colspan="2"> <h2><bean:message key="kickstart.script.langheader"/></h2> @@ -77,6 +77,6 @@ </td> </tr> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp index 9d33c14..5e0dcc0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp @@ -11,7 +11,7 @@ </rhn:toolbar> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.scriptdelete.jsp.header2"/></h2> @@ -21,7 +21,7 @@ <bean:message key="kickstart.scriptdelete.jsp.summary1"/> <html:form method="POST" action="/kickstart/KickstartScriptDelete.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <td colspan="2"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 1dec13f..1b93de0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -45,7 +45,7 @@ function clickNewestTree() { <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="softwareedit.jsp.header2"/></h2> @@ -57,7 +57,7 @@ function clickNewestTree() { <html:form method="post" action="/kickstart/KickstartSoftwareEdit.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><rhn:required-field key="softwareedit.jsp.basechannel"/>:</th> <td> @@ -158,7 +158,7 @@ function clickNewestTree() { </tr> </c:if> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> </tr> </table> <html:hidden property="url" value="${kickstartSoftwareForm.map.url}"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp index a935717..b7fc63e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp @@ -47,7 +47,7 @@ <h2><bean:message key="ssm.kickstartable-systems.jsp.systems"/></h2> <p><bean:message key="ssm.kickstartable-systems.jsp.systems.summary"/></p> -<table class="table"> +<table class="details"> <tr> <th> <bean:message key="ssm.kickstartable-systems.jsp.type"/>: diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 6f9a481..dfec5eb 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -55,10 +55,10 @@ <br/> <h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> - <table class="table"> + <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <tr> - <th width="10%"><bean:message key="kickstarttable.jsp.kernel_options" />:</th> + <th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th> <td> <input type="radio" name="kernelParamsType" value="distro" onclick="form.kernelParamsId.disabled = true;" <c:if test="${empty form.kernelParamsType or form.kernelParamsType == 'distro'}">checked="checked"</c:if> @@ -83,7 +83,7 @@ </td> </tr> <tr> - <th width="10%"><bean:message key="kickstarttable.jsp.post_kernel_options" />:</th> + <th width="10%"><bean:message key="kickstartdetails.jsp.post_kernel_options" />:</th> <td> <input type="radio" name="postKernelParamsType" value="distro" onclick="form.postKernelParamsId.disabled = true;" <c:if test="${empty form.postKernelParamsType or form.postKernelParamsType == 'distro'}">checked="checked"</c:if> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index 5303d85..2f02a3d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -47,7 +47,7 @@ boolean staticIfDisabled = Boolean.valueOf( <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> @@ -57,10 +57,10 @@ boolean staticIfDisabled = Boolean.valueOf( <rhn:csrf /> <html:hidden property="ksid" /> <html:hidden property="submitted" /> - <h2><bean:message key="kickstart.systemtable.jsp.header1"/></h2> + <h2><bean:message key="kickstart.systemdetails.jsp.header1"/></h2> <c:if test="${not ksdata.legacyKickstart}"> - <h2><bean:message key="kickstart.systemtable.jsp.header2"/></h2> - <table class="table"> + <h2><bean:message key="kickstart.systemdetails.jsp.header2"/></h2> + <table class="details"> <tr> <th><bean:message key="kickstart.selinux.jsp.label" />:</th> <td> @@ -72,8 +72,8 @@ boolean staticIfDisabled = Boolean.valueOf( </table> </c:if> - <h2><bean:message key="kickstart.systemtable.jsp.header3"/></h2> - <table class="table"> + <h2><bean:message key="kickstart.systemdetails.jsp.header3"/></h2> + <table class="details"> <tr> <th><bean:message key="kickstart.config.mgmt.jsp.label" />:</th> <td><html:checkbox property="configManagement" /><br /> @@ -96,8 +96,8 @@ boolean staticIfDisabled = Boolean.valueOf( </tr> </table> - <h2><bean:message key="kickstart.systemtable.jsp.header4"/></h2> - <table class="table"> + <h2><bean:message key="kickstart.systemdetails.jsp.header4"/></h2> + <table class="details"> <tr> <th><bean:message key="kickstart.root.password.jsp.label" />:</th> <td><html:password property="rootPassword" maxlength="32" size="32" redisplay="false"/></td> @@ -108,7 +108,7 @@ boolean staticIfDisabled = Boolean.valueOf( </tr> <tr> <td align="right" colspan="2"> - <input type="submit" value="<bean:message key="kickstart.systemtable.edit.submit.jsp.label" />" /> + <input type="submit" value="<bean:message key="kickstart.systemdetails.edit.submit.jsp.label" />" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp index bf0d5fd..884520c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_table.xml" + definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.troubleshooting.jsp.header1"/></h2> @@ -19,7 +19,7 @@ </p> <html:form method="post" action="/kickstart/TroubleshootingEdit.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="kickstart.troubleshooting.jsp.bootloader" /></th> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp index de51c75..a29848f 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp @@ -11,50 +11,50 @@ <rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/org_trust.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="orgtrusttable.jsp.header1"/></h2> - <table class="table"> + <h2><bean:message key="orgtrustdetails.jsp.header1"/></h2> + <table class="details"> <tr> - <th><bean:message key="orgtrusttable.jsp.created"/></th> + <th><bean:message key="orgtrustdetails.jsp.created"/></th> <td>${created}</td> </tr> <tr> - <th><bean:message key="orgtrusttable.jsp.trusted"/></th> + <th><bean:message key="orgtrustdetails.jsp.trusted"/></th> <td>${since}</td> </tr> </table> -<h2><bean:message key="orgtrusttable.jsp.header2"/></h2> - <table class="table"> +<h2><bean:message key="orgtrustdetails.jsp.header2"/></h2> + <table class="details"> <tr> - <th><bean:message key="orgtrusttable.jsp.channelsprovided"/></th> + <th><bean:message key="orgtrustdetails.jsp.channelsprovided"/></th> <c:choose> <c:when test="${channelsfrom > 0}"> - <td><a href="/rhn/multiorg/channels/Provided.do?oid=${param.oid}">${channelsfrom}</a> (<bean:message key="orgtrusttable.jsp.systemconsume1" arg0="${sysleech}"/>)</td> + <td><a href="/rhn/multiorg/channels/Provided.do?oid=${param.oid}">${channelsfrom}</a> (<bean:message key="orgtrustdetails.jsp.systemconsume1" arg0="${sysleech}"/>)</td> </c:when> <c:otherwise> - <td>${channelsfrom} (<bean:message key="orgtrusttable.jsp.systemconsume1" arg0="${sysleech}"/>)</td> + <td>${channelsfrom} (<bean:message key="orgtrustdetails.jsp.systemconsume1" arg0="${sysleech}"/>)</td> </c:otherwise> </c:choose> </tr> <tr> - <th><bean:message key="orgtrusttable.jsp.channelsconsumed"/></th> + <th><bean:message key="orgtrustdetails.jsp.channelsconsumed"/></th> <c:choose> <c:when test="${channelsto > 0}"> - <td><a href="/rhn/multiorg/channels/Consumed.do?oid=${param.oid}">${channelsto}</a> (<bean:message key="orgtrusttable.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}"/>)</td> + <td><a href="/rhn/multiorg/channels/Consumed.do?oid=${param.oid}">${channelsto}</a> (<bean:message key="orgtrustdetails.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}"/>)</td> </c:when> <c:otherwise> - <td>${channelsto} (<bean:message key="orgtrusttable.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}" />)</td> + <td>${channelsto} (<bean:message key="orgtrustdetails.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}" />)</td> </c:otherwise> </c:choose> </tr> </table> -<h2><bean:message key="orgtrusttable.jsp.header3"/></h2> - <table class="table"> +<h2><bean:message key="orgtrustdetails.jsp.header3"/></h2> + <table class="details"> <tr> - <th><bean:message key="orgtrusttable.jsp.sysmigratedto"/></th> + <th><bean:message key="orgtrustdetails.jsp.sysmigratedto"/></th> <td>${migrationsto}</td> </tr> <tr> - <th><bean:message key="orgtrusttable.jsp.sysmigratedfrom"/></th> + <th><bean:message key="orgtrustdetails.jsp.sysmigratedfrom"/></th> <td>${migrationsfrom}</td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp index 6474131..28303a4 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -12,12 +12,12 @@ <rhn:csrf /> <div class="page-summary"> - <bean:message key="profile.table.summary"/> + <bean:message key="profile.details.summary"/> </div> <hr> - <table class="table"> + <table class="details"> <tr> <th nowrap="nowrap"> <bean:message key="row.name"/>: diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp index 13aa6fe..f9a6874 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp @@ -25,7 +25,7 @@ <html:form method="post" action="/systems/ssm/MigrateSystems.do"> <rhn:csrf /> <rhn:submitted /> - <table class="table"> + <table class="details"> <tr> <th> <bean:message key="ssm.migrate.systems.org"/> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp index bdc6332..5c4622e 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp @@ -23,7 +23,7 @@ <p><bean:message key="ssm.misc.lockunlock.summary" /></p> <rl:listset name="systemsListSet" legend="system"> - <table class="table"> + <table class="details"> <tbody> <tr> <th><label for="lock-reason">Lock reason:</label></th> @@ -50,7 +50,7 @@ <c:choose> <c:when test="${current.locked > 0}"> <img src="/img/icon_locked.gif"/> - <a href="/rhn/systems/table/Overview.do?sid=${current.id}">${current.name}</a> + <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a> </c:when> <c:otherwise> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index f9b9df1..f76c9a7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -14,7 +14,7 @@ <span class="toolbar"> <c:choose> <c:when test="${not empty param.cnid}"> - <a href="/rhn/systems/table/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> + <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.note"/>" ></i> <bean:message key="toolbar.delete.note"/> @@ -22,7 +22,7 @@ | </c:when> </c:choose> - <a href="/rhn/systems/table/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> + <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> @@ -43,22 +43,22 @@ <c:choose> <c:when test="${empty param.cnid}"> <br /> - <bean:message key="table.crashnotes.createnote"/> + <bean:message key="details.crashnotes.createnote"/> </c:when> </c:choose> - <html:form method="post" action="/systems/table/EditCrashNote.do"> + <html:form method="post" action="/systems/details/EditCrashNote.do"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="sid" value="${sid}"/> <html:hidden property="crid" value="${crid}"/> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="sdc.table.notes.subject"/></th> + <th><bean:message key="sdc.details.notes.subject"/></th> <td><html:text property="subject" maxlength="128" size="40" styleId="subject" /></td> </tr> <tr> - <th><bean:message key="sdc.table.notes.details"/></th> + <th><bean:message key="sdc.details.notes.details"/></th> <td><html:textarea property="note" cols="40" rows="6" styleId="note"/></td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index aed92f8..31c4a2c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -12,7 +12,7 @@ <div class="toolbar-h2"> <div class="toolbar"> <span class="toolbar"> - <a href="/rhn/systems/table/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> + <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> @@ -29,21 +29,21 @@ <br /> <%@ include file="/WEB-INF/pages/common/fragments/systems/crash-header.jspf" %> <div class="page-summary"> - <p><bean:message key="table.crashnotes.delete.confirm"/></p> + <p><bean:message key="details.crashnotes.delete.confirm"/></p> </div> - <html:form method="post" action="/systems/table/DeleteCrashNote.do"> + <html:form method="post" action="/systems/details/DeleteCrashNote.do"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="sid" value="${sid}"/> <html:hidden property="crid" value="${crid}"/> <html:hidden property="cnid" value="${cnid}"/> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="sdc.table.notes.subject"/></th> + <th><bean:message key="sdc.details.notes.subject"/></th> <td>${subject}</td> </tr> <tr> - <th><bean:message key="sdc.table.notes.details"/></th> + <th><bean:message key="sdc.details.notes.details"/></th> <td>${note}</td> </tr> </table> @@ -51,7 +51,7 @@ <hr/> <div class="text-right"> <html:submit> - <bean:message key="sdc.table.notes.delete"/> + <bean:message key="sdc.details.notes.delete"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index f4e4303..f2501a1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -29,7 +29,7 @@ <form action="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="system.jsp.customkey.keylabel"/>:</th> <td><input disabled="true" type="text" name="label" length="64" size="30" value="<c:out value="${label}" />"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp index 329598c..8ed7a59 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp @@ -12,38 +12,38 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><bean:message key="system.audit.ruletable.jsp.heading"/></h2> +<h2><bean:message key="system.audit.ruledetails.jsp.heading"/></h2> <rhn:csrf/> -<table class="table"> +<table class="details"> <tr> - <th><bean:message key="system.audit.ruletable.jsp.idref"/>:</th> + <th><bean:message key="system.audit.ruledetails.jsp.idref"/>:</th> <td><c:out value="${ruleResult.documentIdref}"/></td> </tr> <tr> - <th><bean:message key="system.audit.ruletable.jsp.result"/>:</th> + <th><bean:message key="system.audit.ruledetails.jsp.result"/>:</th> <td><c:out value="${ruleResult.label}"/></td> </tr> <tr> - <th><bean:message key="system.audit.ruletable.jsp.parent"/>:</th> + <th><bean:message key="system.audit.ruledetails.jsp.parent"/>:</th> <td> - <a href="/rhn/systems/table/audit/XccdfDetails.do?sid=${param.sid}&xid=${ruleResult.testResult.id}"> + <a href="/rhn/systems/details/audit/XccdfDetails.do?sid=${param.sid}&xid=${ruleResult.testResult.id}"> <c:out value="${ruleResult.testResult.identifier}"/> </a> </td> </tr> </table> -<h2><bean:message key="system.audit.ruletable.jsp.assignedidents"/></h2> +<h2><bean:message key="system.audit.ruledetails.jsp.assignedidents"/></h2> <rl:listset name="groupSet"> <rhn:csrf/> - <rl:list emptykey="system.audit.ruletable.jsp.noidents"> + <rl:list emptykey="system.audit.ruledetails.jsp.noidents"> - <rl:column headerkey="system.audit.ruletable.jsp.system" sortattr="system" sortable="true"> + <rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true"> <c:out value="${current.system}"/> </rl:column> - <rl:column headerkey="system.audit.ruletable.jsp.ident" sortattr="identifier" sortable="true"> + <rl:column headerkey="system.audit.ruledetails.jsp.ident" sortattr="identifier" sortable="true"> <c:out value="${current.identifier}"/> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp index 3d19205..0720883 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp @@ -19,17 +19,17 @@ <img src="/img/rhn-listicon-${testResult.diffIcon}.gif" alt="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>" title="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>"/> - <bean:message key="system.audit.xccdftable.jsp.diff"/> + <bean:message key="system.audit.xccdfdetails.jsp.diff"/> </a> </c:when> <c:otherwise> - <bean:message key="system.audit.xccdftable.jsp.nodiff"/> + <bean:message key="system.audit.xccdfdetails.jsp.nodiff"/> </c:otherwise> </c:choose> | <c:if test="${testResult.deletable}"> - <a href="/rhn/systems/table/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> + <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> <i class="icon-trash" title="<bean:message key="system.audit.xccdfdelete"/>"></i> <bean:message key="system.audit.xccdfdelete"/> @@ -37,22 +37,22 @@ | </c:if> - <a href="/rhn/systems/table/audit/ScheduleXccdf.do?sid=${param.sid}&path=${testResult.scapActionDetails.path}&params=${testResult.scapActionDetails.parametersContents}"> - <img src="/img/restart.png" alt="<bean:message key="system.audit.xccdftable.jsp.reschedule"/>"/> - <bean:message key="system.audit.xccdftable.jsp.reschedule"/> + <a href="/rhn/systems/details/audit/ScheduleXccdf.do?sid=${param.sid}&path=${testResult.scapActionDetails.path}&params=${testResult.scapActionDetails.parametersContents}"> + <img src="/img/restart.png" alt="<bean:message key="system.audit.xccdfdetails.jsp.reschedule"/>"/> + <bean:message key="system.audit.xccdfdetails.jsp.reschedule"/> </a> </div> -<h2><bean:message key="system.audit.xccdftable.jsp.header"/></h2> +<h2><bean:message key="system.audit.xccdfdetails.jsp.header"/></h2> <rhn:csrf/> -<table class="table"> +<table class="details"> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.id"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.id"/>:</th> <td><c:out value="${testResult.id}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.path"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.path"/>:</th> <td><c:out value="${testResult.scapActionDetails.path}"/></td> </tr> <tr> @@ -63,45 +63,45 @@ <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th> <td> <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />"/> - <a href="/network/systems/table/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> + <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> <c:out value="${testResult.scapActionDetails.parentAction.schedulerUser.login}"/> </a> </td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.benchmarkid"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.benchmarkid"/>:</th> <td><c:out value="${testResult.benchmark.identifier}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.version"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.version"/>:</th> <td><c:out value="${testResult.benchmark.version}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.profileid"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.profileid"/>:</th> <td><c:out value="${testResult.profile.identifier}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.title"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.title"/>:</th> <td><c:out value="${testResult.profile.title}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.started"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.started"/>:</th> <td><c:out value="${testResult.startTime}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.completed"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.completed"/>:</th> <td><c:out value="${testResult.endTime}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.errors"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.errors"/>:</th> <td><pre><c:out value="${testResult.errrosContents}"/></pre></th> </tr> <c:if test="${not empty testResult.files}"> <tr> - <th><bean:message key="system.audit.xccdftable.jsp.files"/>:</th> + <th><bean:message key="system.audit.xccdfdetails.jsp.files"/>:</th> <td> <c:forEach items="${testResult.files}" var="file"> - <a href="/rhn/systems/table/audit/ScapResultDownload.do?sid=${param.sid}&xid=${param.xid}&name=${file.filename}" + <a href="/rhn/systems/details/audit/ScapResultDownload.do?sid=${param.sid}&xid=${param.xid}&name=${file.filename}" target="${file.HTML ? '_blank' : '_self'}"><c:out value="${file.filename}"/></a>   </c:forEach> </td> @@ -109,7 +109,7 @@ </c:if> </table> -<h2><bean:message key="system.audit.xccdftable.jsp.xccdfrules"/></h2> +<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2> <rl:listset name="xccdfDetails"> <rhn:csrf/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index bd4dd03..572e601 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@ -13,11 +13,11 @@ <bean:message key="kickstart.session_cancel.jsp.summary" /> <p> -<html:form method="POST" action="/systems/table/kickstart/SessionCancel.do"> +<html:form method="POST" action="/systems/details/kickstart/SessionCancel.do"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="kickstarttable.jsp.label" /></th> + <th><bean:message key="kickstartdetails.jsp.label" /></th> <td><a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${ksession.ksdata.id}">${ksession.ksdata.label}</td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp index e8ebfb4..15f78e8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp @@ -9,7 +9,7 @@ <head> <meta name="name" value="System Details" /> <style type="text/css"> - .table td, .table th { white-space: nowrap; } + .details td, .details th { white-space: nowrap; } </style> <c:if test="${not failed and not complete}"> <script type="text/javascript" src="/javascript/rememberScroll.js"> </script> @@ -19,11 +19,11 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <div class="page-summary"> -<h2><bean:message key="kickstarttable.jsp.header2"/></h2> +<h2><bean:message key="kickstartdetails.jsp.header2"/></h2> -<table class="table"> +<table class="details"> <tr> - <th><bean:message key="kickstarttable.jsp.label" /></th> + <th><bean:message key="kickstartdetails.jsp.label" /></th> <td><a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${ksdata.id}">${ksdata.label}</td> </tr> <tr> @@ -49,7 +49,7 @@ <tr> <td> -<table class="table"> +<table class="details"> <tr> <th><bean:message key="kickstart.session_status.jsp.next_action" /></th> <td> @@ -94,7 +94,7 @@ <tr> <th><bean:message key="kickstart.session_status.jsp.cancel_cancel" /></th> <td> - <a href="/rhn/systems/table/kickstart/SessionCancel.do?sid=${system.id}"><bean:message key="kickstart.session_cancel.jsp.cancel"/></a> + <a href="/rhn/systems/details/kickstart/SessionCancel.do?sid=${system.id}"><bean:message key="kickstart.session_cancel.jsp.cancel"/></a> </td> </tr> </c:if> @@ -201,7 +201,7 @@ </tr> </table> </div> -<form id="saveScrollPosition" method="POST" action="/rhn/systems/table/kickstart/SessionStatus.do?sid=${requestScope.sid}"> +<form id="saveScrollPosition" method="POST" action="/rhn/systems/details/kickstart/SessionStatus.do?sid=${requestScope.sid}"> <rhn:csrf /> <rhn:submitted /> <input id="scrollPosX" type="hidden" name="xPosition" value="${requestScope.scrollX}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp index 699d2cb..f3274c8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp @@ -20,13 +20,13 @@ </p> </div> - <table class="table"> + <table class="details"> <tr> - <th><bean:message key="packagetable.description"/></th> + <th><bean:message key="packagedetails.description"/></th> <td><pre>${package.description}</pre></td> </tr> </table> -<form method="POST" name="install_patchset" action="/rhn/systems/table/packages/patchsets/InstallPatchSetSubmit.do"> +<form method="POST" name="install_patchset" action="/rhn/systems/details/packages/patchsets/InstallPatchSetSubmit.do"> <rhn:csrf /> <input type="hidden" name="sid" value="${param.sid}" /> <input type="hidden" name="pid" value="${param.pid}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index 9ee88db..4cb272c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -48,7 +48,7 @@ function setStep(stepName) { </rl:list> <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> - <table class="table"> + <table class="details"> <tr> <th><rhn:required-field key="virtualization.provision.first.jsp.guest_name.header"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp index 9c6cccb..a268a03 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp @@ -25,13 +25,13 @@ function refreshNotifFields() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" icon="icon-desktop" - deletionUrl="/rhn/systems/table/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" + deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe"> <bean:message key="probeedit.jsp.editprobe" /> </rhn:toolbar> -<html:form action="/systems/table/probes/ProbeEdit" method="POST"> +<html:form action="/systems/details/probes/ProbeEdit" method="POST"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="probeedit.jsp.probecommand" /></th> <td colspan="3">${probe.command.description}</td> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index f444045..ca15a65 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -23,9 +23,9 @@ <hr /> - <form action="/rhn/systems/table/DeleteCustomData.do?sid=${system.id}&cikid=${cikid}" name="edit_token" method="post"> + <form action="/rhn/systems/details/DeleteCustomData.do?sid=${system.id}&cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="system.jsp.customdata.keylabel"/>:</th> <td>${label}</td> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp index d0bfc67..3bfc00b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp @@ -8,30 +8,30 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" icon="icon-info-sign" - creationUrl="/rhn/systems/table/CreateCustomData.do?sid=${system.id}" + creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}" creationType="customdata"> - <bean:message key="sdc.table.customdata.header"/> + <bean:message key="sdc.details.customdata.header"/> </rhn:toolbar> <div class="page-summary"> - <p><bean:message key="sdc.table.customdata.summary"/></p> + <p><bean:message key="sdc.details.customdata.summary"/></p> </div> <c:choose> <c:when test="${listEmpty == 1}"> <div class="list-empty-message"> - <bean:message key="sdc.table.customdata.nosystems"/> + <bean:message key="sdc.details.customdata.nosystems"/> </div> </c:when> <c:otherwise> - <table class="table"> + <table class="details"> <c:forEach items="${pageList}" var="current" varStatus="loop"> <tr> <th>${current.label}</th> <td width="50%"> <pre><c:out value="${current.value}" /></pre> - <a href="/rhn/systems/table/UpdateCustomData.do?sid=${system.id}&cikid=${current.cikid}"> - <bean:message key="sdc.table.customdata.editvalue"/> + <a href="/rhn/systems/details/UpdateCustomData.do?sid=${system.id}&cikid=${current.cikid}"> + <bean:message key="sdc.details.customdata.editvalue"/> </a> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp index cf85bdd..c9caa55 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp @@ -6,15 +6,15 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.table.migrate.header"/></h2> + <h2><bean:message key="sdc.details.migrate.header"/></h2> - <html:form method="post" action="/systems/table/SystemMigrate.do?sid=${system.id}"> + <html:form method="post" action="/systems/details/SystemMigrate.do?sid=${system.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th> - <bean:message key="sdc.table.migrate.org"/> + <bean:message key="sdc.details.migrate.org"/> </th> <td> <html:select property="to_org"> @@ -30,7 +30,7 @@ <hr/> <div class="text-right"> <html:submit> - <bean:message key="sdc.table.migrate.migrate"/> + <bean:message key="sdc.details.migrate.migrate"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp index 3315c21..70caec6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp @@ -7,18 +7,18 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-note.gif" alt="" /><bean:message key="sdc.table.notes.delete.header"/> + <img src="/img/rhn-icon-note.gif" alt="" /><bean:message key="sdc.details.notes.delete.header"/> </h2> <div class="page-summary"> - <p><bean:message key="sdc.table.notes.delete.confirm"/></p> + <p><bean:message key="sdc.details.notes.delete.confirm"/></p> </div> - <html:form method="post" action="/systems/table/DeleteNote.do?sid=${system.id}&nid=${n.id}"> + <html:form method="post" action="/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="table"> + <table class="details"> <tr> <th> - <bean:message key="sdc.table.notes.subject"/> + <bean:message key="sdc.details.notes.subject"/> </th> <td> ${subject} @@ -26,7 +26,7 @@ </tr> <tr> <th> - <bean:message key="sdc.table.notes.details"/> + <bean:message key="sdc.details.notes.details"/> </th> <td> ${note} @@ -35,7 +35,7 @@ <hr/> <div class="text-right"> <html:submit> - <bean:message key="sdc.table.notes.delete"/> + <bean:message key="sdc.details.notes.delete"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp index 83b2606..942bb62 100644 --- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp @@ -22,7 +22,7 @@ <br /> - <table class="table"> + <table class="details"> <tr> <th><bean:message key="crashes.jsp.uuid"/></th> <td><c:out value="${crashesSummary.uuid}"/></td> @@ -60,7 +60,7 @@ sortattr="serverName" sortable="true" filterattr="serverName"> - <a href="/rhn/systems/table/SoftwareCrashDetail.do?crid=${current.crashId}&sid=${current.serverId}"> + <a href="/rhn/systems/details/SoftwareCrashDetail.do?crid=${current.crashId}&sid=${current.serverId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> </rl:column> commit 2d0ab1ff9b13d4c5bd44e99ee4fe4b8c6ec8506b Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 25 18:18:55 2013 +0200 TB3: Monitoring/Probe suite/create or edit diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp index f5c96e7..295a8d0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp @@ -9,33 +9,28 @@ <head> <meta name="page-decorator" content="none" /> </head> -<body> -<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" - helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> - <bean:message key="probesuitecreate.jsp.header1" /> - </rhn:toolbar> - - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/probesuite_detail_create.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - -<h2><bean:message key="probesuitecreate.jsp.header"/></h2> - - - -<html:form action="/monitoring/config/ProbeSuiteCreate" method="POST"> - <rhn:csrf /> - <rhn:submitted /> - <%@ include file="suite-form.jspf" %> - <tr> - <td></td> - <td align="right"><html:submit><bean:message key="probesuitecreate.jsp.createsuite"/></html:submit></td> - </tr> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> -</html:form> - + <body> + <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" + helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> + <bean:message key="probesuitecreate.jsp.header1" /> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/probesuite_detail_create.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="probesuitecreate.jsp.header"/></h2> + <html:form action="/monitoring/config/ProbeSuiteCreate" method="POST" styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="suite-form.jspf" %> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="probesuitecreate.jsp.createsuite"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp index fde286f..0a11c5e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp @@ -9,33 +9,29 @@ <head> <meta name="page-decorator" content="none" /> </head> -<body> -<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" - helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> - <bean:message key="probesuiteedit.jsp.header1" arg0="${probeSuite.suiteName}" /> - </rhn:toolbar> - - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/probesuite_detail_edit.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - -<h2><bean:message key="probesuiteedit.jsp.header"/></h2> - - - -<html:form action="/monitoring/config/ProbeSuiteEdit" method="POST"> - <rhn:csrf /> - <rhn:submitted /> - <%@ include file="suite-form.jspf" %> - <tr> - <td></td> - <td align="right"><html:submit><bean:message key="probesuiteedit.jsp.updatesuite"/></html:submit></td> - </tr> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> -</html:form> + <body> + <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" + helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> + <bean:message key="probesuiteedit.jsp.header1" arg0="${probeSuite.suiteName}" /> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/probesuite_detail_edit.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="probesuiteedit.jsp.header"/></h2> + <html:form action="/monitoring/config/ProbeSuiteEdit" method="POST" styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="suite-form.jspf" %> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="probesuiteedit.jsp.updatesuite"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf index a9ddff8..3359581 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf @@ -1,17 +1,16 @@ - <table class="table"> - <tr> - <th> - <rhn:required-field key="probesuiteedit.jsp.suitename"/> - </th> - <td> - <html:text property="suite_name" maxlength="40" size="20" /> - </td> - </tr> - <tr> - <th> - <bean:message key="probesuiteedit.jsp.description"/> - </th> - <td> - <html:text property="description" maxlength="255" size="50" /> - </td> - </tr> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="probesuiteedit.jsp.suitename"/> + </label> + <div class="col-lg-6"> + <html:text property="suite_name" maxlength="40" size="20" styleClass="form-control"/> + </div> +</div> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="probesuiteedit.jsp.description"/> + </label> + <div class="col-lg-6"> + <html:text property="description" maxlength="255" size="50" styleClass="form-control"/> + </div> +</div> commit a74b6a54b9c0b8ad882fa8a21156617df5bf8e1f Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 25 18:02:45 2013 +0200 TB3: Configuration/channel/channel create form diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf index 01914c9..4cb0591 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf @@ -1,26 +1,38 @@ - <table class="table"> - <tr> - <th><bean:message key="channelOverview.jsp.name-edit" /></th> - <td><html:text property="cofName" maxlength="128" size="18"></html:text></td> - </tr> - <tr> - <th><bean:message key="channelOverview.jsp.label-edit" /></th> - <td><html:text property="cofLabel" maxlength="64" size="18"></html:text></td> - </tr> - <tr> - <th><bean:message key="channelOverview.jsp.descr-edit" /></th> - <td><html:textarea property="cofDescription" rows="4" cols="40"></html:textarea></td> - </tr> - </table> - <div class="text-right"> - <hr /> - <html:submit> - <c:choose> - <c:when test='${channel != null}'> - <bean:message key="channel.edit.jsp.editchannel" /> - </c:when> - <c:otherwise> - <bean:message key="channelOverview.jsp.submitCreate" /> - </c:otherwise> - </c:choose> - </html:submit></div> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.name-edit" /> + </label> + <div class="col-lg-6"> + <html:text property="cofName" maxlength="128" size="18" styleClass="form-control"></html:text> + </div> +</div> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.label-edit" /> + </label> + <div class="col-lg-6"> + <html:text property="cofLabel" maxlength="64" styleClass="form-control" size="18"></html:text> + </div> +</div> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelOverview.jsp.descr-edit" /> + </label> + <div class="col-lg-6"> + <html:textarea property="cofDescription" rows="4" styleClass="form-control" cols="40"></html:textarea> + </div> +</div> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <c:choose> + <c:when test='${channel != null}'> + <bean:message key="channel.edit.jsp.editchannel" /> + </c:when> + <c:otherwise> + <bean:message key="channelOverview.jsp.submitCreate" /> + </c:otherwise> + </c:choose> + </html:submit> + </div> +</div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp index f84d0b5..b21f130 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp @@ -1,25 +1,25 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://struts.apache.org/tags-html" - prefix="html"%> + prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-bean" - prefix="bean"%> + prefix="bean"%> <html:xhtml /> <html> -<body> -<rhn:toolbar base="h1" img="/img/rhn-config_central.gif" - imgAlt="config.common.globalAlt" - helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-channels"> - <bean:message key="channelOverview.jsp.newToolbar" /> -</rhn:toolbar> + <body> + <rhn:toolbar base="h1" img="/img/rhn-config_central.gif" + imgAlt="config.common.globalAlt" + helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-channels"> + <bean:message key="channelOverview.jsp.newToolbar" /> + </rhn:toolbar> -<p><bean:message key="channelOverview.jsp.create-instruction" /></p> - <html:form action="/configuration/ChannelCreate"> - <rhn:csrf /> - <html:hidden property="creating" value="true"/> - <html:hidden property="submitted" value="true"/> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> - </html:form> -</body> + <p><bean:message key="channelOverview.jsp.create-instruction" /></p> + <html:form action="/configuration/ChannelCreate" styleClass="form-horizontal"> + <rhn:csrf /> + <html:hidden property="creating" value="true"/> + <html:hidden property="submitted" value="true"/> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> + </html:form> + </body> </html> commit 0bd1ed6210b76718f7791b7ffd16596cc77c3c32 Author: cyntss <csanchez(a)suse.com> Date: Fri Oct 25 18:00:45 2013 +0200 Zoom scale 1 for mobiles. empty spaces deleted. Panels added. diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 713f219..65d9605 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -28,6 +28,7 @@ <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> + <meta name="viewport" content="initial-scale=1"> <rhn:require acl="is(development_environment)"> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index 08c24e8..8d32271 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -47,8 +47,8 @@ </rl:column> <rl:column sortable="true" - bound="false" - sortattr="advisory" + bound="false" + sortattr="advisory" headerkey="erratalist.jsp.advisory" > <a href="/rhn/errata/details/Details.do?eid=${current.id}"> @@ -58,7 +58,7 @@ <rl:column sortable="false" - bound="false" + bound="false" headerkey="erratalist.jsp.synopsis" > <c:out value="${current.advisorySynopsis}" /> @@ -66,11 +66,11 @@ <rl:column sortable="true" - bound="false" - headerkey="erratalist.jsp.updated" - sortattr="updateDateObj" - defaultsort="desc" - > + bound="false" + headerkey="erratalist.jsp.updated" + sortattr="updateDateObj" + defaultsort="desc" + > ${current.updateDate} </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp index 9dcaa0e..32ebef0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp @@ -8,87 +8,96 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.details.hardware.header"/></h2> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.header"/></h4> + </div> + <div class="panel-body"> + <bean:message key="sdc.details.hardware.refresh"/> + <html:form method="post" action="/systems/details/SystemHardware.do?sid=${sid}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true"/> + <div class="text-right"> + <html:submit styleClass="btn btn-default"> + <bean:message key="sdc.details.hardware.schedule"/> + </html:submit> + </div> + </div> + </div> - <bean:message key="sdc.details.hardware.refresh"/> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.general"/></h4> + </div> + <div class="panel-body"> + <c:if test="${cpu_mhz != null}" > + (${cpu_count}) ${cpu_model} (${cpu_mhz} MHz) + </c:if> - <html:form method="post" action="/systems/details/SystemHardware.do?sid=${sid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - <div class="text-right"> - <html:submit styleClass="btn btn-default"> - <bean:message key="sdc.details.hardware.schedule"/> - </html:submit> - </div> - - <h2><bean:message key="sdc.details.hardware.general"/></h2> - - <c:if test="${cpu_mhz != null}" > - (${cpu_count}) ${cpu_model} (${cpu_mhz} MHz) - </c:if> - - <table class="table table-condensed"> - <tr> - <th> - <bean:message key="sdc.details.hardware.arch"/> - </th> - <td> - ${cpu_arch} - </td> - <th> - <bean:message key="sdc.details.hardware.sockets"/> - </th> - <td> - ${cpu_sockets} - </td> - <th> - <bean:message key="sdc.details.hardware.cache"/> - </th> - <td> - ${cpu_cache} - </td> - </tr> - <tr> - <th> - <bean:message key="sdc.details.hardware.vendor"/> - </th> - <td> - ${cpu_vendor} - </td> - <th> - <bean:message key="sdc.details.hardware.cores"/> - </th> - <td> - ${cpu_cores} - </td> - <th> - <bean:message key="sdc.details.hardware.memory"/> - </th> - <td> - ${system_ram} MB - </td> - </tr> - <tr> - <th> - <bean:message key="sdc.details.hardware.family"/> - </th> - <td> - ${cpu_family} - </td> - <th> - <bean:message key="sdc.details.hardware.stepping"/> - </th> - <td> - ${cpu_stepping} - </td> - <th> - <bean:message key="sdc.details.hardware.swap"/> - </th> - <td> - ${system_swap} MB - </td> - </tr> - </table> + <table class="table table-condensed"> + <tr> + <th> + <bean:message key="sdc.details.hardware.arch"/> + </th> + <td> + ${cpu_arch} + </td> + <th> + <bean:message key="sdc.details.hardware.sockets"/> + </th> + <td> + ${cpu_sockets} + </td> + <th> + <bean:message key="sdc.details.hardware.cache"/> + </th> + <td> + ${cpu_cache} + </td> + </tr> + <tr> + <th> + <bean:message key="sdc.details.hardware.vendor"/> + </th> + <td> + ${cpu_vendor} + </td> + <th> + <bean:message key="sdc.details.hardware.cores"/> + </th> + <td> + ${cpu_cores} + </td> + <th> + <bean:message key="sdc.details.hardware.memory"/> + </th> + <td> + ${system_ram} MB + </td> + </tr> + <tr> + <th> + <bean:message key="sdc.details.hardware.family"/> + </th> + <td> + ${cpu_family} + </td> + <th> + <bean:message key="sdc.details.hardware.stepping"/> + </th> + <td> + ${cpu_stepping} + </td> + <th> + <bean:message key="sdc.details.hardware.swap"/> + </th> + <td> + ${system_swap} MB + </td> + </tr> + </table> + </div> + </div> <c:if test="${empty dmi_vendor}" var="no_vendor"/> <c:if test="${empty dmi_bios}" var="no_bios"/> @@ -98,132 +107,146 @@ <c:if test="${empty dmi_board}" var="no_board"/> <c:if test="${!(empty dmi_vendor and empty dmi_bios and empty dmi_system and empty dmi_product and empty dmi_asset_tag and empty dmi_board)}"> - <h2><bean:message key="sdc.details.hardware.dmi"/></h2> - <table class="table table-condensed"> - <tr> - <th> - <bean:message key="sdc.details.hardware.dmi_vendor"/> - </th> - <td> - ${dmi_vendor} - </td> - <th rowspan="2"> - <bean:message key="sdc.details.hardware.dmi_bios"/> - </th> - <td rowspan="2"> - ${dmi_bios} - </td> - </tr> - <tr> - <th> - <bean:message key="sdc.details.hardware.dmi_system"/> - </th> - <td> - ${dmi_system} - </td> - </tr> - <tr> - <th rowspan="2"> - <bean:message key="sdc.details.hardware.dmi_product"/> - </th> - <td rowspan="2"> - ${dmi_product} - </td> - <th> - <bean:message key="sdc.details.hardware.dmi_asset_tag"/> - </th> - <td> - ${dmi_asset_tag} - </td> - </tr> - <tr> - <th> - <bean:message key="sdc.details.hardware.dmi_board"/> - </th> - <td> - ${dmi_board} - </td> - </tr> - </table> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.dmi"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <tr> + <th> + <bean:message key="sdc.details.hardware.dmi_vendor"/> + </th> + <td> + ${dmi_vendor} + </td> + <th rowspan="2"> + <bean:message key="sdc.details.hardware.dmi_bios"/> + </th> + <td rowspan="2"> + ${dmi_bios} + </td> + </tr> + <tr> + <th> + <bean:message key="sdc.details.hardware.dmi_system"/> + </th> + <td> + ${dmi_system} + </td> + </tr> + <tr> + <th rowspan="2"> + <bean:message key="sdc.details.hardware.dmi_product"/> + </th> + <td rowspan="2"> + ${dmi_product} + </td> + <th> + <bean:message key="sdc.details.hardware.dmi_asset_tag"/> + </th> + <td> + ${dmi_asset_tag} + </td> + </tr> + <tr> + <th> + <bean:message key="sdc.details.hardware.dmi_board"/> + </th> + <td> + ${dmi_board} + </td> + </tr> + </table> + </div> + </div> </c:if> - <h2><bean:message key="sdc.details.hardware.networking"/></h2> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.networking"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <tr> + <th> + <bean:message key="sdc.details.hardware.network_hostname"/> + </th> + <td> + <c:choose> + <c:when test="${network_hostname == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${network_hostname}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + <c:forEach items="${network_cnames}" var="cname_alias" varStatus="loop"> + <tr> + <th> + <bean:message key="sdc.details.hardware.network_cname"/> + </th> + <td> + ${cname_alias} + </td> + </tr> + </c:forEach> + <tr> + <th> + <bean:message key="sdc.details.hardware.network_ip_addr"/> + </th> + <td> + ${network_ip_addr} + </td> + </tr> - <table class="table table-condensed"> - <tr> - <th> - <bean:message key="sdc.details.hardware.network_hostname"/> - </th> - <td> - <c:choose> - <c:when test="${network_hostname == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${network_hostname}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <c:forEach items="${network_cnames}" var="cname_alias" varStatus="loop"> - <tr> - <th> - <bean:message key="sdc.details.hardware.network_cname"/> - </th> - <td> - ${cname_alias} - </td> - </tr> - </c:forEach> - <tr> - <th> - <bean:message key="sdc.details.hardware.network_ip_addr"/> - </th> - <td> - ${network_ip_addr} - </td> - </tr> + <tr> + <th> + <bean:message key="sdc.details.hardware.network_ip6_addr"/> + </th> + <td> + ${network_ip6_addr} + </td> + </tr> - <tr> - <th> - <bean:message key="sdc.details.hardware.network_ip6_addr"/> - </th> - <td> - ${network_ip6_addr} - </td> - </tr> + <tr> + <th> + <c:out value="Primary network interface:"/> + </th> + <td> + <html:select property="primaryInterface" styleId="primaryInterface"> + <html:options collection="networkInterfaces" + property="value" + labelProperty="display"/> + </html:select> + </td> + </tr> - <tr> - <th> - <c:out value="Primary network interface:"/> - </th> - <td> - <html:select property="primaryInterface" styleId="primaryInterface"> - <html:options collection="networkInterfaces" - property="value" - labelProperty="display"/> - </html:select> - </td> - </tr> + </table> + </div> + </div> - </table> - <br/> <rhn:csrf /> - <div class="text-right"> + <div class="text-right margin-bottom-md"> <html:submit property="update_interface" styleClass="btn btn-default"> <bean:message key="sdc.details.edit.update"/> </html:submit> </div> - <br/> - <table class="table table-condensed" width="90%" cellspacing="0"> + + <div class="panel panel-default"> + <div class="panel-body"> + <table class="table table-condensed" width="90%" cellspacing="0"> <thead> <tr> - <th>Interface</th> - <th>IP Address</th> - <th>Netmask</th> - <th>Broadcast</th> - <th>Hardware Address</th> - <th>Driver Module</th> + <th>Interface</th> + <th>IP Address</th> + <th>Netmask</th> + <th>Broadcast</th> + <th>Hardware Address</th> + <th>Driver Module</th> </tr> </thead> <c:forEach items="${network_interfaces}" var="current" varStatus="loop"> @@ -273,259 +296,301 @@ </tr> </c:forEach> </table> - <br/> - <table class="table table-condensed"> - <thead> - <tr> - <th>Interface</th> - <th>IPv6 Address</th> - <th>Netmask</th> - <th>Scope</th> - <th>Hardware Address</th> - <th>Driver Module</th> - </tr> - </thead> - <c:forEach items="${ipv6_network_interfaces}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.name}</td> - <c:choose> - <c:when test="${empty current.ip6}"> - <td><span class="no-details">(unknown)</span></td> - </c:when> - <c:otherwise> - <td>${current.ip6}</td> - </c:otherwise> - </c:choose> - <c:choose> - <c:when test="${empty current.netmask}"> - <td><span class="no-details">(unknown)</span></td> - </c:when> - <c:otherwise> - <td>${current.netmask}</td> - </c:otherwise> - </c:choose> - <c:choose> - <c:when test="${empty current.scope}"> - <td><span class="no-details">(unknown)</span></td> - </c:when> - <c:otherwise> - <td>${current.scope}</td> - </c:otherwise> - </c:choose> - <c:choose> - <c:when test="${empty current.hwaddr}"> - <td><span class="no-details">(unknown)</span></td> - </c:when> - <c:otherwise> - <td>${current.hwaddr}</td> - </c:otherwise> - </c:choose> - <td>${current.module}</td> - </tr> - </c:forEach> + </div> + </div> - </table> + <div class="panel panel-default"> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th>Interface</th> + <th>IPv6 Address</th> + <th>Netmask</th> + <th>Scope</th> + <th>Hardware Address</th> + <th>Driver Module</th> + </tr> + </thead> + <c:forEach items="${ipv6_network_interfaces}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.name}</td> + <c:choose> + <c:when test="${empty current.ip6}"> + <td><span class="no-details">(unknown)</span></td> + </c:when> + <c:otherwise> + <td>${current.ip6}</td> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${empty current.netmask}"> + <td><span class="no-details">(unknown)</span></td> + </c:when> + <c:otherwise> + <td>${current.netmask}</td> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${empty current.scope}"> + <td><span class="no-details">(unknown)</span></td> + </c:when> + <c:otherwise> + <td>${current.scope}</td> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${empty current.hwaddr}"> + <td><span class="no-details">(unknown)</span></td> + </c:when> + <c:otherwise> + <td>${current.hwaddr}</td> + </c:otherwise> + </c:choose> + <td>${current.module}</td> + </tr> + </c:forEach> + + </table> + </div> + </div> <c:if test="${not empty storageDevices}"> - <h2><bean:message key="sdc.details.hardware.storage"/></h2> - <table class="table table-condensed"> - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="25%">Device</th> - <th width="25%">Physical</th> - </tr> - </thead> - <tbody> - <c:forEach items="${storageDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.description}</td> - <td>${current.bus}</td> - <td>${current.device}</td> - <td>${loop.count - 1}</td> - </tr> - </c:forEach> - </tbody> - </table> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.storage"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="25%">Device</th> + <th width="25%">Physical</th> + </tr> + </thead> + <tbody> + <c:forEach items="${storageDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.description}</td> + <td>${current.bus}</td> + <td>${current.device}</td> + <td>${loop.count - 1}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> <c:if test="${not empty videoDevices}"> - <h2><bean:message key="sdc.details.hardware.video"/></h2> - <table class="table table-condensed" > - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="10%">Vendor</th> - <th width="40%">Driver</th> - </tr> - </thead> - <tbody> - <c:forEach items="${videoDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.description}</td> - <td>${current.bus}</td> - <td>${current.vendor}</td> - <td>${current.driver}</td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.video"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed" > + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="10%">Vendor</th> + <th width="40%">Driver</th> + </tr> + </thead> + <tbody> + <c:forEach items="${videoDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.description}</td> + <td>${current.bus}</td> + <td>${current.vendor}</td> + <td>${current.driver}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> <c:if test="${not empty audioDevices}"> - <h2><bean:message key="sdc.details.hardware.audio"/></h2> - <table class="table table-condensed"> - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="10%">Vendor</th> - <th width="40%">Driver</th> - </tr> - </thead> - <tbody> - <c:forEach items="${audioDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.description}</td> - <td>${current.bus}</td> - <td>${current.vendor}</td> - <td>${current.driver}</td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.audio"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="10%">Vendor</th> + <th width="40%">Driver</th> + </tr> + </thead> + <tbody> + <c:forEach items="${audioDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.description}</td> + <td>${current.bus}</td> + <td>${current.vendor}</td> + <td>${current.driver}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> <c:if test="${not empty usbDevices}"> - <h2><bean:message key="sdc.details.hardware.usb"/></h2> - <table class="table table-condensed"> - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="25%">Vendor</th> - <th width="25%">Driver</th> - </tr> - </thead> - <tbody> - <c:forEach items="${usbDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.description}</td> - <td>${current.bus}</td> - <td>${current.vendor}</td> - <td>${current.driver}</td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.usb"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="25%">Vendor</th> + <th width="25%">Driver</th> + </tr> + </thead> + <tbody> + <c:forEach items="${usbDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.description}</td> + <td>${current.bus}</td> + <td>${current.vendor}</td> + <td>${current.driver}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> <c:if test="${not empty captureDevices}"> - <h2><bean:message key="sdc.details.hardware.capture"/></h2> - <table class="table table-condensed"> - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="25%">Vendor</th> - <th width="25%">Driver</th> - </tr> - </thead> - <tbody> - <c:forEach items="${miscDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td class="${style_class}">Loop: ${loop} : ${current.description}</td> - <td class="${style_class}">${current.bus}</td> - <td class="${style_class}">${current.vendor}</td> - <td class="${style_class}">${current.driver}</td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.capture"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="25%">Vendor</th> + <th width="25%">Driver</th> + </tr> + </thead> + <tbody> + <c:forEach items="${miscDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td class="${style_class}">Loop: ${loop} : ${current.description}</td> + <td class="${style_class}">${current.bus}</td> + <td class="${style_class}">${current.vendor}</td> + <td class="${style_class}">${current.driver}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> <c:if test="${not empty miscDevices}"> - <h2><bean:message key="sdc.details.hardware.misc"/></h2> - <table class="table table-condensed"> - <thead> - <tr> - <th width="40%">Description</th> - <th width="10%">Bus</th> - <th width="25%">Vendor</th> - <th width="25%">Driver</th> - </tr> - </thead> - <tbody> - <c:forEach items="${miscDevices}" var="current" varStatus="loop"> - <c:choose> - <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-row-even"/> - </c:when> - <c:otherwise> - <c:set var ="style_class" value="list-row-odd"/> - </c:otherwise> - </c:choose> - <tr class="${style_class}"> - <td>${current.description}</td> - <td>${current.bus}</td> - <td>${current.vendor}</td> - <td>${current.driver}</td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.hardware.misc"/></h4> + </div> + <div class="panel-body"> + <table class="table table-condensed"> + <thead> + <tr> + <th width="40%">Description</th> + <th width="10%">Bus</th> + <th width="25%">Vendor</th> + <th width="25%">Driver</th> + </tr> + </thead> + <tbody> + <c:forEach items="${miscDevices}" var="current" varStatus="loop"> + <c:choose> + <c:when test ="${loop.count % 2 == 0}"> + <c:set var ="style_class" value="list-row-even"/> + </c:when> + <c:otherwise> + <c:set var ="style_class" value="list-row-odd"/> + </c:otherwise> + </c:choose> + <tr class="${style_class}"> + <td>${current.description}</td> + <td>${current.bus}</td> + <td>${current.vendor}</td> + <td>${current.driver}</td> + </tr> + </c:forEach> + </tbody> + </table> + </div> + </div> </c:if> </html:form> </body> -</html:html> - +</html:html> \ No newline at end of file commit cf78dc8aa8b934847b54e5cbfb3c78a77f9dd58e Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 25 17:27:50 2013 +0200 TB3: Software/Packages/Details/Overview diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp index cf33480..b72d1f0 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp @@ -5,259 +5,318 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> -<%@ include file="/WEB-INF/pages/common/fragments/package/package_header.jspf" %> - -<h2> -<bean:message key="channel.jsp.details.title"/> -</h2> - -<div> - - <table class="details" width="100%"> - - <tr> - <th><bean:message key="package.jsp.description"/>:</th> - <td>${description}</td> - </tr> - - <tr> - <th><bean:message key="package.jsp.arch"/>:</th> - <td><c:out value="${pack.packageArch.label}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.availarch"/>:</th> - <td> - ${pack.packageArch.name} - <c:forEach items="${packArches}" var="tmpPack"> - , <a href="/rhn/software/packages/Details.do?pid=${tmpPack.id}"> - ${tmpPack.packageArch.name} - </a> - </c:forEach> - </td> - </tr> - - - <tr> - <th><bean:message key="package.jsp.availfrom"/>:</th> - <td> - <c:forEach items="${pack.channels}" var="channel"> - <a href="/rhn/channels/ChannelDetail.do?cid=${channel.id}"> - ${channel.name} - </a><br> - </c:forEach> - </td> - </tr> - - <tr> - <th><bean:message key="package.jsp.vendor"/>:</th> - <td><c:out value="${pack.vendor}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.key"/>:</th> - <c:if test="${package_key != null}"> - <td><c:out value="${package_key}" /></td> - </c:if> - <c:if test="${package_key == null}"> - <td><bean:message key="package.jsp.key.unkown"/></td> - </c:if> - - </tr> - - <tr> - <th><c:out value="${pack.checksum.checksumType.description}"/>:</th> - <td><c:out value="${pack.checksum.checksum}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.path"/>:</th> - <td><c:out value="${pack.path}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.packagesize"/>:</th> - <td><c:out value="${pack.packageSizeString}" /> </td> - </tr> - - -  - <rhn:require acl="package_type_capable(solaris_patch)" - mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> - <tr> - <th><bean:message key="package.jsp.solarisrelease"/>:</th> - <td><c:out value="${pack.solarisRelease}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.sunosrelease"/>:</th> - <td><c:out value="${pack.sunosRelease}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.patchtype"/>:</th> - <td><c:out value="${pack.patchType.name}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.patchinfo"/>:</th> - <td><c:out value="${pack.patchInfo}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.readme"/>:</th> - <td><a href="<c:out value="${readme_url}" />"> - <bean:message key="package.jsp.readmedownload"/> - </a> - </td> - </tr> - - </rhn:require> - - - - -  - <rhn:require acl="package_type_capable(solaris_patchset)" - mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> - <tr> - <th><bean:message key="package.jsp.readme"/>:</th> - <td><a href="<c:out value="${readme_url}" />"> - <bean:message key="package.jsp.readmedownload"/> - </a> - </td> - </tr> - - - </rhn:require> - - - - -  - <rhn:require acl="package_type_capable(rpm)" - mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> - - <tr> - <th><bean:message key="package.jsp.payloadsize"/>:</th> - <td><c:out value="${pack.payloadSizeString}" /> </td> - </tr> - - <tr> - <th><bean:message key="package.jsp.buildhost"/>:</th> - <td><c:out value="${pack.buildHost}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.builddate"/>:</th> - <td><c:out value="${pack.buildTime}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.license"/>:</th> - <td><c:out value="${pack.copyright}" /></td> - </tr> - - <tr> - <th><bean:message key="package.jsp.group"/>:</th> - <td><c:out value="${pack.packageGroup.name}" /> </td> - </tr> - - <tr> - <th><bean:message key="package.jsp.rpmversion"/>:</th> - <td><c:out value="${pack.rpmVersion}" /> </td> - </tr> - - - - </rhn:require> - - <tr> - <th><bean:message key="package.jsp.download"/>:</th> - <td> - <c:if test="${url != null}"> - <a href="${url}">${pack.file}</a> ${pack.packageSizeString} - </c:if> - <c:if test="${url eq null}"> - <div style="font-weight: bold;"> - <bean:message key="package.jsp.missingfile"/>: ${pack.file}</div> - </div> - </c:if> - - </td> - </tr> - - - <tr> - <th> - <bean:message key="package.jsp.source"/>: - </th> - <td> - <c:if test="${srpm_url != null}"> - <a href="${srpm_url}">${srpm_path}</a> - </c:if> - <c:if test="${srpm_url eq null}"> - <div style="font-weight: bold;"> - <bean:message key="package.jsp.unavailable"/> - </div> - </c:if> - </td> - </tr> - - - <rhn:require acl="package_type_capable(rpm)" - mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> - - <c:if test="${not isDebuginfo}" > - <tr> - <th> - <bean:message key="debuginfo.header" />: - </th> - <td> - - <c:if test="${debugUrl != null}"> - <a href="${debugUrl}"><bean:message key="package.jsp.download"/></a> - <c:if test="${debugFtp}" > - <br> - <span class="small-text"> - <bean:message key="debuginfo.external" /> - </span> - </c:if> - </c:if> - <c:if test="${debugUrl == null}"> - <div style="font-weight: bold;"> - <bean:message key="package.jsp.unavailable" /> + <%@ include file="/WEB-INF/pages/common/fragments/package/package_header.jspf" %> + <div class="form-horizontal"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h2><bean:message key="channel.jsp.details.title"/></h2> + </div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.description"/>: + </label> + <div class="col-lg-6"> + ${description} </div> - <span class="small-text"> - <bean:message key="debuginfo.unavailable" /> - </span> - </c:if> - </td> - </tr> - </c:if> - </rhn:require> - - <tr> - <th> - <bean:message key="package.jsp.errata" />: - </th> - <td> - <c:forEach items="${erratum}" var="tmpErrata"> - <a href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out value="${tmpErrata.advisory}" /></a> - </br> - </c:forEach> - <c:if test="${erratumEmpty == true}"> - <bean:message key="package.jsp.errataunavailable" /> - </c:if> - </td> - <tr/> - - - -</div> - + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.arch"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.packageArch.label}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.availarch"/>: + </label> + <div class="col-lg-6"> + ${pack.packageArch.name} + <c:forEach items="${packArches}" var="tmpPack"> + <a class="btn btn-info" href="/rhn/software/packages/Details.do?pid=${tmpPack.id}"> + ${tmpPack.packageArch.name} + </a> + </c:forEach> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.availfrom"/>: + </label> + <div class="col-lg-6"> + <c:forEach items="${pack.channels}" var="channel"> + <a class="btn btn-info" href="/rhn/channels/ChannelDetail.do?cid=${channel.id}"> + ${channel.name} + </a> + </c:forEach> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.vendor"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.vendor}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.key"/>: + </label> + <c:if test="${package_key != null}"> + <div class="col-lg-6"> + <c:out value="${package_key}" /> + </div> + </c:if> + <c:if test="${package_key == null}"> + <div class="col-lg-6"> + <bean:message key="package.jsp.key.unkown"/> + </div> + </c:if> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <c:out value="${pack.checksum.checksumType.description}"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.checksum.checksum}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.path"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.path}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.packagesize"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.packageSizeString}" /> + </div> + </div> + </div> + </div> +  + <rhn:require acl="package_type_capable(solaris_patch)" + mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> + <div class="panel panel-default"> + <div class="panel-heading"><h3>Solaris Patch</h3></div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.solarisrelease"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.solarisRelease}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.sunosrelease"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.sunosRelease}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.patchtype"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.patchType.name}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <thbean:message key="package.jsp.patchinfo"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.patchInfo}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.readme"/>: + </label> + <div class="col-lg-6"> + <a class="btn btn-info" href="<c:out value="${readme_url}" />"> + <bean:message key="package.jsp.readmedownload"/> + </a> + </div> + </div> +  + <rhn:require acl="package_type_capable(solaris_patchset)" + mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.readme"/>: + </label> + <div class="col-lg-6"> + <a class="btn btn-info" href="<c:out value="${readme_url}" />"> + <bean:message key="package.jsp.readmedownload"/> + </a> + </div> + </div> + </rhn:require> + </div> + </div> + </rhn:require> +  + <rhn:require acl="package_type_capable(rpm)" + mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> + <div class="panel panel-default"> + <div class="panel-heading"><h3>RPM package</h3></div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.payloadsize"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.payloadSizeString}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.buildhost"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.buildHost}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.builddate"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.buildTime}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.license"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.copyright}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.group"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.packageGroup.name}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.rpmversion"/>: + </label> + <div class="col-lg-6"> + <c:out value="${pack.rpmVersion}" /> + </div> + </div> + </div> + </div> + </rhn:require> + <div class="panel panel-default"> + <div class="panel-heading"><h3>Download</h3></div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.download"/>: + </label> + <div class="col-lg-6"> + <c:if test="${url != null}"> + <div class="input-group"> + <div class="form-control">${pack.file}</div> + <span class="input-group-btn btn-lg"> + <a class="btn btn-info" href="${url}">Download ${pack.packageSizeString}</a> + </span> + </div> + </c:if> + <c:if test="${url eq null}"> + <div class="input-group"> + <div class="form-control">${pack.file}</div> + <span class="input-group-btn"> + <button class="btn btn-info" disabled="disabled">Download</button> + </span> + </div> + <span class="help-block"><bean:message key="package.jsp.missingfile"/></span> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.source"/>: + </label> + <div class="col-lg-6"> + <c:if test="${srpm_url != null}"> + <div class="input-group"> + <div class="form-control">${srpm_path}</div> + <span class="input-group-btn"> + <a class="btn btn-info" href="${srpm_url}">Download</a> + </span> + </div> + </c:if> + <c:if test="${srpm_url eq null}"> + <div alert="alert alert-warning"><bean:message key="package.jsp.unavailable"/></div> + </c:if> + </div> + </div> + </div> + </div> + <div class="panel panel-default"> + <div class="panel-heading"><h3>Misc</h3></div> + <div class="panel-body"> + <rhn:require acl="package_type_capable(rpm)" + mixins="com.redhat.rhn.common.security.acl.PackageAclHandler"> + <c:if test="${not isDebuginfo}" > + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="debuginfo.header" />: + </label> + <div class="col-lg-6"> + <c:if test="${debugUrl != null}"> + <a class="btn btn-info" href="${debugUrl}"><bean:message key="package.jsp.download"/></a> + <c:if test="${debugFtp}" > + <span class="help-block"> + <bean:message key="debuginfo.external" /> + </span> + </c:if> + </c:if> + <c:if test="${debugUrl == null}"> + <bean:message key="package.jsp.unavailable" /> + <span class="help-block"> + <bean:message key="debuginfo.unavailable" /> + </span> + </c:if> + </div> + </div> + </c:if> + </rhn:require> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="package.jsp.errata" />: + </label> + <div class="col-lg-6"> + <c:forEach items="${erratum}" var="tmpErrata"> + <a class="btn btn-info" href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out value="${tmpErrata.advisory}" /></a> + </c:forEach> + <c:if test="${erratumEmpty == true}"> + <bean:message key="package.jsp.errataunavailable" /> + </c:if> + </div> + </div> + </div> + </div> + </div> </body> </html:html> - commit 264c6a0b09851f2ed06d73a9fdfbe9085306a5cf Author: Maximilian Meister <mmeister(a)suse.de> Date: Fri Oct 25 14:01:30 2013 +0200 changed <div align="right"> to <div class="text-right"> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp index 5468555..5b9df67 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp @@ -50,7 +50,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <hr/> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp index a984b42..db7cdfb 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp @@ -52,7 +52,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <hr/> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 21f9c45..d9f659a 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -160,7 +160,7 @@ <hr/> <div class="small-text">*<strong><bean:message key="Tip"/>:</strong> <bean:message key="activation-keys.jsp.is-default-key-tip"/></div> <c:if test = "${not empty requestScope.pageList}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <input type="submit" name ="dispatch" diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp index 2deabfa..06b5cd8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp @@ -50,7 +50,7 @@ </rl:list> <c:if test="${not (userIsOrgAdmin)}"> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="submit"> <bean:message key="assignedgroups.jsp.submitpermissions"/> @@ -94,7 +94,7 @@ <c:if test="${!empty availableGroups}"> <html:hidden property="uid" /> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="submit"> <bean:message key="assignedgroups.jsp.submitdefaults"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index cade102..dd1de11 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -21,7 +21,7 @@ <div class="page-summary"> <c:out value="${bunchdescription}"/> </div> - <div align="right"> + <div class="text-right"> <input type="submit" name="dispatch" value="<bean:message key="bunch.edit.jsp.button-schedule"/>" /> <rhn:csrf/> diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp index 9f65f9e..1545bcd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp @@ -50,7 +50,7 @@ </c:if> </table> - <div align="right"> + <div class="text-right"> <hr/> <html:submit property="edit_button"> <bean:message key="schedule.delete.jsp.deleteschedule"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp index b02ed3a..7cc8a30 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp @@ -16,7 +16,7 @@ <form method="post" name="rhn_list" action="/rhn/account/AccountDeactivationSubmit.do"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="disableself.jsp.deactivate"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp index 427083e..5cb403c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp @@ -17,7 +17,7 @@ <hr /> <form method="POST" name="rhn_list" action="/rhn/account/AccountDeactivationConfirm.do"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="disableself.jsp.deactivate"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 7f4d285..0eb33d2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -57,7 +57,7 @@ </tr> </table> -<div align="right"> +<div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="confirm.jsp.confirm"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp index c6b5cd7..d44d236 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp @@ -26,7 +26,7 @@ </rl:column> </rl:list> <c:if test="${not empty requestScope.all}"> - <div align="right"> + <div class="text-right"> <rhn:submitted /> <input type="submit" name="dispatch" class="btn btn-success" value='<bean:message key="iss.confirm.remove.masters"/>' /> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index c2626e2..463bb8c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -52,7 +52,7 @@ </rl:column> </rl:list> <c:if test="${not empty requestScope.all}"> - <div align="right"> + <div class="text-right"> <rhn:submitted /> <input type="submit" name="dispatch" class="btn btn-success" value='<bean:message key="iss.confirm.remove.slaves"/>' /> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index 1d1bb1b..a9d0368 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -77,7 +77,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> - <div align="right"> + <div class="text-right"> <rhn:submitted /> <input type="submit" name="dispatch" class="btn btn-default" value='<bean:message key="iss.slave.remove"/>' /> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index ba07a24..bdc2fbd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -50,7 +50,7 @@ </rl:column> </rl:list> <c:if test="${not empty requestScope.all}"> - <div align="right"> + <div class="text-right"> <rhn:submitted /> <input type="submit" name="dispatch" class="btn btn-default" value='<bean:message key="iss.master.remove"/>' /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp index 5ea078a..470537d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp @@ -62,7 +62,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp index fef5805..4784eba 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp @@ -82,7 +82,7 @@ exportColumns="id,suiteName,description,systemCount"/> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index b9ffc69..846abac 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -59,7 +59,7 @@ </rhn:list> <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> - <div align="right"> + <div class="text-right"> <hr> <html:submit property="dispatch"> <bean:message key="probesuitesystems.jsp.detachsystem"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index a437d55..5f14f57 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -34,7 +34,7 @@ </rhn:list> <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> - <div align="right"> + <div class="text-right"> <hr><bean:message key="probesuitesystemsedit.jsp.monscouttouse"/> <select name="satCluster"> <c:forEach items="${satClusters}" var="cluster"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp index 5f52b3a..20472a8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp @@ -16,7 +16,7 @@ <html:form action="/admin/multiorg/SatRoleConfirm.do"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <hr /> <html:hidden property="uid" value="${param.uid}" /> <html:hidden property="submitted" value="true" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp index af8fa3d..ba706b8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp @@ -51,7 +51,7 @@ </table> - <div align="right"> + <div class="text-right"> <hr/> <html:submit> <bean:message key="orgdelete.jsp.submit"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index e2d7ec2..ad53c34 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -135,7 +135,7 @@ exportColumns="name,currentMembers,maxMembers,maxAvailable,currentFlex,maxFlex,maxAvailableFlex" /> <p><rhn:tooltip>*-<bean:message key = "Used/Allotted.tip"/></rhn:tooltip></p> <c:if test="${param.oid != 1}"> - <div align="right"> + <div class="text-right"> <hr/> <input type="submit" name="dispatch" value="${rhn:localize('orgdetails.jsp.submit')}"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp index a0dbd51..a18e2b2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp @@ -52,7 +52,7 @@ </rl:column> </rl:list> <hr/> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <input type="submit" name ="confirm" value="${rhn:localize('org.trust.modify')}" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp index 994efe5..79eaf6b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp @@ -51,7 +51,7 @@ </rl:column> </rl:list> <hr/> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <input type="button" value="${rhn:localize('org.trust.cancel')}" diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp index d296719..47ab352 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp @@ -20,7 +20,7 @@ <form method="POST" action="/rhn/users/DeleteUserSubmit.do?uid=${param.uid}"> <rhn:csrf /> -<div align="right"> +<div class="text-right"> <hr /> <html:submit> <bean:message key="deleteuser.jsp.delete"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp index 40c537a..4e44372 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp @@ -21,7 +21,7 @@ <form method="POST" action="/rhn/users/DisableUserSubmit.do?uid=${param.uid}"> <rhn:csrf /> -<div align="right"> +<div class="text-right"> <hr /> <html:submit> <bean:message key="disableuser.jsp.disable"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp index 51ff893..d00752b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp @@ -19,7 +19,7 @@ <form method="POST" action="/rhn/users/EnableUserSubmit.do?uid=${param.uid}"> <rhn:csrf /> -<div align="right"> +<div class="text-right"> <hr /> <html:submit> <bean:message key="enableuser.jsp.enable"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index e4d8aba..a75a022 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -40,7 +40,7 @@ name="userConfirmList" exportColumns="userLogin,userLastName,userFirstName,roleNames,lastLoggedIn"/> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="dispatch" value="<bean:message key="userconfirm.jsp.confirm" />" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp index c975313..6e14ae6 100644 --- a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp @@ -16,7 +16,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %> - <div align="right"> + <div class="text-right"> </hr> <html:submit property="schedule_button"> <bean:message key="system.audit.confirmschedulexccdf.jsp.button"/> diff --git a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp index e1565c5..3bc3add 100644 --- a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp @@ -16,7 +16,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %> <rhn:tooltip><bean:message key="system.audit.schedulexccdf.jsp.tooltip"/></rhn:tooltip> - <div align="right"> + <div class="text-right"> </hr> <html:submit property="schedule_button"> <bean:message key="system.audit.schedulexccdf.jsp.button"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp index 9119a47..e08307e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -40,7 +40,7 @@ </rl:column> </rl:list> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="dispatch" value="<bean:message key="repos.jsp.update.channel"/>" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp index f4794a0..42200ca 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -65,7 +65,7 @@ <rl:csv dataset="pageList" name="packageList" exportColumns="id, nvrea, summary, provider" /> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="confirm" value="<bean:message key="channel.jsp.package.addbutton"/>" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp index 6f6b10d..53ffdc0 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp @@ -51,7 +51,7 @@ </rl:column> </rl:list> <hr/> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <input type="button" value="${rhn:localize('org.trust.cancel')}" diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index 21055bd..8677c38 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -51,7 +51,7 @@ </rl:column> </rl:list> <hr/> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <input type="button" value="${rhn:localize('org.trust.cancel')}" diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp index 03f4af5..978d943 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp @@ -68,7 +68,7 @@ <rl:csv dataset="pageList" name="packageList" exportColumns="id, nvrea, summary, provider" /> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="confirm" value="<bean:message key="channel.jsp.package.confirmbutton"/>" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp index 3475647..9eeac59 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp @@ -78,7 +78,7 @@ </rl:column> </rl:list>  - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"> <bean:message key="deployconfirm.jsp.confirmbutton" /> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index 1068e10..8e11270 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -38,7 +38,7 @@ </rhn:listdisplay> </rhn:list> <hr /> - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"><bean:message key="deploysystems.jsp.deployconfirmbutton" /></html:submit> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index eb40729..44a0827 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -32,7 +32,7 @@ </c:if> </table> <hr /> - <div align="right"> + <div class="text-right"> <html:submit><bean:message key="deletefile.jsp.submit" /></html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index c3d2b72..5d35c75 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -32,7 +32,7 @@ </tr> </table> <hr /> - <div align="right"> + <div class="text-right"> <html:submit><bean:message key="deleterev.jsp.submit" /></html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 09a2192..49b1167 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -56,7 +56,7 @@ </table> </div> <hr /> - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"> <bean:message key="deployconfirm.jsp.deploybutton" /> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp index 6af6803..67227ac 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp @@ -38,7 +38,7 @@ mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <div class="submit-bar"> <hr /> - <div align="right"> + <div class="text-right"> <html:submit><bean:message key="filedetails.jsp.update" /></html:submit> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index d52df50..ec9a883 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -64,7 +64,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="manage.jsp.uploadbutton"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp index b920891..d3bf65f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp @@ -54,7 +54,7 @@ ${current.position} </rhn:column> </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="sdc.configlist.jsp.unsubscribe"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index 46cb754..e565b3e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -65,7 +65,7 @@ </rhn:listdisplay> </rhn:list> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="sdcimportfile.jsp.button"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index d52f159..3714fb0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -84,7 +84,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="sdcimportconfirm.jsp.confirm" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index 84c883d..cd56e24 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -43,7 +43,7 @@ </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="sdc.config.subscriptions.jsp.continue"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index 52a71ce..293c02b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -52,7 +52,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="deployconfirm.jsp.confirm" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index 0784931..ba08d23 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -30,7 +30,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf"%> <c:if test="${not empty requestScope.pageList}"> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="diffconfirm.jsp.confirm" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 13004cb..27a5f48 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -51,7 +51,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:hidden property="dispatch" value="${rhn:localize('ssm.config.rank.jsp.apply')}"/> <input type=submit name="dispatcher" diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp index 7597614..ac7bd90 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -110,7 +110,7 @@ <html:form method="POST" action="/systems/ssm/config/SubscribeConfirm.do?position=${param.position}"> <rhn:csrf /> <rhn:submitted /> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="ssm.config.subscribeconfirm.jsp.confirm" /> diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index f3d9ac2..9447abb 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -37,7 +37,7 @@ <form method="post" action="/rhn/account/DeleteCredentials.do"> <rhn:csrf /> <rhn:submitted /> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="credentials.jsp.delete.dispatch" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index b3a6f70..76d9dfd 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -81,7 +81,7 @@ </rl:column> </rl:list> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="affectedsystems.jsp.apply"/> diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp index 0f69f5c..a5e13b5 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -38,7 +38,7 @@ </table> <hr /> - <div align="right"> + <div class="text-right"> <form action="/rhn/errata/manage/Delete.do" method="POST"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp index bd0db36..db2e3c8 100644 --- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp @@ -45,7 +45,7 @@ <hr /> <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" /> <input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/> -<div align="right"> +<div class="text-right"> <html:submit property="dispatch"> <bean:message key="errata.channels.updatechannels"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp index 9cedde0..c386fcf 100644 --- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp @@ -25,7 +25,7 @@ <hr /> - <div align="right"> + <div class="text-right"> <form action="/rhn/errata/manage/NotifySubmit.do" method="POST"> <rhn:csrf /> <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>"/> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp index 4824e9f..c5ecea5 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp @@ -93,7 +93,7 @@ </rl:column> </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp index e91af3a..fd0b64b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -44,7 +44,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp index 7cc54f1..2a191da 100644 --- a/java/code/webapp/WEB-INF/pages/groups/create.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/create.jsp @@ -48,7 +48,7 @@ </div> <%-- - <div align="right"> + <div class="text-right"> <hr /> <input type="hidden" name="pxt:trap" value="rhn:server_group_create_cb" /> <input type="hidden" name="redirect_to" value="/rhn/systems/SystemGroupList.do" /> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp index 1860fb7..fada5ad 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp @@ -62,7 +62,7 @@ <hr /> <input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> <input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/> -<div align="right"> +<div class="text-right"> <html:submit property="dispatch"> <bean:message key="kickstart.activationkeys.jsp.submit"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp index 3c26979..4e41353 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp @@ -39,7 +39,7 @@ <hr /> <input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> <input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/> -<div align="right"> +<div class="text-right"> <html:submit property="dispatch"> <bean:message key="kickstart.cryptokeys.jsp.submit"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp index ec3be1e..7d2e947 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp @@ -38,7 +38,7 @@ <hr /> <input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> <input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/> -<div align="right"> +<div class="text-right"> <html:submit property="dispatch"> <bean:message key="kickstart.filelists.jsp.submit"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp index 48c0b85..37b3d28 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp @@ -36,7 +36,7 @@ </p> <hr /> <input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"> <bean:message key="kickstart.packageprofile.jsp.clear"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp index 536bec5..a935717 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp @@ -69,7 +69,7 @@ </td> </tr> </table> -<div align="right"> +<div class="text-right"> <hr /> <input type="submit" name="dispatch" value="${rhn:localize('ssm.config.subscribe.jsp.continue')}" <c:if test="${not empty disableProfiles}">disabled="true"</c:if> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 27c4924..6f9a481 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -115,7 +115,7 @@ <p> <bean:message key="kickstarts.jsp.diskwarningssm" /> </p> -<div align="right"> +<div class="text-right"> <hr /> <input type="submit" name="dispatch" value="${rhn:localize('kickstart.schedule.button2.jsp')}"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index 93667d1..5e94ca2 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -53,7 +53,7 @@ </rl:list> <hr/> <c:if test="${not empty requestScope.dataset}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <input type="submit" name ="dispatch" diff --git a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp index 8118ee4..294f37e 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp @@ -17,7 +17,7 @@ <html:form action="/profiles/Delete"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <hr /> <html:hidden property="prid" value="${param.prid}" /> <html:hidden property="submitted" value="true" /> diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp index c0fca9d..6474131 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -36,7 +36,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="edit_button"> <bean:message key="button.update"/> diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp index 23788f4..e183e23 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp @@ -27,7 +27,7 @@ </rl:list> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <input type="submit" name="dispatch" class="btn btn-default" diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp index 64c310c..45ec4b0 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp @@ -26,7 +26,7 @@ </rl:list> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <input type="submit" name="dispatch" class="btn btn-default" diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp index 7377f33..eb7b651 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp @@ -23,7 +23,7 @@ </rl:list> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <input type="submit" name="dispatch" class="btn btn-default" diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp index 5d24fce..ea84914 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp @@ -38,7 +38,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="installconfirm.jsp.widgetsummary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp index 8fca3e7..ebea225 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp @@ -45,7 +45,7 @@ </rl:column> </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp index e50cc74..e50f807 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp @@ -51,7 +51,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp index 02ed6bf..2229d8c 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp @@ -47,7 +47,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="installconfirm.jsp.widgetsummary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp index e6f1fc6..7e5dca6 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp @@ -57,7 +57,7 @@ <html:hidden property="use_date" value="true"/> <%@ include file="/WEB-INF/pages/common/fragments/date-picker-hidden.jspf" %> - <div align="right"> + <div class="text-right"> <hr /> <c:if test="${param.mode == 'remove'}"> <html:submit> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp index d845947..4c7c4ae 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp @@ -73,7 +73,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp index d5d923f..73274bc 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp @@ -52,7 +52,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="installconfirm.jsp.widgetsummary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp index c1d07b6..fadbe00 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp @@ -51,7 +51,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp index 06618a6..d2406d9 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp @@ -47,7 +47,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="installconfirm.jsp.widgetsummary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp index 08955fe..996817c 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp @@ -60,7 +60,7 @@ </tbody> </table> <html:hidden property="submitted" value="true"/> - <div align="right"><hr> + <div class="text-right"><hr> <input type="submit" name="schedule_remote_command" value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> <hidden name="use_date" value="true" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp index 882b394..13aa6fe 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp @@ -38,7 +38,7 @@ </c:forEach> </html:select> </td> - <td align="right"> + <td class="text-right"> <input type ="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}"/> </td> </tr> @@ -50,7 +50,7 @@ <rl:listset name="systemListSet" legend="system"> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %> <%-- - <div align="right"> + <div class="text-right"> <hr /> <input type ="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp index c697ee4..57bd4d2 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp @@ -69,7 +69,7 @@ </table> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="sscd_change_system_prefs" value="<bean:message key="ssm.misc.index.syspref.changepreferences"/>" /> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp index 413a653..bdc6332 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp @@ -71,7 +71,7 @@ </c:choose> </rl:column> </rl:list> - <div align="right"> + <div class="text-right"> <input type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.lock"/>'/> <input type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.unlock"/>'/> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp index 60dbdb6..4d89965 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp @@ -25,7 +25,7 @@ <rl:listset name="systemsListSet" legend="system"> <c:set var="noCsv" value="1"/> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="installconfirm.jsp.widgetsummary"/></p> <table class="details" align="center"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp index 2a036a5..65edd96 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp @@ -107,7 +107,7 @@ </tr> </table> </div> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="errata.jsp.apply"/> @@ -142,7 +142,7 @@ <html:form action="/systems/ssm/ListPatches"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <hr/> <input type="submit" name="back" value="<bean:message key="ssm.errata.serverlist.return"/>" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp index b85a50f..ac52b8b 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp @@ -21,7 +21,7 @@ <rhn:csrf /> <rhn:submitted /> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %> - <div align="right"> + <div class="text-right"> <hr /> <input type ="submit" name="dispatch" value="${rhn:localize('ssm.delete.systems.confirmbutton')}"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp index 9db641b..2b12187 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp @@ -33,14 +33,14 @@ <html:form action="/systems/ssm/misc/HardwareRefresh.do"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="ssm.hw.systems.confirmbutton"/> </html:submit> </div> </html:form> <%-- - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="dispatch" value="${rhn:localize('ssm.hw.systems.confirmbutton')}"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp index d6de643..7768538 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp @@ -30,7 +30,7 @@ <html:form action="/systems/ssm/misc/SoftwareRefresh.do"> <html:hidden property="submitted" value="true"/> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="ssm.sw.systems.confirmbutton"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp index a0784d6..93334fc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp @@ -29,7 +29,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/crash_details.jspf" %> - <div align="right"> + <div class="text-right"> <hr/> <html:hidden property="crid" value="${crid}"/> <html:hidden property="sid" value="${sid}"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp index 02582bd..44a6c38 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp @@ -76,7 +76,7 @@ exportColumns="crash,count,component,modified" header="${system.name}"/> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="crashes.jsp.delete.button"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index 1486d37..f9b9df1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -64,7 +64,7 @@ </table> <hr/> - <div align="right"> + <div class="text-right"> <c:choose> <c:when test='${not empty cnid}'> <html:submit property="edit_button"><bean:message key="edit_note.jsp.update"/></html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index c1148cc..aed92f8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -49,7 +49,7 @@ </table> <hr/> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="sdc.table.notes.delete"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index fcf04a7..f4e4303 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -44,7 +44,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="DeleteKey" value="Delete Key" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp index 012808c..3efb727 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp @@ -23,7 +23,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %> <html:hidden property="sid" value="${param.sid}"/> - <div align="right"> + <div class="text-right"> </hr> <html:submit property="schedule_button"> <bean:message key="system.audit.schedulexccdf.jsp.button"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index c10474d..bd4dd03 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@ -28,7 +28,7 @@ <html:hidden property="submitted" value="true"/> </table> <hr> - <div align="right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> + <div class="text-right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> </html:form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp index 1d3504c..f4b73e1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp @@ -66,7 +66,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr/> <rhn:require acl="system_feature(ftr_package_remove)"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 465b66d..214e92e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -37,7 +37,7 @@ </rl:list> <c:if test="${not empty requestScope.pageList}"> - <div align="right"> + <div class="text-right"> <div align="left"> <p><bean:message key="${widgetSummary}"/></p> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index 5af7d90..8304a9f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -80,7 +80,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <hr/> <rhn:require acl="system_feature(ftr_package_remove)"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf index 30707ca..febb87f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf @@ -69,7 +69,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp index dd97077..f3239b3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp @@ -54,7 +54,7 @@ <form method="POST" name="rhn_list" action="/rhn/systems/details/packages/Packages.do?sid=${param.sid}"> <rhn:csrf /> <rhn:submitted /> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="packagesindex.jsp.update"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp index c3d89dc..372ed6f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp @@ -33,7 +33,7 @@ ${current.patchType} </rhn:column> </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="packagelist.jsp.confirmpatch"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp index 62ec0cf..4b7a122 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp @@ -39,7 +39,7 @@ </c:forEach> </rhn:column> </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="packagelist.jsp.installpatch"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp index 2828de9..795954a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp @@ -33,7 +33,7 @@ ${current.patchType} </rhn:column> </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="packagelist.jsp.confirmpatchinstall"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp index fd3b77c..cb52bf7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp @@ -44,7 +44,7 @@ </c:choose> </rhn:column> </rhn:listdisplay> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="packagelist.jsp.backoutpatch"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp index 67ff9e5..699d2cb 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp @@ -31,7 +31,7 @@ <input type="hidden" name="sid" value="${param.sid}" /> <input type="hidden" name="pid" value="${param.pid}" /> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="install_patchset.jsp.installbutton" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp index 41783db..9f13f8a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp @@ -56,7 +56,7 @@ <c:if test="${not empty requestScope.pageList}"> <rhn:require acl="system_feature(ftr_delta_action)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr /> <input type="submit" name="dispatch" diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp index b9777a8..3f29150 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp @@ -56,7 +56,7 @@ <c:if test="${not empty requestScope.pageList}"> <rhn:require acl="system_feature(ftr_delta_action)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <div align="right"> + <div class="text-right"> <rhn:submitted/> <hr /> <html:submit property="dispatch"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp index 7f5c9f1..78310d5 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp @@ -28,7 +28,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:hidden property="sid" value="${param.sid}" /> <html:hidden property="submitted" value="true" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp index 4e782bf..dfd5223 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp @@ -17,7 +17,7 @@ <html:form action="/systems/details/packages/profiles/DeleteProfile"> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <hr /> <html:hidden property="sid" value="${param.sid}" /> <html:hidden property="prid" value="${param.prid}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp index 67fcc5c..5a0d21e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp @@ -44,7 +44,7 @@ </rl:list> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="missingpkgs.jsp.selectnewpackageprofile" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp index d9f370d..23c7fbf 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp @@ -58,7 +58,7 @@ </c:choose> </p> </div> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="createBtn"> <bean:message key="profile.jsp.createsystemprofile"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp index 5e4f235..0dfc0b6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp @@ -69,7 +69,7 @@ <rhn:require acl="system_feature(ftr_delta_action)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="schedulesync.jsp.schedulesync"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp index f67a0cb..243d96c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp @@ -66,7 +66,7 @@ <rhn:require acl="system_feature(ftr_delta_action)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> <rhn:submitted/> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="schedulesync.jsp.schedulesync" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp index 9fe51bf..6fea5f4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp @@ -57,7 +57,7 @@ <html:hidden property="use_date" /> <%@ include file="/WEB-INF/pages/common/fragments/date-picker-hidden.jspf" %> - <div align="right"> + <div class="text-right"> <hr /> <c:if test="${param.mode == 'remove'}"> <html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index d6fff83..96c0d7a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -75,7 +75,7 @@ </rl:list> <c:if test="${not empty requestScope.all}"> -<div align="right"> +<div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp index fcc4298..8084289 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp @@ -69,7 +69,7 @@ </rhn:list> - <div align="right"> + <div class="text-right"> <hr /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp index 7caa7eb..612074d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp @@ -96,7 +96,7 @@ </rhn:list> - <div align="right"> + <div class="text-right"> <hr /> <html:select property="guestAction"> @@ -108,7 +108,7 @@ </html:submit> </div> - <div align="right"> + <div class="text-right"> <bean:message key="virtualguestslist.jsp.set"/> <html:select property="guestSettingToModify"> <html:optionsCollection name="guestSettingOptions"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp index 070474a..007c065 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp @@ -43,7 +43,7 @@ /> </rl:list> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index c7bc707..16cdb5a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -143,7 +143,7 @@ </rl:list> <c:if test="${requestScope.showApplyErrata == 'true'}"> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="errata.jsp.apply"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 5dc234e..3da38dd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -79,7 +79,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="errataconfirm.jsp.confirm"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp index e708e40..3f814b6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp @@ -26,7 +26,7 @@ <p><strong><bean:message key="probdelete.jsp.p4"/></strong></p> - <div align="right"> + <div class="text-right"> <hr /> <html:submit><bean:message key="probdelete.jsp.deleteprobe"/></html:submit></td> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp index c01398d..1808246 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp @@ -79,7 +79,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <hr/> <input type="hidden" name="sid" value="${sid}" /> <input type="submit" name="dispatch" diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp index b1be802..fe5bdc7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp @@ -58,7 +58,7 @@ </rl:list> - <div align="right"> + <div class="text-right"> <hr/> <html:hidden property="sid" value="${system.id}"/> <html:submit property="dispatch"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index 652d31c..12aa9ee 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -93,7 +93,7 @@ </c:if> </c:if> <hr/> - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"> <bean:message key="sdc.channels.edit.update_sub"/> </html:submit> @@ -149,7 +149,7 @@ </select> <hr/> - <div align="right"> + <div class="text-right"> <html:submit property="dispatch"> <bean:message key="sdc.channels.edit.confirm_update_base"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 00df517..4f5f3c0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -54,7 +54,7 @@ </span> <html:form method="post" action="/systems/details/SystemChannels.do?sid=${system.id}"> - <div align="right"> + <div class="text-right"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="new_base_channel_id" value="${new_base_channel_id}"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp index 509a3e2..306783a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp @@ -15,7 +15,7 @@ <html:form method="post" action="/systems/details/DeleteConfirm.do?sid=${sid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <div align="right"> + <div class="text-right"> <html:submit property="button"> <bean:message key="delete_confirm.jsp.button"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index ee4530b..f444045 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -48,7 +48,7 @@ </table> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="RemoveValue" value="${rhn:localize('system.jsp.customdata.removevalue')}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp index 0216d21..9dcaa0e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp @@ -15,7 +15,7 @@ <html:form method="post" action="/systems/details/SystemHardware.do?sid=${sid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <div align="right"> + <div class="text-right"> <html:submit styleClass="btn btn-default"> <bean:message key="sdc.details.hardware.schedule"/> </html:submit> @@ -209,7 +209,7 @@ </table> <br/> <rhn:csrf /> - <div align="right"> + <div class="text-right"> <html:submit property="update_interface" styleClass="btn btn-default"> <bean:message key="sdc.details.edit.update"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp index 9613672..cf85bdd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp @@ -28,7 +28,7 @@ </table> <hr/> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="sdc.table.migrate.migrate"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp index b6a2d4a..3315c21 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp @@ -33,7 +33,7 @@ </table> <hr/> - <div align="right"> + <div class="text-right"> <html:submit> <bean:message key="sdc.table.notes.delete"/> </html:submit> commit dcc688befe7086c5ff9a063d5d295e672bfdc52a Author: Maximilian Meister <mmeister(a)suse.de> Date: Fri Oct 25 13:59:53 2013 +0200 Changed <table class="details"> to <table class="table"> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 594b9df..21f9c45 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -31,7 +31,7 @@ </p> <c:choose> <c:when test="${not empty requestScope['default']}"> -<table class="details"> +<table class="table"> <tr> <th> <bean:message key="kickstart.activationkeys.jsp.description"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp index 50dd72a..9f65f9e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp @@ -19,7 +19,7 @@ <p><bean:message key="schedule.delete.jsp.introparagraph"/></p> </div> - <table class="details"> + <table class="table">  <tr> <th nowrap="nowrap"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf index c002568..55f52e2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf @@ -48,7 +48,7 @@ function showDestination() { //--> </script> - <table class="details"> + <table class="table"> <tr> <th> <label for="description"><rhn:required-field key="filter-form.jspf.description"/></label> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp index 4d3b830..23a0333 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp @@ -17,7 +17,7 @@ <html:form action="/monitoring/config/notification/MethodCreate" method="POST"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th> <rhn:required-field key="method-form.jspf.name"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf index 3e29b08..a9ddff8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/suite-form.jspf @@ -1,4 +1,4 @@ - <table class="details"> + <table class="table"> <tr> <th> <rhn:required-field key="probesuiteedit.jsp.suitename"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index c1985d7..57eb201 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -77,7 +77,7 @@ imgAlt="users.jsp.imgAlt"> <h2><bean:message key="entitlementorgs.usage"/></h2> -<table class="details"> +<table class="table"> <tr> <th> <b><bean:message key="entitlementorgs.total_allocated"/>:</ diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp index 1830b01..10ca39b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -139,7 +139,7 @@ <c:if test="${not empty requestScope.regularAvailable}"> <h2><bean:message key="softwareEntitlementSubs.systemWideCounts.header.regular"/></h2> -<table class="details"> +<table class="table"> <tr> <th> <strong><bean:message key="softwareEntitlementSubs.systemWideCounts.total"/>:</strong> @@ -174,7 +174,7 @@ <c:if test="${not empty requestScope.flexAvailable}"> <h2><bean:message key="softwareEntitlementSubs.systemWideCounts.header.flex"/></h2> -<table class="details"> +<table class="table"> <tr> <th> <strong><bean:message key="softwareEntitlementSubs.systemWideCounts.total"/>:</strong> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp index 3026487..b80a4a7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp @@ -13,7 +13,7 @@ <bean:message key="address.jsp.associated" /> </p> </div> - <table class="details"> + <table class="table"> <rhn:address type="M" action="user" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> </table> </body> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index 9246106..90919be 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -15,7 +15,7 @@ <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata.add"/> </h2> - <table class="details"> + <table class="table"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 0132ce6..4f853ae 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -22,7 +22,7 @@ <div class="left-column"> <h2>Errata Summary:</h2> - <table class="details"> + <table class="table"> <tr> <th><img src="/img/wrh-bug.gif" alt="<bean:message key="erratalist.jsp.bugadvisory"/>" /> Bug Fix Advisory: @@ -55,7 +55,7 @@ </div> <div class="right-column"> <h2>Package Summary:</h2> - <table class="details"> + <table class="table"> <c:forEach var="option" items="${arch_count}"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp index 8fa060f..28a8d6e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp @@ -24,7 +24,7 @@ <html:form method="post" action="/channels/manage/DistChannelMapDelete"> <rhn:csrf /> <rhn:submitted/> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="Operating System"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp index ca16caa..0bb59fc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp @@ -17,7 +17,7 @@ <form method="post" action="/rhn/channels/manage/repos/RepoDelete.do"> <rhn:csrf /> <h2><bean:message key="repos.jsp.delete.info.header"/></h2> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="repos.jsp.create.label"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf index 449fb30..c4c530f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf @@ -4,7 +4,7 @@ </c:if> <rhn:csrf/> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="system.audit.schedulexccdf.jsp.command"/>:</th> <td>/usr/bin/oscap xccdf eval</td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index a3db5f3..497b102 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -21,7 +21,7 @@ toggleElement(document.getElementById(linkId + 'Hide')); } </script> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="addfiles.jsp.type-name" /></th> <td> @@ -71,53 +71,53 @@ </td> </tr> <tr> - <th><bean:message key="filedetails.properties.jspf.path" /></th> + <th><bean:message key="filetable.properties.jspf.path" /></th> <td><html:text name="configFileForm" property="cffPath" size="30"/></td> </tr> <tr> - <th><bean:message key="filedetails.properties.jspf.targetpath" /></th> + <th><bean:message key="filetable.properties.jspf.targetpath" /></th> <td><html:text name="configFileForm" property="targetPath" disabled = "${configFileForm.map.filetype != 'symlink'}" styleId="targetPath" size="30"/></td> </tr> <tr> - <th><bean:message key="filedetails.properties.jspf.ownership" /></th> + <th><bean:message key="filetable.properties.jspf.ownership" /></th> <td> <table> <tr> - <td><bean:message key="filedetails.properties.jspf.uid" /></td> + <td><bean:message key="filetable.properties.jspf.uid" /></td> <td><html:text property="cffUid" size="6" styleId="cffUid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> </tr> <tr> - <td><bean:message key="filedetails.properties.jspf.gid" /></td> + <td><bean:message key="filetable.properties.jspf.gid" /></td> <td><html:text property="cffGid" size="6" styleId="cffGid" disabled = "${configFileForm.map.filetype == 'symlink'}"/></td> </tr> <tr> <td colspan="2"><span class="small-text"><bean:message - key="filedetails.jsp.tip.ownership" /></span></td> + key="filetable.jsp.tip.ownership" /></span></td> </tr> </table> </td> </tr> <tr> - <th><bean:message key="filedetails.properties.jspf.permissions" /></th> + <th><bean:message key="filetable.properties.jspf.permissions" /></th> <td><html:text property="cffPermissions" maxlength="4" size="4" styleId="cffPermissions" disabled = "${configFileForm.map.filetype == 'symlink'}"/><br /> <span class="small-text"><bean:message - key="filedetails.jsp.tip.permissions" /></span></td> + key="filetable.jsp.tip.permissions" /></span></td> </tr> <tr> <th>SELinux context</th> <td><html:text property="cffSELinuxCtx" size="30" /><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.selinux" /></span></td> + <span class="small-text"><bean:message key="filetable.jsp.tip.selinux" /></span></td> </tr> <tr> - <th><bean:message key="filedetails.add_details.jspf.macro" /></th> + <th><bean:message key="filetable.add_details.jspf.macro" /></th> <td nowrap="nowrap"> - <bean:message key="filedetails.add_details.jspf.macro.start" /> + <bean:message key="filetable.add_details.jspf.macro.start" /> <html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" /> - <bean:message key="filedetails.add_details.jspf.macro.end" /> + <bean:message key="filetable.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br /> <c:if test="${documentation == 'true'}"> <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + <bean:message key="filetable.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> </span> </c:if> </td> @@ -128,7 +128,7 @@ <th><bean:message key="addfiles.create.jspf.content-name" /></th> <td> <html:textarea property="contents" rows="20" cols="80" styleId="contents"/><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.edit"/></span> </td> </tr> <tr id = "hiddenContentsRow" @@ -137,7 +137,7 @@ <th><bean:message key="addfiles.create.jspf.content-name" /></th> <td> <textarea name="dumb" cols="80" rows="20" disabled="true"></textarea><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.edit"/></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.edit"/></span> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf index c2022d0..6f7ca12 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf @@ -20,7 +20,7 @@ </html:form> </c:when> <c:otherwise> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="channelOverview.jsp.name" /></th> <td><bean:write name="channelOverviewForm" property="cofName"></bean:write></td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf index 2ffe406..7589b78 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf @@ -1,4 +1,4 @@ - <table class="details"> + <table class="table"> <tr> <th><bean:message key="channelOverview.jsp.name-edit" /></th> <td><html:text property="cofName" maxlength="128" size="18"></html:text></td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf index 176fd7b..eb5976c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -1,6 +1,6 @@  <h2><bean:message key="channelOverview.jsp.information" /></h2> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="channelOverview.jsp.numfiles-header" /></th> <c:choose> @@ -46,7 +46,7 @@ <c:when test="${summary.numSystems > 0}"> <td> <img alt='<bean:message key="system.common.systemAlt" />' src="/img/rhn-listicon-system.gif" /> - <a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> + <a href="/rhn/systems/table/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> <c:out value="${summary.mostRecentSystem.name}" /> </a><br /> ${summary.systemDate} @@ -96,7 +96,7 @@ arg1="${summary.recentFileDate}"/> </c:if> <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy == null}"> - <bean:message key="filedetails.details.jspf.modifiedBy-unknown" + <bean:message key="filetable.details.jspf.modifiedBy-unknown" arg0="${summary.recentFileDate}"/> </c:if> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf index af4c355..c26df6f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf @@ -1,16 +1,16 @@ <c:if test="${not empty revision.configContent}"> -<h2><bean:message key="filedetails.add_details.jspf.header2" /></h2> -<table class="details"> +<h2><bean:message key="filetable.add_details.jspf.header2" /></h2> +<table class="table"> <tr> - <th><bean:message key="filedetails.add_details.jspf.md5" /></th> + <th><bean:message key="filetable.add_details.jspf.md5" /></th> <td>${revision.configContent.checksum}</td> </tr> <c:if test="${!revision.configContent.binary && !revision.directory}"> <tr> - <th><bean:message key="filedetails.add_details.jspf.macro" /></th> + <th><bean:message key="filetable.add_details.jspf.macro" /></th> <td nowrap> - <bean:message key="filedetails.add_details.jspf.macro.start" /> + <bean:message key="filetable.add_details.jspf.macro.start" /> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <html:text property="cffMacroStart" value="${revision.configContent.delimStart}" size="3"/> @@ -20,7 +20,7 @@ <c:out value="${revision.configContent.delimStart}" /> </rhn:require> - <bean:message key="filedetails.add_details.jspf.macro.end" /> + <bean:message key="filetable.add_details.jspf.macro.end" /> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -32,7 +32,7 @@ </rhn:require> <br /> <c:if test="${documentation == 'true'}"> - <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> </c:if> </tr> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index 9c2b29d..150b4aa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -2,19 +2,19 @@ <bean:message key="deploylocal.jspf.local" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" - arg2="${system}" arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /> -<h2><bean:message key="deploy.jsp.filedetails" /></h2> + arg2="${system}" arg3="/rhn/systems/table/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /> +<h2><bean:message key="deploy.jsp.filetable" /></h2> <html:form action="/configuration/file/RevisionDeploy.do?cfid=${cfid}&crid=${crid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="deploy.jsp.deploy-name" /></th> <td><bean:message key="deploy.jsp.deploy" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" arg2="${system}" - arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> + arg3="/rhn/systems/table/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> </tr> <tr> <th><bean:message key="deploy.jsp.latest-name" /></th> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index 9151f12..d0ffe5a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -3,10 +3,10 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<h2><bean:message key="filedetails.details.jspf.header2" /></h2> -<table class="details"> +<h2><bean:message key="filetable.details.jspf.header2" /></h2> +<table class="table"> <tr> - <th><bean:message key="filedetails.details.jspf.channel-name" /></th> + <th><bean:message key="filetable.details.jspf.channel-name" /></th> <td> <c:choose> <c:when test="${channel.configChannelType.label == 'normal'}"> @@ -26,18 +26,18 @@ </td> </tr> <tr> - <th><bean:message key="filedetails.details.jspf.revision-name" /></th> + <th><bean:message key="filetable.details.jspf.revision-name" /></th> <td> ${revision.revision} - (<a href="/rhn/configuration/file/ManageRevision.do?cfid=${file.id}"><bean:message key="details.jspf.other-revisions"/></a>) + (<a href="/rhn/configuration/file/ManageRevision.do?cfid=${file.id}"><bean:message key="table.jspf.other-revisions"/></a>) </td> </tr> <tr> - <th><bean:message key="filedetails.details.jspf.creation-name" /></th> + <th><bean:message key="filetable.details.jspf.creation-name" /></th> <td>${created}</td> </tr> <tr> - <th><bean:message key="filedetails.details.jspf.modified-name" /></th> + <th><bean:message key="filetable.details.jspf.modified-name" /></th> <td> <c:choose> <c:when test="${lastUser != null}"> @@ -59,51 +59,51 @@ </a> </rhn:require> </c:set> - <bean:message key="filedetails.details.jspf.modifiedBy" + <bean:message key="filetable.details.jspf.modifiedBy" arg0="${modified}" arg1='${beanarg}' /> </c:when> <c:otherwise> - <bean:message key="filedetails.details.jspf.modifiedBy-unknown" arg0="${modified}"/> + <bean:message key="filetable.details.jspf.modifiedBy-unknown" arg0="${modified}"/> </c:otherwise> </c:choose> </td> </tr> <tr> - <th><bean:message key="filedetails.details.jspf.filetype-name" /></th> + <th><bean:message key="filetable.details.jspf.filetype-name" /></th> <td> <c:choose> <c:when test="${revision.directory}"> - <bean:message key="filedetails.details.jspf.directory" /> + <bean:message key="filetable.details.jspf.directory" /> </c:when> <c:when test="${revision.symlink}"> - <bean:message key="filedetails.details.jspf.symlink" /> + <bean:message key="filetable.details.jspf.symlink" /> </c:when> <c:otherwise> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <html:select property="binary"> <html:option value="false"> - <bean:message key="filedetails.details.jspf.textfile"/> + <bean:message key="filetable.details.jspf.textfile"/> </html:option> <html:option value="true"> - <bean:message key="filedetails.details.jspf.binfile"/> + <bean:message key="filetable.details.jspf.binfile"/> </html:option> </html:select> </rhn:require> <rhn:require acl="not config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <c:if test="${form.map.binary}"> - <bean:message key="filedetails.details.jspf.binfile"/> + <bean:message key="filetable.details.jspf.binfile"/> </c:if> <c:if test="${not form.map.binary}"> - <bean:message key="filedetails.details.jspf.textfile"/> + <bean:message key="filetable.details.jspf.textfile"/> </c:if> </rhn:require> <br /> <c:if test="${documentation == 'true'}"> <span class="small-text"> - <bean:message key="filedetails.jsp.binarytoggletip" + <bean:message key="filetable.jsp.binarytoggletip" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp" /> </span> </c:if> @@ -114,7 +114,7 @@ <tr> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <th> <bean:message key="filedetails.details.jspf.revnum"/> </th> + <th> <bean:message key="filetable.details.jspf.revnum"/> </th> <td> <html:text property="revnum" size="7"/> </td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf index ed5b958..6c44001 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf @@ -1,23 +1,23 @@ -<h2><bean:message key="filedetails.properties.jspf.header2" /></h2> -<table class="details"> +<h2><bean:message key="filetable.properties.jspf.header2" /></h2> +<table class="table"> <tr> - <th><bean:message key="filedetails.properties.jspf.path" /></th> + <th><bean:message key="filetable.properties.jspf.path" /></th> <td><bean:write name="configFileForm" property="cffPath"/></td> </tr> <c:choose> <c:when test="${revision.symlink}"> <tr> - <th><bean:message key="filedetails.properties.jspf.targetpath" /></th> + <th><bean:message key="filetable.properties.jspf.targetpath" /></th> <td><html:text name="configFileForm" property="targetPath" size="30"/></td> </tr> </c:when> <c:otherwise> <tr> - <th><bean:message key="filedetails.properties.jspf.ownership" /></th> + <th><bean:message key="filetable.properties.jspf.ownership" /></th> <td> <table> <tr> - <td><bean:message key="filedetails.properties.jspf.uid" /></td> + <td><bean:message key="filetable.properties.jspf.uid" /></td> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -30,7 +30,7 @@ </td> </tr> <tr> - <td><bean:message key="filedetails.properties.jspf.gid" /></td> + <td><bean:message key="filetable.properties.jspf.gid" /></td> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -42,12 +42,12 @@ </rhn:require> </td> </tr> - <tr><td colspan="2"><span class="small-text"><bean:message key="filedetails.jsp.tip.ownership" /></span></td></tr> + <tr><td colspan="2"><span class="small-text"><bean:message key="filetable.jsp.tip.ownership" /></span></td></tr> </table> </td> </tr> <tr> - <th><bean:message key="filedetails.properties.jspf.permissions" /></th> + <th><bean:message key="filetable.properties.jspf.permissions" /></th> <td> <rhn:require acl="config_channel_editable(${channel.id})" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> @@ -58,7 +58,7 @@ ${form.map.cffPermissions} </rhn:require> <br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.permissions" /></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.permissions" /></span> </td> </tr> </c:otherwise> @@ -76,7 +76,7 @@ ${form.map.cffSELinuxCtx} </rhn:require> <br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.selinux" /></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.selinux" /></span> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf index 8aa185d..6aa6999 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf @@ -4,12 +4,12 @@ action="/configuration/file/ManageRevisionSubmit.do?cfid=${file.id}&csrf_token=${csrfToken}" enctype="multipart/form-data"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="manage.jsp.uploadtab"/></th> <td> <html:file property="cffUpload" size="30"/><br /> - <span class="small-text"><bean:message key="filedetails.jsp.tip.upload" arg0="${maxbytes}"/></span> + <span class="small-text"><bean:message key="filetable.jsp.tip.upload" arg0="${maxbytes}"/></span> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf index 755d202..222155b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf @@ -19,9 +19,9 @@ <div class="page-summary"> <h2><bean:message key="kickstart.clone.jsp.header2"/></h2> <p><bean:message key="kickstart.clone.jsp.summary"/></p> - <table class="details"> + <table class="table"> <tr> - <th><rhn:required-field key="kickstartdetails.jsp.label"/>:</th> + <th><rhn:required-field key="kickstarttable.jsp.label"/>:</th> <td><html:text property="label" maxlength="64" size="32" /></td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf index 5142e5b..5948965 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf @@ -14,7 +14,7 @@ <br> <html:form method="post" action="${param.post_url}"> <rhn:csrf /> - <table class="details"> + <table class="table"> <c:if test= "${not empty param.show_netboot}"> <tr> <th> @@ -27,7 +27,7 @@ </c:if> <tr> <th> - <bean:message key="kickstart.variable.jsp.variabledetails"/>: + <bean:message key="kickstart.variable.jsp.variabletable"/>: </th> <td> <html:textarea rows="25" cols="60" property="variables"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf index ccf4258..c297512 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf @@ -18,20 +18,20 @@ <div class="page-summary"> <h2><bean:message key="kickstartdelete.jsp.header2"/></h2> <p><bean:message key="kickstartdelete.jsp.summary1"/></p> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="kickstartdetails.jsp.label" />:</th> + <th><bean:message key="kickstarttable.jsp.label" />:</th> <td><strong>${ksdata.label}</strong></td> </tr> <c:if test="${not param.raw_mode}"> <tr> - <th><bean:message key="kickstartdetails.jsp.install_type" /></th> + <th><bean:message key="kickstarttable.jsp.install_type" /></th> <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong></td> </tr> </c:if> <tr> - <th><bean:message key="kickstartdetails.jsp.active"/></th> + <th><bean:message key="kickstarttable.jsp.active"/></th> <td><strong> <c:if test="${ksdata.active}"> <bean:message key="kickstart.jsp.active"/> @@ -43,7 +43,7 @@ </tr> <c:if test="${empty param.noComments}"> <tr> - <th><bean:message key="kickstartdetails.jsp.comments"/></th> + <th><bean:message key="kickstarttable.jsp.comments"/></th> <td><html:textarea disabled="true" property="comments" cols="80" rows="6" value="${ksdata.comments}" /> </td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf index 898897b..a0f0892 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf @@ -33,7 +33,7 @@ <bean:message key="kickstartips.jsp.ranges_summary"/> </p> - <table class="details"> + <table class="table"> <c:forEach items="${ranges}" var="ip_range"> <tr> <th><bean:message key="kickstartips.jsp.label" />:</th> @@ -45,7 +45,7 @@ <html:form method="post" action="${param.range_edit_url}"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="kickstartips.jsp.label" />:</th> <td><html:text property="octet1a" maxlength="3" size="3" />. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index fd26029..9157206 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -65,7 +65,7 @@ function enableBondStaticIpAddress() { <html:hidden property="sid" /> <html:hidden property="guestName" /> <html:hidden property="proxyHost" /> - <table class="details"> + <table class="table"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <c:if test="${!empty regularKS}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf index 0aa6231..c4085d5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf @@ -6,7 +6,7 @@ <h2><bean:message key="virtualization.provision.first.jsp.header3" /></h2> <bean:message key="virtualization.provision.override.jsp.message" /> <br/><br/> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="virtualization.provision.first.jsp.memory_allocation.header"/></th> <td> @@ -33,7 +33,7 @@ </td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.virt_bridge"/>:</th> + <th><bean:message key="kickstarttable.jsp.virt_bridge"/>:</th> <td> <html:text property="virtBridge" maxlength="20" size="6" styleId="virtBridgeId"/> <bean:message key="virtualization.provision.first.jsp.virt_bridge.example"/> @@ -41,20 +41,20 @@ </td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.virt_disk_path"/>:</th> + <th><bean:message key="kickstarttable.jsp.virt_disk_path"/>:</th> <td> <html:text property="diskPath" maxlength="64" size="20" styleId="diskPathId"/> <br/> - <bean:message key="kickstartdetails.jsp.virt_disk_path.tip"/> + <bean:message key="kickstarttable.jsp.virt_disk_path.tip"/> <br/><br/> </td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.mac_address"/>:</th> + <th><bean:message key="kickstarttable.jsp.mac_address"/>:</th> <td> <html:text property="macAddress" maxlength="17" size="17" styleId="macAddressId"/> <br/> - <bean:message key="kickstartdetails.jsp.mac_address.tip"/> + <bean:message key="kickstarttable.jsp.mac_address.tip"/> <br/><br/> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf index 3ca51b7..3668886 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf @@ -1,4 +1,4 @@ - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="crashes.jsp.component"/>: diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp index 581e2f6..0aa05e4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp @@ -8,13 +8,13 @@ <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> +<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/table-header.jspf"%> <html:form action="/configuration/DeleteChannel.do?ccid=${ccid}"> <rhn:csrf /> <html:hidden property="submitted" value="true" /> <p><bean:message key="channelOverview.jsp.deleteInstruction" /></p> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="channelOverview.jsp.name" /></th> <td><strong>${currChannel.name}</strong></td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 0ef25db..eb40729 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -15,7 +15,7 @@ <html:form action="/configuration/file/DeleteFile.do?cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="deleterev.jsp.channelname" /></th> <td>${file.configChannel.displayName}</td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index e4d48b7..c3d2b72 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -17,7 +17,7 @@ <html:form action="/configuration/file/DeleteRevision.do?crid=${crid}&cfid=${cfid}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="deleterev.jsp.channelname" /></th> <td>${file.configChannel.displayName}</td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index 28611ee..d52df50 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -57,7 +57,7 @@ <html:form method="post" action="/configuration/file/ManageRevisionSubmit.do?cfid=${file.id}&csrf_token=${csrfToken}" enctype="multipart/form-data"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="manage.jsp.uploadtab"/></th> <td><html:file property="cffUpload" /></td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index a4f1ff1..46cb754 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -27,13 +27,13 @@ </div> <html:form method="post" - action="/systems/details/configuration/addfiles/ImportFileSubmit.do?sid=${system.id}"> + action="/systems/table/configuration/addfiles/ImportFileSubmit.do?sid=${system.id}"> <rhn:csrf /> <h2><bean:message key="sdcimportfile.jsp.new"/></h2> <p><bean:message key="sdcimportfile.jsp.newsummary"/></p> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="sdcimportfile.jsp.paths"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp index 3f71598..3e390df 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp @@ -16,7 +16,7 @@ <td> <h2><bean:message key="sdc.config.header.overview"/></h2> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="sdc.config.centrally-managed"/>:</th> <td> @@ -44,13 +44,13 @@ </tr> <tr> <th><bean:message key="sdc.config.central-channel.subscriptions"/>:</th> - <td>${requestScope.globalConfigChannels}. [<a href="/rhn/systems/details/configuration/SubscriptionsSetup.do?sid=${param.sid}"><bean:message key="sdc.config.subscribe_to_channels"/></a>]</td> + <td>${requestScope.globalConfigChannels}. [<a href="/rhn/systems/table/configuration/SubscriptionsSetup.do?sid=${param.sid}"><bean:message key="sdc.config.subscribe_to_channels"/></a>]</td> </tr> </table>  <h2><bean:message key="sdc.config.header.recent-events"/></h2> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="sdc.config.last-config.deployment"/>:</th> @@ -92,14 +92,14 @@ <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.deploy.managed-files" - arg0 ="/rhn/systems/details/configuration/DeployFileConfirm.do?selectall=true&sid=${param.sid}" /> + arg0 ="/rhn/systems/table/configuration/DeployFileConfirm.do?selectall=true&sid=${param.sid}" /> </td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.deploy.selected-files" - arg0="/rhn/systems/details/configuration/DeployFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/table/configuration/DeployFile.do?sid=${param.sid}"/></td> <td></td> </tr> </table> @@ -115,12 +115,12 @@ </thead> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.compare.managed-files" - arg0="/rhn/systems/details/configuration/DiffFileConfirm.do?selectall=true&sid=${param.sid}"/></td> + arg0="/rhn/systems/table/configuration/DiffFileConfirm.do?selectall=true&sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.compare.selected-files" - arg0="/rhn/systems/details/configuration/DiffFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/table/configuration/DiffFile.do?sid=${param.sid}"/></td> <td></td> </tr> </table> @@ -134,25 +134,25 @@ </thead> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.new-files" - arg0 = "/rhn/systems/details/configuration/addfiles/CreateFile.do?sid=${param.sid}"/></td> + arg0 = "/rhn/systems/table/configuration/addfiles/CreateFile.do?sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.upload-files" - arg0 = "/rhn/systems/details/configuration//addfiles/UploadFile.do?sid=${param.sid}"/></td> + arg0 = "/rhn/systems/table/configuration//addfiles/UploadFile.do?sid=${param.sid}"/></td> <td></td> </tr> <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" acl="client_capable(configfiles.upload)"> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.import-all-files" - arg0 = "/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do?selectall=true&sid=${param.sid}"/></td> + arg0 = "/rhn/systems/table/configuration/addfiles/ImportFileConfirm.do?selectall=true&sid=${param.sid}"/></td> <td></td> </tr> <tr class="list-row-odd"> <td><img src="/img/rhn-bullet.gif"/> <bean:message key="sdc.config.add-create.import-selected-files" - arg0="/rhn/systems/details/configuration/addfiles/ImportFile.do?sid=${param.sid}"/></td> + arg0="/rhn/systems/table/configuration/addfiles/ImportFile.do?sid=${param.sid}"/></td> <td></td> </tr> </rhn:require> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp index 107cd05..1b6b6bc 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp @@ -48,7 +48,7 @@ /></strong></c:set> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="sdc.config.diff_result.original_file"/>:</th> <td><bean:message key="sdc.config.diff_result.original_file_value" diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index 162b00c..f3d9ac2 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -19,7 +19,7 @@ <hr /> <h2><bean:message key="credentials.jsp.susestudio" /></h2> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="credentials.jsp.username" /></th> <td><c:out value="${creds.username}" /></td> diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp index c7b126a..0f69f5c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -23,7 +23,7 @@ <p><bean:message key="delete.jsp.summary"/></p> </div> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="delete.jsp.erratum"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/errata/details.jsp b/java/code/webapp/WEB-INF/pages/errata/details.jsp index 0a0bf62..3a1acf5 100644 --- a/java/code/webapp/WEB-INF/pages/errata/details.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/details.jsp @@ -15,31 +15,31 @@ <h2><bean:message key="erratalist.jsp.synopsis"/></h2> <div class="page-summary">${errata.synopsis}</div> <br/> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="details.jsp.issued"/></th> + <th><bean:message key="table.jsp.issued"/></th> <td>${issued}</td> </tr> <tr> - <th><bean:message key="details.jsp.updated"/></th> + <th><bean:message key="table.jsp.updated"/></th> <td>${updated}</td> </tr> <tr> - <th><bean:message key="details.jsp.from"/></th> + <th><bean:message key="table.jsp.from"/></th> <td>${errataFrom}</td> </tr> </table> -<h2><bean:message key="details.jsp.topic"/></h2> +<h2><bean:message key="table.jsp.topic"/></h2> <div class="page-summary">${topic}</div> -<h2><bean:message key="details.jsp.description"/></h2> +<h2><bean:message key="table.jsp.description"/></h2> <div class="page-summary">${description}</div> -<h2><bean:message key="details.jsp.solution"/></h2> +<h2><bean:message key="table.jsp.solution"/></h2> <div class="page-summary">${solution}</div> -<h2><bean:message key="details.jsp.affectedchannels"/></h2> +<h2><bean:message key="table.jsp.affectedchannels"/></h2> <c:forEach items="${channels}" var="current"> <div class="page-summary"> <a href="/rhn/channels/ChannelPackages.do?cid=${current.id}"> @@ -48,11 +48,11 @@ </c:forEach> <c:if test="${empty channels}"> <div class="page-summary"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </div> </c:if> -<h2><bean:message key="details.jsp.fixes"/></h2> +<h2><bean:message key="table.jsp.fixes"/></h2> <c:forEach items="${fixed}" var="current"> <div class="page-summary"> <c:choose> @@ -61,7 +61,7 @@ <c:out value="${current.summary}"/></a> </c:when> <c:when test="${current.href == null && errata.org != null}"> - <bean:message key="details.jsp.bugnumber" arg0="${current.bugId}"/> <c:out value="${current.summary}"/> + <bean:message key="table.jsp.bugnumber" arg0="${current.bugId}"/> <c:out value="${current.summary}"/> </c:when> <c:otherwise> <a href="${current.href}"> @@ -72,19 +72,19 @@ </c:forEach> <c:if test="${empty fixed}"> <div class="page-summary"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </div> </c:if> -<h2><bean:message key="details.jsp.keywords"/></h2> +<h2><bean:message key="table.jsp.keywords"/></h2> <div class="page-summary"> ${keywords} <c:if test="${empty keywords}"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </c:if> </div> -<h2><bean:message key="details.jsp.cves"/></h2> +<h2><bean:message key="table.jsp.cves"/></h2> <c:forEach items="${cve}" var="current"> <div class="page-summary"> <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${current.name}"> @@ -93,7 +93,7 @@ </c:forEach> <c:if test="${empty cve}"> <div class="page-summary"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </div> </c:if> @@ -105,24 +105,24 @@ </c:if> <c:if test="${ovalFile == null}"> <div class="page-summary"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </div> </c:if> -<h2><bean:message key="details.jsp.references"/></h2> +<h2><bean:message key="table.jsp.references"/></h2> <div class="page-summary"> ${references} <c:if test="${empty references}"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </c:if> </div> -<h2><bean:message key="actiondetails.jsp.notes"/></h2> +<h2><bean:message key="actiontable.jsp.notes"/></h2> <div class="page-summary"> ${notes} <c:if test="${empty notes}"> - <bean:message key="details.jsp.none"/> + <bean:message key="table.jsp.none"/> </c:if> </div> diff --git a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf index 01cc4a9..1baf018 100644 --- a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf +++ b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf @@ -1,4 +1,4 @@ - <table class="details"> + <table class="table"> <tr> <th> <rhn:required-field key="keycreate.jsp.description"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp index e9a81c2..e3b2041 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -16,7 +16,7 @@ <form method="post" action="/rhn/kickstart/cobbler/CobblerSnippetDelete.do"> <rhn:csrf /> <h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="snippetcreate.jsp.contents"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp index e565c29..d6160b3 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -13,10 +13,10 @@ ${requestScope.snippet.displayName} </rhn:toolbar> -<h2><bean:message key="snippetdetails.jsp.header2"/></h2> +<h2><bean:message key="snippettable.jsp.header2"/></h2> <div> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="cobbler.snippet.path"/>: @@ -48,7 +48,7 @@ </table> <h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="snippetcreate.jsp.contents"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index 64d4342..850188e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -8,33 +8,33 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> -<h2><bean:message key="kickstartdetails.jsp.header2"/></h2> +<h2><bean:message key="kickstarttable.jsp.header2"/></h2> <div> <c:choose><c:when test="${empty requestScope.invalid}"> - <bean:message key="kickstartdetails.jsp.summary1"/> + <bean:message key="kickstarttable.jsp.summary1"/> <html:form method="post" action="/kickstart/KickstartDetailsEdit.do"> <rhn:csrf /> <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> - <th><rhn:required-field key="kickstartdetails.jsp.label"/>:</th> + <th><rhn:required-field key="kickstarttable.jsp.label"/>:</th> <td><html:text property="label" maxlength="64" size="32" /><br/> - <span class="small-text"><bean:message key="kickstartdetails.jsp.labelwarning" /></span></td> + <span class="small-text"><bean:message key="kickstarttable.jsp.labelwarning" /></span></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.install_type" /></th> + <th><bean:message key="kickstarttable.jsp.install_type" /></th> <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong> - <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstartdetails.jsp.changeos"/>)</a></td> + <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstarttable.jsp.changeos"/>)</a></td> </tr> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> <tr> - <th><bean:message key="kickstartdetails.jsp.active"/></th> + <th><bean:message key="kickstarttable.jsp.active"/></th> <td> <table> <tr> @@ -42,55 +42,55 @@ <html:checkbox property="active" /> </td> <td> - <span class="small-text"><bean:message key="kickstartdetails.jsp.activeDescription"/></span> + <span class="small-text"><bean:message key="kickstarttable.jsp.activeDescription"/></span> </td> </tr> </table> </td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.postlog"/></th> - <td><table><tr><td><html:checkbox property="post_log" /></td><td><bean:message key="kickstartdetails.jsp.postlog.msg" /></td></tr></table></td> + <th><bean:message key="kickstarttable.jsp.postlog"/></th> + <td><table><tr><td><html:checkbox property="post_log" /></td><td><bean:message key="kickstarttable.jsp.postlog.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.prelog"/></th> - <td><table><tr><td><html:checkbox property="pre_log" /></td><td><bean:message key="kickstartdetails.jsp.prelog.msg" /></td></tr></table></td> + <th><bean:message key="kickstarttable.jsp.prelog"/></th> + <td><table><tr><td><html:checkbox property="pre_log" /></td><td><bean:message key="kickstarttable.jsp.prelog.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.kscfg"/></th> - <td><table><tr><td><html:checkbox property="ksCfg" /></td><td><bean:message key="kickstartdetails.jsp.kscfg.msg" /></td></tr></table></td> + <th><bean:message key="kickstarttable.jsp.kscfg"/></th> + <td><table><tr><td><html:checkbox property="ksCfg" /></td><td><bean:message key="kickstarttable.jsp.kscfg.msg" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.org_default" /></th> - <td><table><tr><td><html:checkbox property="org_default" /></td><td><bean:message key="kickstartdetails.jsp.summary2" arg0="${ksurl}" /></td></tr></table></td> + <th><bean:message key="kickstarttable.jsp.org_default" /></th> + <td><table><tr><td><html:checkbox property="org_default" /></td><td><bean:message key="kickstarttable.jsp.summary2" arg0="${ksurl}" /></td></tr></table></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.kernel_options"/></th> + <th><bean:message key="kickstarttable.jsp.kernel_options"/></th> <td><html:text property="kernel_options" maxlength="1024" size="32" /></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.post_kernel_options"/></th> + <th><bean:message key="kickstarttable.jsp.post_kernel_options"/></th> <td><html:text property="post_kernel_options" maxlength="1024" size="32" /></td> </tr> <tr> - <th><bean:message key="kickstartdetails.jsp.comments"/></th> + <th><bean:message key="kickstarttable.jsp.comments"/></th> <td><html:textarea property="comments" cols="80" rows="6"/></td> </tr> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> </tr> </table> </html:form> </c:when> <c:otherwise> - <p><bean:message key="kickstartdetails.invalid.jsp.summary"/> - <bean:message key="kickstartdetails.invalid.jsp.summary-option1" + <p><bean:message key="kickstarttable.invalid.jsp.summary"/> + <bean:message key="kickstarttable.invalid.jsp.summary-option1" arg0="${ksdata.tree.label}" arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p> - <p><bean:message key="kickstartdetails.invalid.jsp.summary-option2" + <p><bean:message key="kickstarttable.invalid.jsp.summary-option2" arg0="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}"/></p> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp index dd66653..3719976 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstartoptions.jsp.header1"/></h2> @@ -19,7 +19,7 @@ </p> <form method="post" action="/rhn/kickstart/KickstartOptionsEdit.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <c:forEach items="${options}" var="option"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index c60375e..9948fcc 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.partition.jsp.header"/></h2> @@ -21,10 +21,10 @@ </p> <html:form method="post" action="/kickstart/KickstartPartitionEdit.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th> - <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: + <rhn:required-field key="kickstart.partition.jsp.partitiontable"/>: </th> <td> <html:textarea rows="6" cols="80" property="partitions"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index cfbf027..b69e34d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.locale.jsp.header1"/></h2> @@ -21,7 +21,7 @@ <rhn:csrf /> <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="kickstart.locale.jsp.timezone" /></th> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf index 3c26690..a077443 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf +++ b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf @@ -1,4 +1,4 @@ - <table class="details"> + <table class="table"> <tr> <td colspan="2"> <h2><bean:message key="kickstart.script.langheader"/></h2> @@ -77,6 +77,6 @@ </td> </tr> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp index 5e0dcc0..9d33c14 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp @@ -11,7 +11,7 @@ </rhn:toolbar> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.scriptdelete.jsp.header2"/></h2> @@ -21,7 +21,7 @@ <bean:message key="kickstart.scriptdelete.jsp.summary1"/> <html:form method="POST" action="/kickstart/KickstartScriptDelete.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <td colspan="2"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 1b93de0..1dec13f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -45,7 +45,7 @@ function clickNewestTree() { <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="softwareedit.jsp.header2"/></h2> @@ -57,7 +57,7 @@ function clickNewestTree() { <html:form method="post" action="/kickstart/KickstartSoftwareEdit.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><rhn:required-field key="softwareedit.jsp.basechannel"/>:</th> <td> @@ -158,7 +158,7 @@ function clickNewestTree() { </tr> </c:if> <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> + <td align="right" colspan="2"><html:submit><bean:message key="kickstarttable.jsp.updatekickstart"/></html:submit></td> </tr> </table> <html:hidden property="url" value="${kickstartSoftwareForm.map.url}"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp index 730427d..536bec5 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp @@ -47,7 +47,7 @@ <h2><bean:message key="ssm.kickstartable-systems.jsp.systems"/></h2> <p><bean:message key="ssm.kickstartable-systems.jsp.systems.summary"/></p> -<table class="details"> +<table class="table"> <tr> <th> <bean:message key="ssm.kickstartable-systems.jsp.type"/>: diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index b8e93db..27c4924 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -55,10 +55,10 @@ <br/> <h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> - <table class="details"> + <table class="table"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <tr> - <th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th> + <th width="10%"><bean:message key="kickstarttable.jsp.kernel_options" />:</th> <td> <input type="radio" name="kernelParamsType" value="distro" onclick="form.kernelParamsId.disabled = true;" <c:if test="${empty form.kernelParamsType or form.kernelParamsType == 'distro'}">checked="checked"</c:if> @@ -83,7 +83,7 @@ </td> </tr> <tr> - <th width="10%"><bean:message key="kickstartdetails.jsp.post_kernel_options" />:</th> + <th width="10%"><bean:message key="kickstarttable.jsp.post_kernel_options" />:</th> <td> <input type="radio" name="postKernelParamsType" value="distro" onclick="form.postKernelParamsId.disabled = true;" <c:if test="${empty form.postKernelParamsType or form.postKernelParamsType == 'distro'}">checked="checked"</c:if> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index 2f02a3d..5303d85 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -47,7 +47,7 @@ boolean staticIfDisabled = Boolean.valueOf( <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> @@ -57,10 +57,10 @@ boolean staticIfDisabled = Boolean.valueOf( <rhn:csrf /> <html:hidden property="ksid" /> <html:hidden property="submitted" /> - <h2><bean:message key="kickstart.systemdetails.jsp.header1"/></h2> + <h2><bean:message key="kickstart.systemtable.jsp.header1"/></h2> <c:if test="${not ksdata.legacyKickstart}"> - <h2><bean:message key="kickstart.systemdetails.jsp.header2"/></h2> - <table class="details"> + <h2><bean:message key="kickstart.systemtable.jsp.header2"/></h2> + <table class="table"> <tr> <th><bean:message key="kickstart.selinux.jsp.label" />:</th> <td> @@ -72,8 +72,8 @@ boolean staticIfDisabled = Boolean.valueOf( </table> </c:if> - <h2><bean:message key="kickstart.systemdetails.jsp.header3"/></h2> - <table class="details"> + <h2><bean:message key="kickstart.systemtable.jsp.header3"/></h2> + <table class="table"> <tr> <th><bean:message key="kickstart.config.mgmt.jsp.label" />:</th> <td><html:checkbox property="configManagement" /><br /> @@ -96,8 +96,8 @@ boolean staticIfDisabled = Boolean.valueOf( </tr> </table> - <h2><bean:message key="kickstart.systemdetails.jsp.header4"/></h2> - <table class="details"> + <h2><bean:message key="kickstart.systemtable.jsp.header4"/></h2> + <table class="table"> <tr> <th><bean:message key="kickstart.root.password.jsp.label" />:</th> <td><html:password property="rootPassword" maxlength="32" size="32" redisplay="false"/></td> @@ -108,7 +108,7 @@ boolean staticIfDisabled = Boolean.valueOf( </tr> <tr> <td align="right" colspan="2"> - <input type="submit" value="<bean:message key="kickstart.systemdetails.edit.submit.jsp.label" />" /> + <input type="submit" value="<bean:message key="kickstart.systemtable.edit.submit.jsp.label" />" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp index 884520c..bf0d5fd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" + definition="/WEB-INF/nav/kickstart_table.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2><bean:message key="kickstart.troubleshooting.jsp.header1"/></h2> @@ -19,7 +19,7 @@ </p> <html:form method="post" action="/kickstart/TroubleshootingEdit.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="kickstart.troubleshooting.jsp.bootloader" /></th> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp index a29848f..de51c75 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp @@ -11,50 +11,50 @@ <rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/org_trust.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="orgtrustdetails.jsp.header1"/></h2> - <table class="details"> + <h2><bean:message key="orgtrusttable.jsp.header1"/></h2> + <table class="table"> <tr> - <th><bean:message key="orgtrustdetails.jsp.created"/></th> + <th><bean:message key="orgtrusttable.jsp.created"/></th> <td>${created}</td> </tr> <tr> - <th><bean:message key="orgtrustdetails.jsp.trusted"/></th> + <th><bean:message key="orgtrusttable.jsp.trusted"/></th> <td>${since}</td> </tr> </table> -<h2><bean:message key="orgtrustdetails.jsp.header2"/></h2> - <table class="details"> +<h2><bean:message key="orgtrusttable.jsp.header2"/></h2> + <table class="table"> <tr> - <th><bean:message key="orgtrustdetails.jsp.channelsprovided"/></th> + <th><bean:message key="orgtrusttable.jsp.channelsprovided"/></th> <c:choose> <c:when test="${channelsfrom > 0}"> - <td><a href="/rhn/multiorg/channels/Provided.do?oid=${param.oid}">${channelsfrom}</a> (<bean:message key="orgtrustdetails.jsp.systemconsume1" arg0="${sysleech}"/>)</td> + <td><a href="/rhn/multiorg/channels/Provided.do?oid=${param.oid}">${channelsfrom}</a> (<bean:message key="orgtrusttable.jsp.systemconsume1" arg0="${sysleech}"/>)</td> </c:when> <c:otherwise> - <td>${channelsfrom} (<bean:message key="orgtrustdetails.jsp.systemconsume1" arg0="${sysleech}"/>)</td> + <td>${channelsfrom} (<bean:message key="orgtrusttable.jsp.systemconsume1" arg0="${sysleech}"/>)</td> </c:otherwise> </c:choose> </tr> <tr> - <th><bean:message key="orgtrustdetails.jsp.channelsconsumed"/></th> + <th><bean:message key="orgtrusttable.jsp.channelsconsumed"/></th> <c:choose> <c:when test="${channelsto > 0}"> - <td><a href="/rhn/multiorg/channels/Consumed.do?oid=${param.oid}">${channelsto}</a> (<bean:message key="orgtrustdetails.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}"/>)</td> + <td><a href="/rhn/multiorg/channels/Consumed.do?oid=${param.oid}">${channelsto}</a> (<bean:message key="orgtrusttable.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}"/>)</td> </c:when> <c:otherwise> - <td>${channelsto} (<bean:message key="orgtrustdetails.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}" />)</td> + <td>${channelsto} (<bean:message key="orgtrusttable.jsp.systemconsume2" arg0="${orgtrust}" arg1="${sysseed}" />)</td> </c:otherwise> </c:choose> </tr> </table> -<h2><bean:message key="orgtrustdetails.jsp.header3"/></h2> - <table class="details"> +<h2><bean:message key="orgtrusttable.jsp.header3"/></h2> + <table class="table"> <tr> - <th><bean:message key="orgtrustdetails.jsp.sysmigratedto"/></th> + <th><bean:message key="orgtrusttable.jsp.sysmigratedto"/></th> <td>${migrationsto}</td> </tr> <tr> - <th><bean:message key="orgtrustdetails.jsp.sysmigratedfrom"/></th> + <th><bean:message key="orgtrusttable.jsp.sysmigratedfrom"/></th> <td>${migrationsfrom}</td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp index 8cdb7bf..c0fca9d 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -12,12 +12,12 @@ <rhn:csrf /> <div class="page-summary"> - <bean:message key="profile.details.summary"/> + <bean:message key="profile.table.summary"/> </div> <hr> - <table class="details"> + <table class="table"> <tr> <th nowrap="nowrap"> <bean:message key="row.name"/>: diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp index b3eb162..882b394 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp @@ -25,7 +25,7 @@ <html:form method="post" action="/systems/ssm/MigrateSystems.do"> <rhn:csrf /> <rhn:submitted /> - <table class="details"> + <table class="table"> <tr> <th> <bean:message key="ssm.migrate.systems.org"/> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp index 3fa8907..413a653 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp @@ -23,7 +23,7 @@ <p><bean:message key="ssm.misc.lockunlock.summary" /></p> <rl:listset name="systemsListSet" legend="system"> - <table class="details"> + <table class="table"> <tbody> <tr> <th><label for="lock-reason">Lock reason:</label></th> @@ -50,7 +50,7 @@ <c:choose> <c:when test="${current.locked > 0}"> <img src="/img/icon_locked.gif"/> - <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a> + <a href="/rhn/systems/table/Overview.do?sid=${current.id}">${current.name}</a> </c:when> <c:otherwise> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index 2512580..1486d37 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -14,7 +14,7 @@ <span class="toolbar"> <c:choose> <c:when test="${not empty param.cnid}"> - <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> + <a href="/rhn/systems/table/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.note"/>" ></i> <bean:message key="toolbar.delete.note"/> @@ -22,7 +22,7 @@ | </c:when> </c:choose> - <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> + <a href="/rhn/systems/table/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> @@ -43,22 +43,22 @@ <c:choose> <c:when test="${empty param.cnid}"> <br /> - <bean:message key="details.crashnotes.createnote"/> + <bean:message key="table.crashnotes.createnote"/> </c:when> </c:choose> - <html:form method="post" action="/systems/details/EditCrashNote.do"> + <html:form method="post" action="/systems/table/EditCrashNote.do"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="sid" value="${sid}"/> <html:hidden property="crid" value="${crid}"/> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="sdc.details.notes.subject"/></th> + <th><bean:message key="sdc.table.notes.subject"/></th> <td><html:text property="subject" maxlength="128" size="40" styleId="subject" /></td> </tr> <tr> - <th><bean:message key="sdc.details.notes.details"/></th> + <th><bean:message key="sdc.table.notes.details"/></th> <td><html:textarea property="note" cols="40" rows="6" styleId="note"/></td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index 6b9c8d2..c1148cc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -12,7 +12,7 @@ <div class="toolbar-h2"> <div class="toolbar"> <span class="toolbar"> - <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> + <a href="/rhn/systems/table/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <i class="icon-trash" title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> @@ -29,21 +29,21 @@ <br /> <%@ include file="/WEB-INF/pages/common/fragments/systems/crash-header.jspf" %> <div class="page-summary"> - <p><bean:message key="details.crashnotes.delete.confirm"/></p> + <p><bean:message key="table.crashnotes.delete.confirm"/></p> </div> - <html:form method="post" action="/systems/details/DeleteCrashNote.do"> + <html:form method="post" action="/systems/table/DeleteCrashNote.do"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="sid" value="${sid}"/> <html:hidden property="crid" value="${crid}"/> <html:hidden property="cnid" value="${cnid}"/> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="sdc.details.notes.subject"/></th> + <th><bean:message key="sdc.table.notes.subject"/></th> <td>${subject}</td> </tr> <tr> - <th><bean:message key="sdc.details.notes.details"/></th> + <th><bean:message key="sdc.table.notes.details"/></th> <td>${note}</td> </tr> </table> @@ -51,7 +51,7 @@ <hr/> <div align="right"> <html:submit> - <bean:message key="sdc.details.notes.delete"/> + <bean:message key="sdc.table.notes.delete"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 839d33a..fcf04a7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -29,7 +29,7 @@ <form action="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="system.jsp.customkey.keylabel"/>:</th> <td><input disabled="true" type="text" name="label" length="64" size="30" value="<c:out value="${label}" />"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp index 8ed7a59..329598c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp @@ -12,38 +12,38 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><bean:message key="system.audit.ruledetails.jsp.heading"/></h2> +<h2><bean:message key="system.audit.ruletable.jsp.heading"/></h2> <rhn:csrf/> -<table class="details"> +<table class="table"> <tr> - <th><bean:message key="system.audit.ruledetails.jsp.idref"/>:</th> + <th><bean:message key="system.audit.ruletable.jsp.idref"/>:</th> <td><c:out value="${ruleResult.documentIdref}"/></td> </tr> <tr> - <th><bean:message key="system.audit.ruledetails.jsp.result"/>:</th> + <th><bean:message key="system.audit.ruletable.jsp.result"/>:</th> <td><c:out value="${ruleResult.label}"/></td> </tr> <tr> - <th><bean:message key="system.audit.ruledetails.jsp.parent"/>:</th> + <th><bean:message key="system.audit.ruletable.jsp.parent"/>:</th> <td> - <a href="/rhn/systems/details/audit/XccdfDetails.do?sid=${param.sid}&xid=${ruleResult.testResult.id}"> + <a href="/rhn/systems/table/audit/XccdfDetails.do?sid=${param.sid}&xid=${ruleResult.testResult.id}"> <c:out value="${ruleResult.testResult.identifier}"/> </a> </td> </tr> </table> -<h2><bean:message key="system.audit.ruledetails.jsp.assignedidents"/></h2> +<h2><bean:message key="system.audit.ruletable.jsp.assignedidents"/></h2> <rl:listset name="groupSet"> <rhn:csrf/> - <rl:list emptykey="system.audit.ruledetails.jsp.noidents"> + <rl:list emptykey="system.audit.ruletable.jsp.noidents"> - <rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true"> + <rl:column headerkey="system.audit.ruletable.jsp.system" sortattr="system" sortable="true"> <c:out value="${current.system}"/> </rl:column> - <rl:column headerkey="system.audit.ruledetails.jsp.ident" sortattr="identifier" sortable="true"> + <rl:column headerkey="system.audit.ruletable.jsp.ident" sortattr="identifier" sortable="true"> <c:out value="${current.identifier}"/> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp index 0720883..3d19205 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp @@ -19,17 +19,17 @@ <img src="/img/rhn-listicon-${testResult.diffIcon}.gif" alt="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>" title="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>"/> - <bean:message key="system.audit.xccdfdetails.jsp.diff"/> + <bean:message key="system.audit.xccdftable.jsp.diff"/> </a> </c:when> <c:otherwise> - <bean:message key="system.audit.xccdfdetails.jsp.nodiff"/> + <bean:message key="system.audit.xccdftable.jsp.nodiff"/> </c:otherwise> </c:choose> | <c:if test="${testResult.deletable}"> - <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> + <a href="/rhn/systems/table/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> <i class="icon-trash" title="<bean:message key="system.audit.xccdfdelete"/>"></i> <bean:message key="system.audit.xccdfdelete"/> @@ -37,22 +37,22 @@ | </c:if> - <a href="/rhn/systems/details/audit/ScheduleXccdf.do?sid=${param.sid}&path=${testResult.scapActionDetails.path}&params=${testResult.scapActionDetails.parametersContents}"> - <img src="/img/restart.png" alt="<bean:message key="system.audit.xccdfdetails.jsp.reschedule"/>"/> - <bean:message key="system.audit.xccdfdetails.jsp.reschedule"/> + <a href="/rhn/systems/table/audit/ScheduleXccdf.do?sid=${param.sid}&path=${testResult.scapActionDetails.path}&params=${testResult.scapActionDetails.parametersContents}"> + <img src="/img/restart.png" alt="<bean:message key="system.audit.xccdftable.jsp.reschedule"/>"/> + <bean:message key="system.audit.xccdftable.jsp.reschedule"/> </a> </div> -<h2><bean:message key="system.audit.xccdfdetails.jsp.header"/></h2> +<h2><bean:message key="system.audit.xccdftable.jsp.header"/></h2> <rhn:csrf/> -<table class="details"> +<table class="table"> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.id"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.id"/>:</th> <td><c:out value="${testResult.id}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.path"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.path"/>:</th> <td><c:out value="${testResult.scapActionDetails.path}"/></td> </tr> <tr> @@ -63,45 +63,45 @@ <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th> <td> <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />"/> - <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> + <a href="/network/systems/table/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> <c:out value="${testResult.scapActionDetails.parentAction.schedulerUser.login}"/> </a> </td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.benchmarkid"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.benchmarkid"/>:</th> <td><c:out value="${testResult.benchmark.identifier}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.version"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.version"/>:</th> <td><c:out value="${testResult.benchmark.version}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.profileid"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.profileid"/>:</th> <td><c:out value="${testResult.profile.identifier}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.title"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.title"/>:</th> <td><c:out value="${testResult.profile.title}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.started"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.started"/>:</th> <td><c:out value="${testResult.startTime}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.completed"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.completed"/>:</th> <td><c:out value="${testResult.endTime}"/></td> </tr> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.errors"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.errors"/>:</th> <td><pre><c:out value="${testResult.errrosContents}"/></pre></th> </tr> <c:if test="${not empty testResult.files}"> <tr> - <th><bean:message key="system.audit.xccdfdetails.jsp.files"/>:</th> + <th><bean:message key="system.audit.xccdftable.jsp.files"/>:</th> <td> <c:forEach items="${testResult.files}" var="file"> - <a href="/rhn/systems/details/audit/ScapResultDownload.do?sid=${param.sid}&xid=${param.xid}&name=${file.filename}" + <a href="/rhn/systems/table/audit/ScapResultDownload.do?sid=${param.sid}&xid=${param.xid}&name=${file.filename}" target="${file.HTML ? '_blank' : '_self'}"><c:out value="${file.filename}"/></a>   </c:forEach> </td> @@ -109,7 +109,7 @@ </c:if> </table> -<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2> +<h2><bean:message key="system.audit.xccdftable.jsp.xccdfrules"/></h2> <rl:listset name="xccdfDetails"> <rhn:csrf/> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index 3b3fa2b..c10474d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@ -13,11 +13,11 @@ <bean:message key="kickstart.session_cancel.jsp.summary" /> <p> -<html:form method="POST" action="/systems/details/kickstart/SessionCancel.do"> +<html:form method="POST" action="/systems/table/kickstart/SessionCancel.do"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="kickstartdetails.jsp.label" /></th> + <th><bean:message key="kickstarttable.jsp.label" /></th> <td><a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${ksession.ksdata.id}">${ksession.ksdata.label}</td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp index 15f78e8..e8ebfb4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp @@ -9,7 +9,7 @@ <head> <meta name="name" value="System Details" /> <style type="text/css"> - .details td, .details th { white-space: nowrap; } + .table td, .table th { white-space: nowrap; } </style> <c:if test="${not failed and not complete}"> <script type="text/javascript" src="/javascript/rememberScroll.js"> </script> @@ -19,11 +19,11 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <div class="page-summary"> -<h2><bean:message key="kickstartdetails.jsp.header2"/></h2> +<h2><bean:message key="kickstarttable.jsp.header2"/></h2> -<table class="details"> +<table class="table"> <tr> - <th><bean:message key="kickstartdetails.jsp.label" /></th> + <th><bean:message key="kickstarttable.jsp.label" /></th> <td><a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${ksdata.id}">${ksdata.label}</td> </tr> <tr> @@ -49,7 +49,7 @@ <tr> <td> -<table class="details"> +<table class="table"> <tr> <th><bean:message key="kickstart.session_status.jsp.next_action" /></th> <td> @@ -94,7 +94,7 @@ <tr> <th><bean:message key="kickstart.session_status.jsp.cancel_cancel" /></th> <td> - <a href="/rhn/systems/details/kickstart/SessionCancel.do?sid=${system.id}"><bean:message key="kickstart.session_cancel.jsp.cancel"/></a> + <a href="/rhn/systems/table/kickstart/SessionCancel.do?sid=${system.id}"><bean:message key="kickstart.session_cancel.jsp.cancel"/></a> </td> </tr> </c:if> @@ -201,7 +201,7 @@ </tr> </table> </div> -<form id="saveScrollPosition" method="POST" action="/rhn/systems/details/kickstart/SessionStatus.do?sid=${requestScope.sid}"> +<form id="saveScrollPosition" method="POST" action="/rhn/systems/table/kickstart/SessionStatus.do?sid=${requestScope.sid}"> <rhn:csrf /> <rhn:submitted /> <input id="scrollPosX" type="hidden" name="xPosition" value="${requestScope.scrollX}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp index 75dbdf2..67ff9e5 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp @@ -20,13 +20,13 @@ </p> </div> - <table class="details"> + <table class="table"> <tr> - <th><bean:message key="packagedetails.description"/></th> + <th><bean:message key="packagetable.description"/></th> <td><pre>${package.description}</pre></td> </tr> </table> -<form method="POST" name="install_patchset" action="/rhn/systems/details/packages/patchsets/InstallPatchSetSubmit.do"> +<form method="POST" name="install_patchset" action="/rhn/systems/table/packages/patchsets/InstallPatchSetSubmit.do"> <rhn:csrf /> <input type="hidden" name="sid" value="${param.sid}" /> <input type="hidden" name="pid" value="${param.pid}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index 4cb272c..9ee88db 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -48,7 +48,7 @@ function setStep(stepName) { </rl:list> <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> - <table class="details"> + <table class="table"> <tr> <th><rhn:required-field key="virtualization.provision.first.jsp.guest_name.header"/></th> <td> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp index a268a03..9c6cccb 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp @@ -25,13 +25,13 @@ function refreshNotifFields() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" icon="icon-desktop" - deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" + deletionUrl="/rhn/systems/table/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe"> <bean:message key="probeedit.jsp.editprobe" /> </rhn:toolbar> -<html:form action="/systems/details/probes/ProbeEdit" method="POST"> +<html:form action="/systems/table/probes/ProbeEdit" method="POST"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="probeedit.jsp.probecommand" /></th> <td colspan="3">${probe.command.description}</td> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index 97371f3..ee4530b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -23,9 +23,9 @@ <hr /> - <form action="/rhn/systems/details/DeleteCustomData.do?sid=${system.id}&cikid=${cikid}" name="edit_token" method="post"> + <form action="/rhn/systems/table/DeleteCustomData.do?sid=${system.id}&cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="system.jsp.customdata.keylabel"/>:</th> <td>${label}</td> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp index 3bfc00b..d0bfc67 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp @@ -8,30 +8,30 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" icon="icon-info-sign" - creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}" + creationUrl="/rhn/systems/table/CreateCustomData.do?sid=${system.id}" creationType="customdata"> - <bean:message key="sdc.details.customdata.header"/> + <bean:message key="sdc.table.customdata.header"/> </rhn:toolbar> <div class="page-summary"> - <p><bean:message key="sdc.details.customdata.summary"/></p> + <p><bean:message key="sdc.table.customdata.summary"/></p> </div> <c:choose> <c:when test="${listEmpty == 1}"> <div class="list-empty-message"> - <bean:message key="sdc.details.customdata.nosystems"/> + <bean:message key="sdc.table.customdata.nosystems"/> </div> </c:when> <c:otherwise> - <table class="details"> + <table class="table"> <c:forEach items="${pageList}" var="current" varStatus="loop"> <tr> <th>${current.label}</th> <td width="50%"> <pre><c:out value="${current.value}" /></pre> - <a href="/rhn/systems/details/UpdateCustomData.do?sid=${system.id}&cikid=${current.cikid}"> - <bean:message key="sdc.details.customdata.editvalue"/> + <a href="/rhn/systems/table/UpdateCustomData.do?sid=${system.id}&cikid=${current.cikid}"> + <bean:message key="sdc.table.customdata.editvalue"/> </a> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp index 7fe0152..9613672 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp @@ -6,15 +6,15 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.details.migrate.header"/></h2> + <h2><bean:message key="sdc.table.migrate.header"/></h2> - <html:form method="post" action="/systems/details/SystemMigrate.do?sid=${system.id}"> + <html:form method="post" action="/systems/table/SystemMigrate.do?sid=${system.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th> - <bean:message key="sdc.details.migrate.org"/> + <bean:message key="sdc.table.migrate.org"/> </th> <td> <html:select property="to_org"> @@ -30,7 +30,7 @@ <hr/> <div align="right"> <html:submit> - <bean:message key="sdc.details.migrate.migrate"/> + <bean:message key="sdc.table.migrate.migrate"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp index e1642e2..b6a2d4a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp @@ -7,18 +7,18 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-note.gif" alt="" /><bean:message key="sdc.details.notes.delete.header"/> + <img src="/img/rhn-icon-note.gif" alt="" /><bean:message key="sdc.table.notes.delete.header"/> </h2> <div class="page-summary"> - <p><bean:message key="sdc.details.notes.delete.confirm"/></p> + <p><bean:message key="sdc.table.notes.delete.confirm"/></p> </div> - <html:form method="post" action="/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}"> + <html:form method="post" action="/systems/table/DeleteNote.do?sid=${system.id}&nid=${n.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <table class="details"> + <table class="table"> <tr> <th> - <bean:message key="sdc.details.notes.subject"/> + <bean:message key="sdc.table.notes.subject"/> </th> <td> ${subject} @@ -26,7 +26,7 @@ </tr> <tr> <th> - <bean:message key="sdc.details.notes.details"/> + <bean:message key="sdc.table.notes.details"/> </th> <td> ${note} @@ -35,7 +35,7 @@ <hr/> <div align="right"> <html:submit> - <bean:message key="sdc.details.notes.delete"/> + <bean:message key="sdc.table.notes.delete"/> </html:submit> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp index 942bb62..83b2606 100644 --- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp @@ -22,7 +22,7 @@ <br /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="crashes.jsp.uuid"/></th> <td><c:out value="${crashesSummary.uuid}"/></td> @@ -60,7 +60,7 @@ sortattr="serverName" sortable="true" filterattr="serverName"> - <a href="/rhn/systems/details/SoftwareCrashDetail.do?crid=${current.crashId}&sid=${current.serverId}"> + <a href="/rhn/systems/table/SoftwareCrashDetail.do?crid=${current.crashId}&sid=${current.serverId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> </rl:column> commit d10219dd04c6858d14fc38f3b1b2c1afdc1f99d0 Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 18:08:08 2013 +0200 More icons added diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index a4db0e9..08c24e8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -8,17 +8,10 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> -<BR> - - - -<div> - <h2><img src="/img/rhn-icon-errata.gif"> <bean:message key="header.jsp.errata"/></h2> + <h2><i class="spacewalk-icon-patches"></i> <bean:message key="header.jsp.errata"/></h2> <bean:message key="channel.jsp.errata.listtitle"/> - - <rl:listset name="errataSet"> <rhn:csrf /> <rhn:submitted /> @@ -89,10 +82,6 @@ exportColumns="id, advisory, advisoryType, advisorySynopsis, updateDate" /> </rl:listset> - - - -</div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index 1988bda..db9a700 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -11,15 +11,11 @@ </head> <body> - <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> -<BR> <h2> - <img src="/img/rhn-icon-system.gif" alt="system" /> - <bean:message key="channelsystems.jsp.header2"/> - </h2> - - + <i class="icon-desktop"></i> + <bean:message key="channelsystems.jsp.header2"/> + </h2> <rl:listset name="systemSet" legend="system-group"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index cdb76f8..5b510d1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -195,14 +195,14 @@ <td> <c:choose> <c:when test="${serverLock != null}"> - <img style="float: left; margin-right: 10px" src="/img/rhn-icon-security.gif"/> + <i class="icon-lock"></i> <bean:message key="sdc.details.overview.locked" arg0="${serverLock.locker.login}" arg1="${serverLock.reason}" /><br/> <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> </c:when> <c:otherwise> - <img style="float: left; margin-right: 10px" src="/img/rhn-icon-unlocked.gif"/> + <i class="icon-unlock"></i> <bean:message key="sdc.details.overview.unlocked"/><br/> <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> </c:otherwise> commit bfda9f342ee4933c0d4a4f96645e77d91b063d99 Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 17:59:42 2013 +0200 package icon added diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp index 077de98..68774be 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> - <h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="systemlist.jsp.packages"/></h2> + <h2><i class="spacewalk-icon-packages"></i> <bean:message key="systemlist.jsp.packages"/></h2> <bean:message key="package.jsp.list"/> <rl:listset name="packageSet"> commit bcfc8aa785d70c32a1209112ffd90729796ff593 Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 17:54:34 2013 +0200 Icons fontawesome added diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java index 6c9e631..c5cea64 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java @@ -39,8 +39,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { // setup mock objects String output = "<div class=\"toolbar-h1\"><div class=\"" + "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<img src=\"/img/action-del.gif\" alt=\"delete user\"" + - " title=\"delete user\" />delete user</a></span>" + + "<i class=\"icon-trash\"" + + " title=\"delete user\" ></i>delete user</a></span>" + "</div></div>"; @@ -72,8 +72,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { try { String output = "<div class=\"toolbar-h1\"><div class=\"" + "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<img src=\"/img/action-del.gif\" alt=\"delete user\"" + - " title=\"delete user\" />delete user</a></span>" + + "<i class=\"icon-trash\"" + + " title=\"delete user\" ></i>delete user</a></span>" + "</div></div>"; setupDeletionTag("h1", "deletion-url", @@ -97,8 +97,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { try { String output = "<div class=\"toolbar-h1\"><div class=\"" + "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<img src=\"/img/action-del.gif\" alt=\"delete user\"" + - " title=\"delete user\" />delete user</a></span>" + + "<i class=\"icon-trash\"" + + " title=\"delete user\" ></i>delete user</a></span>" + "</div></div>"; setupDeletionTag("h1", "deletion-url", @@ -144,8 +144,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { // setup mock objects String output = "<div class=\"toolbar-h1\"><div class=\"" + "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<img src=\"/img/action-del.gif\" alt=\"delete user\"" + - " title=\"delete user\" />delete user</a></span>" + + "<i class=\"icon-trash\"" + + " title=\"delete user\" ></i>delete user</a></span>" + "</div></div>"; setupDeletionTag("h1", "deletion-url", "true_test()", "user"); diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp index 410d965..fac80f8 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp @@ -4,7 +4,7 @@ <h4><bean:message key="system-group-legend.jsp.title"/></h4> <ul> <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-group-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-group-legend.jsp.updates"/></li> - <li><i class="icon-warning-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-group-legend.jsp.critical"/></li> + <li><i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-group-legend.jsp.updates"/></li> + <li><i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-group-legend.jsp.critical"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index f416e72..a04e942 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -5,8 +5,8 @@ <h4><bean:message key="system-legend.jsp.title"/></h4> <ul> <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-legend.jsp.critical"/></li> - <li><i class="icon-warning-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-legend.jsp.updates"/></li> + <li><i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-legend.jsp.critical"/></li> + <li><i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-legend.jsp.updates"/></li> <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin"/></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked"/></li> diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp index 57df068..d7f057c 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -5,8 +5,8 @@ <h4><bean:message key="yourrhn-legend.jsp.title" /></h4> <ul> <li><i class="icon-ok-sign icon-1-5x spacewalk-icon-green"></i><bean:message key="system-legend.jsp.fully" /></li> - <li><i class="icon-exclamation-sign icon-1-5x spacewalk-icon-yellow"></i><bean:message key="system-legend.jsp.critical" /></li> - <li><i class="icon-warning-sign icon-1-5x spacewalk-icon-red"></i><bean:message key="system-legend.jsp.updates" /></li> + <li><i class="icon-exclamation-sign icon-1-5x spacewalk-icon-red"></i><bean:message key="system-legend.jsp.critical" /></li> + <li><i class="icon-warning-sign icon-1-5x spacewalk-icon-yellow"></i><bean:message key="system-legend.jsp.updates" /></li> <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin" /></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked" /></li> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 1e61e64..e78d54f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -14,8 +14,7 @@ <bean:message key="toolbar.work.with.group"/> </a> <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> - <img src="/img/action-del.gif" alt="<bean:message key="toolbar.delete.systemgroup"/>" - title="<bean:message key="toolbar.delete.systemgroup"/>" /> + <i class="icon-trash" title="<bean:message key="toolbar.delete.systemgroup"/>" ></i> <bean:message key="toolbar.delete.systemgroup"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index 9777468..2512580 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -15,18 +15,16 @@ <c:choose> <c:when test="${not empty param.cnid}"> <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> - <img src="/img/action-del.gif" - alt="<bean:message key="toolbar.delete.note"/>" - title="<bean:message key="toolbar.delete.note"/>" /> + <i class="icon-trash" + title="<bean:message key="toolbar.delete.note"/>" ></i> <bean:message key="toolbar.delete.note"/> </a> | </c:when> </c:choose> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <img src="/img/action-del.gif" - alt="<bean:message key="toolbar.delete.crash"/>" - title="<bean:message key="toolbar.delete.crash"/>" /> + <i class="icon-trash" + title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index cde1dc6..6b9c8d2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -13,9 +13,8 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <img src="/img/action-del.gif" - alt="<bean:message key="toolbar.delete.crash"/>" - title="<bean:message key="toolbar.delete.crash"/>" /> + <i class="icon-trash" + title="<bean:message key="toolbar.delete.crash"/>" ></i> <bean:message key="toolbar.delete.crash"/> </a> </span> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index e65e7b1..ba37585 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -6,70 +6,70 @@ <html:html xhtml="true"> <body> - <div class="toolbar-h1"> - <div class="toolbar"> - <span class="toolbar"> - <a href="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"> - <img src="/img/action-del.gif" alt="delete key" title="delete key" />delete key</a> - </span> - </div> - <img src="/img/rhn-icon-keyring.gif" alt="" /> - <bean:message key="system.jsp.customkey.updatetitle"/> - - <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> - </a> + <div class="toolbar-h1"> + <div class="toolbar"> + <span class="toolbar"> + <a href="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"> + <i class="icon-trash" title="delete key"></i>delete key</a> + </span> </div> + <img src="/img/rhn-icon-keyring.gif" alt="" /> + <bean:message key="system.jsp.customkey.updatetitle"/> - <div class="page-summary"> - <p><bean:message key="system.jsp.customkey.updatemsg"/></p> - </div> + <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> + <i class="icon-question-sign" title="Help icon"></i> + </a> + </div> - <rl:listset name="systemListSet" legend="system"> - <rhn:csrf /> - <rhn:submitted/> + <div class="page-summary"> + <p><bean:message key="system.jsp.customkey.updatemsg"/></p> + </div> - <div class="form-horizontal"> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="system.jsp.customkey.keylabel"/>: - </label> - <div class="col-lg-6">${label}</div> - </div> + <rl:listset name="systemListSet" legend="system"> + <rhn:csrf /> + <rhn:submitted/> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="system.jsp.customkey.description"/>: - </label> - <div class="col-lg-6"> - <textarea wrap="virtual" rows="6" cols="50" - class="form-control" - name="description"><c:out value="${description}" /></textarea> - </div> - </div> + <div class="form-horizontal"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="system.jsp.customkey.keylabel"/>: + </label> + <div class="col-lg-6">${label}</div> + </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="system.jsp.customkey.created"/>: - </label> - <div class="col-lg-6">${created} by ${creator}</div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="system.jsp.customkey.description"/>: + </label> + <div class="col-lg-6"> + <textarea wrap="virtual" rows="6" cols="50" + class="form-control" + name="description"><c:out value="${description}" /></textarea> </div> + </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="system.jsp.customkey.modified"/>: - </label> - <div class="col-lg-6">${modified} by ${modifier}</div> - </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="system.jsp.customkey.created"/>: + </label> + <div class="col-lg-6">${created} by ${creator}</div> + </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <input type="submit" name="dispatch" class="btn btn-success" - value="${rhn:localize('system.jsp.customkey.updatebutton')}" /> - <input type="hidden" name="cikid" value="${param.cikid}" /> - </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="system.jsp.customkey.modified"/>: + </label> + <div class="col-lg-6">${modified} by ${modifier}</div> + </div> + + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <input type="submit" name="dispatch" class="btn btn-success" + value="${rhn:localize('system.jsp.customkey.updatebutton')}" /> + <input type="hidden" name="cikid" value="${param.cikid}" /> </div> </div> + </div> <h2><bean:message key="system.jsp.customkey.updateheader"/></h2> <rl:list diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp index 9fc9e40..0720883 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp @@ -30,9 +30,8 @@ <c:if test="${testResult.deletable}"> <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> - <img src="/img/action-del.gif" - alt="<bean:message key="system.audit.xccdfdelete"/>" - title="<bean:message key="system.audit.xccdfdelete"/>"/> + <i class="icon-trash" + title="<bean:message key="system.audit.xccdfdelete"/>"></i> <bean:message key="system.audit.xccdfdelete"/> </a> | diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp index 6cd4519..23eb0ef 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp @@ -16,11 +16,11 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/DeleteCustomData.do?sid=${sid}&cikid=${cikid}"> - <img src="/img/action-del.gif" alt="delete value" title="delete value" />delete value + <i class="icon-trash" title="delete value"></i>delete value </a> </span> </div> - <img src="/img/rhn-icon-info.gif" alt="" /> + <i class="icon-info-sign"></i> <bean:message key="system.jsp.customkey.updatetitle"/> </div> @@ -28,7 +28,7 @@ <form action="/rhn/systems/details/UpdateCustomData.do?sid=${system.id}&cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> - <table class="details"> + <table class="table"> <tr> <th><bean:message key="system.jsp.customkey.keylabel"/>:</th> <td>${label}</td> @@ -52,7 +52,7 @@ </tr> </table> - <div align="right"> + <div class="text-right"> <hr /> <input type="submit" name="UpdateKey" value="Update Key" /> diff --git a/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp b/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp index 591b01c..054b707 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp @@ -8,17 +8,13 @@ <body> <h1><bean:message key="usercreate.createFirstLogin" /></h1> - <div class="page-summary"> - <p><bean:message key="usercreate.satSummary" /></p> - </div> -<br /> +<p><bean:message key="usercreate.satSummary" /></p> <jsp:include page="usercreate.jsp"> <jsp:param name="action_path" value="/newlogin/CreateFirstUserSubmit"/> <jsp:param name="account_type" value="create_sat"/> </jsp:include> - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp index ea17341..c54d1d8 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -32,144 +32,170 @@ <html:form action="${action_path}"> <rhn:csrf /> - <h2><bean:message key="usercreate.login" /></h2> - - <table class="details" align="center"> - <tr> - <th><label for="login"><rhn:required-field key="desiredlogin"/>:</label></th> - <td> - <html:text property="login" size="15" maxlength="${loginLength}" styleId="login"/> - </td> - </tr> - <tr> - <th><label for="desiredpass"><bean:message key="desiredpass" /><span name="password-asterisk" - class="required-form-field">*</span>:</th></label> - <td> - <html:password property="desiredpassword" size="15" maxlength="${passwordLength}"/> - </td> - </tr> - <tr> - <th><label for="confirmpass"><bean:message key="confirmpass" /><span name="password-asterisk" - class="required-form-field">*</span>:</label></th> - <td> - <html:password property="desiredpasswordConfirm" size="15" maxlength="${passwordLength}" styleId="confirmpass"/> - </td> - </tr> - <c:if test="${displaypam == 'true' && account_type != 'create_sat'}"> - <tr> - <th><label for="pam"><bean:message key="usercreate.jsp.pam"/></label></th> - <td> - <c:choose> - <c:when test="${displaypamcheckbox == 'true'}"> - <html:checkbox property="usepam" onclick="$(\"[name='password-asterisk']\").toggle()" styleId="pam"/> - <label for="pam"><bean:message key="usercreate.jsp.pam.instructions"/></label> <br/> - <strong><span style="font-size: 10px"> - <bean:message key="usercreate.jsp.pam.instructions.note"/> - </span></strong> - </c:when> - <c:otherwise> - <bean:message key="usercreate.jsp.pam.reference"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </c:if> - </table> - - <h2><bean:message key="usercreate.accountInfo" /></h2> - <table class="details" align="center"> - <tr> - <th><label for="firstNames"><rhn:required-field key="usercreate.names"/>:</th></label> - <td> - <html:select property="prefix"> - <html:options collection="availablePrefixes" - property="value" - labelProperty="label" /> - </html:select> - - <html:text property="firstNames" size="15" maxlength="${firstNameLength}" styleId="firstNames"/> - <html:text property="lastName" size="15" maxlength="${lastNameLength}"/> - </td> - </tr> - - <tr> - <th><label for="email"><rhn:required-field key="email"/>:</label></th> - <td> - <html:text property="email" size="20" maxlength="${emailLength}" styleId="email"/> - </td> - </tr> -<html:hidden property="account_type" value="${account_type}" /> - - <tr> - <td style="border: 0; text-align: center" colspan="2"><span class="required-form-field">*</span> - <bean:message key="usercreate.requiredField" /></td> - </tr> -</table> - + <div class="row-0"> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="usercreate.login" /></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td><label for="login"><rhn:required-field key="desiredlogin"/>:</label></td> + <td> + <html:text property="login" styleClass="form-control" maxlength="${loginLength}" styleId="login"/> + </td> + </tr> + <tr> + <td><label for="desiredpass"><bean:message key="desiredpass" /><span name="password-asterisk" + class="required-form-field">*</span>:</td></label> + <td> + <html:password property="desiredpassword" styleClass="form-control" size="15" maxlength="${passwordLength}"/> + </td> + </tr> + <tr> + <td><label for="confirmpass"><bean:message key="confirmpass" /><span name="password-asterisk" + class="required-form-field">*</span>:</label></td> + <td> + <html:password styleClass="form-control" property="desiredpasswordConfirm" size="15" maxlength="${passwordLength}" styleId="confirmpass"/> + </td> + </tr> + <c:if test="${displaypam == 'true' && account_type != 'create_sat'}"> + <tr> + <td><label for="pam"><bean:message key="usercreate.jsp.pam"/></label></td> + <td> + <c:choose> + <c:when test="${displaypamcheckbox == 'true'}"> + <html:checkbox property="usepam" onclick="$(\"[name='password-asterisk']\").toggle()" styleId="pam"/> + <label for="pam"><bean:message key="usercreate.jsp.pam.instructions"/></label> <br/> + <strong><span> + <bean:message key="usercreate.jsp.pam.instructions.note"/> + </span></strong> + </c:when> + <c:otherwise> + <bean:message key="usercreate.jsp.pam.reference"/> + </c:otherwise> + </c:choose> + </td> + </tr> + </c:if> + </table> + </div> + </div> + </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="usercreate.accountInfo" /></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td><label for="firstNames"><rhn:required-field key="usercreate.names"/>:</td></label> + <td> + <html:select styleClass="form-control margin-bottom-xs" property="prefix"> + <html:options collection="availablePrefixes" + property="value" + labelProperty="label" /> + </html:select> + + <html:text property="firstNames" size="15" styleClass="form-control margin-bottom-xs" maxlength="${firstNameLength}" styleId="firstNames"/> + <html:text property="lastName" size="15" styleClass="form-control margin-bottom-xs" maxlength="${lastNameLength}"/> + </td> + </tr> + + <tr> + <td><label for="email"><rhn:required-field key="email"/>:</label></td> + <td> + <html:text property="email" styleClass="form-control" maxlength="${emailLength}" styleId="email"/> + </td> + </tr> + <html:hidden property="account_type" value="${account_type}" /> + <tr> + <td colspan="2"><span class="required-form-field">*</span> - <bean:message key="usercreate.requiredField" /></td> + </tr> + </table> + </div> + </div> + </div> + </div> <c:if test="${account_type == 'into_org'}"> - <h2><bean:message key="preferences.jsp.tz"/></h2> - <p><bean:message key="preferences.jsp.datestimes"/></p> - <div class="preference"><bean:message key="preferences.jsp.displaytimesas"/> - <select name="timezone"> - <c:forEach var="tz" items="${requestScope.timezones}"> - <c:if test="${tz.value == requestScope.default_tz}"> - <option value="${tz.value}" selected="selected">${tz.display}</option> - </c:if> - <c:if test="${tz.value != requestScope.default_tz}"> - <option value="${tz.value}">${tz.display}</option> - </c:if> - </c:forEach> - </select> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.tz"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.datestimes"/></p> + <div class="well well-sm"> + <bean:message key="preferences.jsp.displaytimesas"/> + <select name="timezone"> + <c:forEach var="tz" items="${requestScope.timezones}"> + <c:if test="${tz.value == requestScope.default_tz}"> + <option value="${tz.value}" selected="selected">${tz.display}</option> + </c:if> + <c:if test="${tz.value != requestScope.default_tz}"> + <option value="${tz.value}">${tz.display}</option> + </c:if> + </c:forEach> + </select> + </div> + </div> </div> - - <h2><bean:message key="preferences.jsp.lang" /></h2> - <p><bean:message key="preferences.jsp.langs" /></p> - - <div class="preference"> - <c:set var="counter" value="0" /> - <table width="75%" cellpadding="0"> - <tr> - <td width="50%"> - <input type="radio" name="preferredLocale" value="<c:out value="${noLocale.languageCode}" />" - <c:if test="${noLocale.languageCode == currentLocale}"> - checked="checked" - </c:if>/> - <c:out value="${noLocale.localizedName}" /> - <br /> - <br /> - </td> - </tr> - <c:forEach var="item" items="${supportedLocales}"> - <c:if test="${counter == 0}"> - <tr> - </c:if> - <td width="50%"> - <input type="radio" name="preferredLocale" value="<c:out value="${item.key}" />" - <c:if test="${item.key == currentLocale}"> - checked="checked" - </c:if>/> - <img src="<c:out value="${item.value.imageUri}" />" alt="<c:out value="${item.value.localizedName}" />" /> (<c:out value="${item.value.localizedName}" />) - </td> - <c:if test="${counter == 1}"> - </tr> - </c:if> - <c:set var="counter" value="${counter + 1}" /> - <c:if test="${counter == 2}"> - <c:set var="counter" value="0" /> - </c:if> - </c:forEach> - - <c:if test="${counter == 1}"> - </tr> - </c:if> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.lang" /></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.langs" /></p> + <div class="well well-sm"> + <c:set var="counter" value="0" /> + <table width="75%" cellpadding="0"> + <tr> + <td width="50%"> + <input type="radio" name="preferredLocale" value="<c:out value="${noLocale.languageCode}" />" + <c:if test="${noLocale.languageCode == currentLocale}"> + checked="checked" + </c:if>/> + <c:out value="${noLocale.localizedName}" /> + <br /> + <br /> + </td> + </tr> + <c:forEach var="item" items="${supportedLocales}"> + <c:if test="${counter == 0}"> + <tr> + </c:if> + <td width="50%"> + <input type="radio" name="preferredLocale" value="<c:out value="${item.key}" />" + <c:if test="${item.key == currentLocale}"> + checked="checked" + </c:if>/> + <img src="<c:out value="${item.value.imageUri}" />" alt="<c:out value="${item.value.localizedName}" />" /> (<c:out value="${item.value.localizedName}" />) + </td> + <c:if test="${counter == 1}"> + </tr> + </c:if> + <c:set var="counter" value="${counter + 1}" /> + <c:if test="${counter == 2}"> + <c:set var="counter" value="0" /> + </c:if> + </c:forEach> + + <c:if test="${counter == 1}"> + </tr> + </c:if> + </table> + </div> + </div> </div> + </c:if> -<div align="right"> -<html:submit> - <bean:message key="usercreate.jsp.createlogin"/> -</html:submit> +<div class="text-right"> + <html:submit styleClass="btn btn-success"> + <bean:message key="usercreate.jsp.createlogin"/> + </html:submit> </div> commit c267eec114ceb4573019e2bb7823a087f79f541a Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 17:53:04 2013 +0200 Overview page formated diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index a6e6330..cdb76f8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -7,402 +7,435 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <h2><bean:message key="sdc.details.overview.systemstatus"/></h2> - <div class="systeminfo"> - <div class="systeminfo-full"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.systemstatus"/></h4> + </div> + <div class="panel-body"> + <c:choose> + <c:when test="${unentitled}"> + <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + </c:when> - <c:choose> + <c:when test="${systemInactive}"> + <i class="spacewalk-icon-unknown-system"/></i> <bean:message key="sdc.details.overview.inactive1"/> + <c:if test="${documentation == 'true'}"> + <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + </c:if> + </c:when> + <c:when test="${hasUpdates}"> + <c:choose> + <c:when test="${criticalErrataCount > 0}"> + <i class="icon-exclamation-sign spacewalk-icon-red icon-1-5x"></i> + </c:when> + <c:otherwise> + <i class="icon-warning-sign spacewalk-icon-yellow icon-1-5x"></i> + </c:otherwise> + </c:choose> - <c:when test="${unentitled}"> - <img src="/img/icon_unentitled.gif"/> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> - </c:when> +   <bean:message key="sdc.details.overview.updatesavailable" />    - <c:when test="${systemInactive}"> - <i class="spacewalk-icon-unknown-system"/></i> <bean:message key="sdc.details.overview.inactive1"/> - <c:if test="${documentation == 'true'}"> - <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> - </c:if> - </c:when> - <c:when test="${hasUpdates}"> - <c:choose> - <c:when test="${criticalErrataCount > 0}"> - <img src="/img/icon_crit_update.gif"/> + <c:if test="${criticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    + </c:if> + <c:if test="${nonCriticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    + </c:if> + <c:if test="${upgradablePackagesCount > 0}"> + <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> + </c:if> + </c:when> + + <c:otherwise> + <i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i> <bean:message key="sdc.details.overview.updated"/> + </c:otherwise> + </c:choose> + + <c:if test="${rebootRequired}"> + <div class="systeminfo"> + <div class="systeminfo-full"> + <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> + </div> + </div> + </c:if> + + <c:if test="${probeListEmpty != 'true'}"> + <div class="row-0"> + <div class="col-md-6"> + <c:choose> + <c:when test="${probeList[0].state == 'CRITICAL'}"> + <img src="/img/rhn-mon-down.gif"/> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-alert.gif"/> + <img src="/img/rhn-mon-warning.gif"/> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:otherwise> - </c:choose> + </c:choose> + </div> + <div class="col-md-6"> + <c:forEach items="${probeList}" var="probe"> + <c:choose> + <c:when test="${probe.state == 'CRITICAL'}"> + <img src="/img/rhn-mini_icon-critical.gif"/> + </c:when> + <c:otherwise> + <img src="/img/rhn-mini_icon-warning.gif"/> + </c:otherwise> + </c:choose> + <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> + </c:forEach> + </div> + </div> + </c:if> -   <bean:message key="sdc.details.overview.updatesavailable" />    + </div> + </div> + - <c:if test="${criticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    - </c:if> - <c:if test="${nonCriticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    - </c:if> - <c:if test="${upgradablePackagesCount > 0}"> - <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> - </c:if> - </c:when> + <div class="systeminfo"> + + - <c:otherwise> - <img src="/img/icon_up2date.gif"/> <bean:message key="sdc.details.overview.updated"/> - </c:otherwise> - </c:choose> - </div> - <c:if test="${rebootRequired}"> - <div class="systeminfo"> - <div class="systeminfo-full"> - <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/> - <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> - </div> - </div> - </c:if> - <div class="systeminfo-clear" /> +<div class="row-0"> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> </div> - <c:if test="${probeListEmpty != 'true'}"> - <div class="systeminfo"> - <div class="systeminfo-left"> + <div class="panel-body"> + <table class="table"> + <tr> + <td><bean:message key="sdc.details.overview.hostname"/></td> + <td> <c:choose> - <c:when test="${probeList[0].state == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif"/> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <c:when test="${system.hostname == null}"> + <bean:message key="sdc.details.overview.unknown"/> </c:when> <c:otherwise> - <img src="/img/rhn-mon-warning.gif"/> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <c:out value="${system.decodedHostname}" /> </c:otherwise> </c:choose> - </div> - <div class="systeminfo-right"> - <c:forEach items="${probeList}" var="probe"> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.ipaddy"/></td> + <td> + <c:choose> + <c:when test="${system.ipAddress == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.ipAddress}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.ip6addy"/></td> + <td> + <c:choose> + <c:when test="${system.ip6Address == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.ip6Address}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + <c:if test="${system.virtualGuest}"> + <tr> + <td><bean:message key="sdc.details.overview.virtualization"/></td> + <td>${system.virtualInstance.type.name}</td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.uuid"/></td> <c:choose> - <c:when test="${probe.state == 'CRITICAL'}"> - <img src="/img/rhn-mini_icon-critical.gif"/> + <c:when test="${system.virtualInstance.uuid == null}"> + <td> + <bean:message key="sdc.details.overview.unknown"/> + </td> </c:when> <c:otherwise> - <img src="/img/rhn-mini_icon-warning.gif"/> + <td>${system.virtualInstance.uuid}</td> </c:otherwise> </c:choose> - <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> - </c:forEach> - </div> - <div class="systeminfo-clear" /> - </div> - </c:if> - <div style="clear: both; width: 45%; float: left;"> - <h2><bean:message key="sdc.details.overview.systeminfo"/></h2> - <table class="details"> - <tr> - <th><bean:message key="sdc.details.overview.hostname"/></th> - <td> - <c:choose> - <c:when test="${system.hostname == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.decodedHostname}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.ipaddy"/></th> - <td> - <c:choose> - <c:when test="${system.ipAddress == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.ipAddress}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.ip6addy"/></th> - <td> - <c:choose> - <c:when test="${system.ip6Address == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.ip6Address}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <c:if test="${system.virtualGuest}"> - <tr> - <th><bean:message key="sdc.details.overview.virtualization"/></th> - <td>${system.virtualInstance.type.name}</td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.uuid"/></th> - <c:choose> - <c:when test="${system.virtualInstance.uuid == null}"> - <td> + </tr> + </c:if> + <tr> + <td><bean:message key="sdc.details.overview.kernel"/></td> + <td> + <c:choose> + <c:when test="${system.runningKernel == null}"> <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.runningKernel}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.sysid"/></td> + <td><c:out value="${system.id}" /></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.activationkey"/></td> + <td> + <c:forEach items="${activationKey}" var="key"> + <c:out value="${key.token}" /></br> + </c:forEach> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.lockstatus"/></td> + <td> + <c:choose> + <c:when test="${serverLock != null}"> + <img style="float: left; margin-right: 10px" src="/img/rhn-icon-security.gif"/> + <bean:message key="sdc.details.overview.locked" + arg0="${serverLock.locker.login}" + arg1="${serverLock.reason}" /><br/> + <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> + </c:when> + <c:otherwise> + <img style="float: left; margin-right: 10px" src="/img/rhn-icon-unlocked.gif"/> + <bean:message key="sdc.details.overview.unlocked"/><br/> + <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </div> + </div> + </div> + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysevents"/></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td><bean:message key="sdc.details.overview.checkedin"/></td> + <td><fmt:formatDate value="${system.lastCheckin}" type="both" dateStyle="short" timeStyle="long"/></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.registered"/></td> + <td><fmt:formatDate value="${system.created}" type="both" dateStyle="short" timeStyle="long"/></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.lastbooted"/></td> + <td><fmt:formatDate value="${system.lastBootAsDate}" type="both" dateStyle="short" timeStyle="long"/><br/> + <rhn:require acl="system_feature(ftr_reboot)" + mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> + </rhn:require> + </td> + </tr> + <rhn:require acl="client_capable(osad.ping); system_feature(ftr_osa_bus)" + mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + <tr> + <td><bean:message key="sdc.details.overview.osa.status"/></td> + <td> + <c:choose> + <c:when test="${system.pushClient != null}"> + <bean:message key="sdc.details.overview.osa.status.message" + arg0="${system.pushClient.state.name}"/> + <c:choose> + <c:when test="${system.pushClient.lastMessageTime != null}"> + <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.unknown" /><br/> + </c:otherwise> + </c:choose> + <c:if test="${system.pushClient.lastPingTime != null}"> + <bean:message key="sdc.details.overview.osa.status.lastping"/> + <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> + <br/> + </c:if> + + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.unknown" /> + </c:otherwise> + </c:choose> + </td> + </tr> + </rhn:require> + <rhn:require acl="system_feature(ftr_satellite_applet); client_capable(rhn_applet.use_satellite)" + mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + <tr> + <td><bean:message key="sdc.details.overview.applet"/></td> + <td> + <c:choose> + <c:when test="${system.serverUuid == null}"> + <bean:message key="sdc.details.overview.applet.notactivated"/><br/> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.applet.activated"/><br/> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.reactivate"/></a> + </c:otherwise> + </c:choose> </td> + </tr> + </rhn:require> + </table> + </div> + </div> + </div> +</div> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td><bean:message key="sdc.details.overview.entitlement"/></td> + <td> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> </c:when> <c:otherwise> - <td>${system.virtualInstance.uuid}</td> + + <c:forEach items="${system.entitlements}" var="entitlement"> + [${entitlement.humanReadableLabel}] + </c:forEach> + </c:otherwise> </c:choose> + </td> </tr> - </c:if> - <tr> - <th><bean:message key="sdc.details.overview.kernel"/></th> - <td> - <c:choose> - <c:when test="${system.runningKernel == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.runningKernel}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.sysid"/></th> - <td><c:out value="${system.id}" /></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.activationkey"/></th> - <td> - <c:forEach items="${activationKey}" var="key"> - <c:out value="${key.token}" /></br> - </c:forEach> - </td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.lockstatus"/></th> - <td> - <c:choose> - <c:when test="${serverLock != null}"> - <img style="float: left; margin-right: 10px" src="/img/rhn-icon-security.gif"/> - <bean:message key="sdc.details.overview.locked" - arg0="${serverLock.locker.login}" - arg1="${serverLock.reason}" /><br/> - <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> - </c:when> - <c:otherwise> - <img style="float: left; margin-right: 10px" src="/img/rhn-icon-unlocked.gif"/> - <bean:message key="sdc.details.overview.unlocked"/><br/> - <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </table> - </div> - <div style="width: 45%; float: right;"> - <h2><bean:message key="sdc.details.overview.sysevents"/></h2> - <table class="details"> - <tr> - <th><bean:message key="sdc.details.overview.checkedin"/></th> - <td><fmt:formatDate value="${system.lastCheckin}" type="both" dateStyle="short" timeStyle="long"/></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.registered"/></th> - <td><fmt:formatDate value="${system.created}" type="both" dateStyle="short" timeStyle="long"/></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.lastbooted"/></th> - <td><fmt:formatDate value="${system.lastBootAsDate}" type="both" dateStyle="short" timeStyle="long"/><br/> - <rhn:require acl="system_feature(ftr_reboot)" - mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> - </rhn:require> - </td> - </tr> - <rhn:require acl="client_capable(osad.ping); system_feature(ftr_osa_bus)" - mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> <tr> - <th><bean:message key="sdc.details.overview.osa.status"/></th> + <td><bean:message key="sdc.details.overview.notifications"/></td> <td> - <c:choose> - <c:when test="${system.pushClient != null}"> - <bean:message key="sdc.details.overview.osa.status.message" - arg0="${system.pushClient.state.name}"/> - <c:choose> - <c:when test="${system.pushClient.lastMessageTime != null}"> - <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.unknown" /><br/> - </c:otherwise> - </c:choose> - <c:if test="${system.pushClient.lastPingTime != null}"> - <bean:message key="sdc.details.overview.osa.status.lastping"/> - <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> - <br/> - </c:if> - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.unknown" /> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> + </c:when> + <c:otherwise> + + <c:forEach items="${prefs}" var="pref"> + <bean:message key="${pref}"/><br/> + </c:forEach> + + </c:otherwise> + </c:choose> + </td> + </tr> + <rhn:require acl="system_feature(ftr_errata_updates)" + mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + <tr> + <td><bean:message key="sdc.details.overview.errataupdate"/></td> + <td><c:choose> + <c:when test="${system.autoUpdate == 'Y'}"> + <bean:message key="yes"/> + </c:when> + <c:otherwise> + <bean:message key="no"/> + </c:otherwise> + </c:choose> </td> </tr> - </rhn:require> - <rhn:require acl="system_feature(ftr_satellite_applet); client_capable(rhn_applet.use_satellite)" - mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + </rhn:require> + <tr> + <td><bean:message key="sdc.details.overview.sysname"/></td> + <td><c:out value="${system.name}"/></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.description"/></td> + <td>${description}</td> + </tr> <tr> - <th><bean:message key="sdc.details.overview.applet"/></th> + <td><bean:message key="sdc.details.overview.location"/></td> <td> <c:choose> - <c:when test="${system.serverUuid == null}"> - <bean:message key="sdc.details.overview.applet.notactivated"/><br/> - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> + <c:when test="${not hasLocation}"> + <bean:message key="sdc.details.overview.location.none"/> </c:when> <c:otherwise> - <bean:message key="sdc.details.overview.applet.activated"/><br/> - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.reactivate"/></a> + <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> + <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> + <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> + <c:out value="${system.location.address1}"/><br/> + <c:out value="${system.location.address2}"/><br/> + <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> </c:otherwise> </c:choose> </td> </tr> - </rhn:require> - </table> + </table> + </div> </div> - <div style="width: 45%; float: right;"> - <h2><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h2> - <table class="details"> - <tr> - <th><bean:message key="sdc.details.overview.entitlement"/></th> - <td> - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${system.entitlements}" var="entitlement"> - [${entitlement.humanReadableLabel}] - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.notifications"/></th> - <td> - - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${prefs}" var="pref"> - <bean:message key="${pref}"/><br/> - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <rhn:require acl="system_feature(ftr_errata_updates)" - mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <tr> - <th><bean:message key="sdc.details.overview.errataupdate"/></th> - <td><c:choose> - <c:when test="${system.autoUpdate == 'Y'}"> - <bean:message key="yes"/> - </c:when> - <c:otherwise> - <bean:message key="no"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </rhn:require> - <tr> - <th><bean:message key="sdc.details.overview.sysname"/></th> - <td><c:out value="${system.name}"/></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.description"/></th> - <td>${description}</td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.location"/></th> - <td> + <rhn:require acl="client_capable(abrt.check);" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.crashes.application"/></h4> + </div> + <div class="panel-body"> + <table class="table"> <c:choose> - <c:when test="${not hasLocation}"> - <bean:message key="sdc.details.overview.location.none"/> + <c:when test="${system.crashCount == null}"> + <bean:message key="sdc.details.overview.crashes.nodata"/> </c:when> <c:otherwise> - <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> - <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> - <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> - <c:out value="${system.location.address1}"/><br/> - <c:out value="${system.location.address2}"/><br/> - <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> + <tr> + <td><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.lastreport"/></td> + <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> + </tr> + </c:otherwise> </c:choose> - </td> - </tr> - </table> - </div> - <rhn:require acl="client_capable(abrt.check);" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <div style="width: 45%; float: left;"> - <h2><bean:message key="sdc.details.overview.crashes.application"/></h2> - <table class="details"> - <c:choose> - <c:when test="${system.crashCount == null}"> - <bean:message key="sdc.details.overview.crashes.nodata"/> - </c:when> - <c:otherwise> - <tr> - <th><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></th> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></th> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> - </tr> - <tr> - <th><bean:message key="sdc.details.overview.crashes.lastreport"/></th> - <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> - </tr> - - </c:otherwise> - </c:choose> - </table> + </table> + </div> </div> </rhn:require> - <div style="clear: left; width: 45%; float: left; line-height: 200%"> - <h2><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h2> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h4> + </div> + <div class="panel-body"> + <c:if test="${system.baseChannel != null}"> + <ul class="channel-list"> + <li> + <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> + <c:if test="${baseChannel['is_fve'] == 'Y'}"> +  (Flex) + </c:if> + </li> - <c:if test="${system.baseChannel != null}"> - <ul class="channel-list"> - <li> - <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> - <c:if test="${baseChannel['is_fve'] == 'Y'}"> -  (Flex) - </c:if> - </li> + <c:forEach items="${childChannels}" var="childChannel"> + <li class="child-channel"> + <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> + <c:if test="${childChannel['is_fve'] == 'Y'}"> +  (Flex) + </c:if> + </li> + </c:forEach> - <c:forEach items="${childChannels}" var="childChannel"> - <li class="child-channel"> - <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> - <c:if test="${childChannel['is_fve'] == 'Y'}"> -  (Flex) + </ul> </c:if> - </li> - </c:forEach> - - </ul> - </c:if> + </div> </div> </body> </html:html> commit 8d57762bb5d1fb95da972fd1a994a1a6e8f6a39a Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 17:52:37 2013 +0200 margin classes created diff --git a/branding/css/theme.less b/branding/css/theme.less index 38dcb5e..30f32d8 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -238,4 +238,12 @@ h1 .icon-stack { border-color: #d4d4d4; padding: .2em .6em; border-radius: 4px +} + +//Margins to elements +.margin-bottom-xs { + margin-bottom: .5em; +} +.margin-bottom-md { + margin-bottom: 1em; } \ No newline at end of file commit 5c34dfff2188724f8e1c31a9e2529e91100ef16f Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 24 15:23:31 2013 +0200 replace a   with some padding diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 92acc81..e800faa 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -358,6 +358,9 @@ ul.nav.nav-tabs:last-child{ .make-md-column(3); .text-right; padding-right: 0; + .spacewalk-list-pagination-btns { + padding-left: 0.5em; + } } padding-top: 0.5em; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 0809ae4..2bbee74 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -579,7 +579,7 @@ public class ListDisplayTag extends ListDisplayTagBase { } private void appendButtons(JspWriter out) throws IOException { - out.println("<div class=\"list-navbuttons\">"); + out.println("<div class=\"spacewalk-list-pagination-btns btn-group\">"); boolean canGoForward = getPageList().getEnd() < getPageList() .getTotalSize(); @@ -602,7 +602,7 @@ public class ListDisplayTag extends ListDisplayTagBase { String text, boolean active) { HtmlTag ret = new HtmlTag("button"); ret.setAttribute("name", name); - String styleClass = String.format("btn btn-default %s", icon); + String styleClass = String.format("btn btn-default btn-xs %s", icon); if (!active) { styleClass += " disabled"; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 8cff5d8..665d4ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -569,7 +569,8 @@ public class ListTagUtil { if (links.size() == 0) { return; } - ListTagUtil.write(pageContext, "<div class=\"btn-group\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-pagination-btns btn-group\">"); for (int x = 0; x < linkNames.length; x++) { String[] linkData = (String[]) links.get(linkNames[x]); ListTagUtil.write(pageContext, "<button "); commit b992d19aa520d05bd29a9d34bd0ad3409a035ec5 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 24 15:22:56 2013 +0200 the half-table can't be removed as it determines how the footer message looks like. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp index c48acf4..0bef486 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp @@ -10,6 +10,7 @@ noDataText="${requestScope.inactiveSystemsEmpty}" formatMessage="false"> <rhn:listdisplay set="${requestScope.set}" + type="half-table" title="inactivelist.jsp.header" paging="false" reflink="/rhn/systems/Inactive.do" commit 3007754531c3cf0e5488a6eed7d132610effc073 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 24 15:22:27 2013 +0200 use the bootstrap classes, even if these spans do not feel right diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index a6c90b8..44bff1e 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -47,11 +47,11 @@ </rl:list> - <span class="full-width-note-left"> + <span class="pull-left text-right"> ${paginationMessage} </span> - <span class="full-width-note-right"> + <span class="pull-right text-right"> <a href="/rhn/systems/OutOfDate.do"> <bean:message key="yourrhn.jsp.allcriticalsystems" /> </a> commit d12c89897f1ee1ff6131a963ea8225c2d920465d Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 15:11:02 2013 +0200 Classes reorganized + responsive rules created diff --git a/branding/css/responsive-rules.less b/branding/css/responsive-rules.less new file mode 100644 index 0000000..8837d7a --- /dev/null +++ b/branding/css/responsive-rules.less @@ -0,0 +1,63 @@ +/* Rules to make it responsive */ +.aside-horizontal { + .spacewalk-main-column-layout aside { + margin-bottom: 1em; + padding-bottom: 0; + border-bottom: 1px solid #ccc + } +} +.sidenav-horizontal { + #sidenav{ + a:before { + content: ""; + margin: 0; + } + li { + display: inline-block; + border-bottom:0; + } + ul li:last-child, ul>ul li:last-child, ul>ul>ul li:last-child { + border-bottom: 0; + -moz-box-shadow: 0px 0px 0px; + -webkit-box-shadow: 0px 0px 0px; + box-shadow: 0px 0px 0px; + } + li.active > a, li.active > a:hover, ul li:hover, ul li a:hover { + color: @spacewalk-blue; + background: transparent; + } + /* first submenu */ + ul>ul li { + padding: 0 !important; + background: transparent; + border: 0px; + } + ul>ul { + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + background: @spacewalk-list-first-submenu; + padding: .2em 0; + } + ul>ul li.active, + ul>ul li.active:hover, + ul>ul li.active a, + ul>ul li.active a:hover { + background: transparent; + } + ul>ul li:hover, ul>ul li a:hover { + background: transparent; + color: @spacewalk-blue; + } + ul>ul li:last-child { + border-bottom: 0px; + } + } +} +@media (min-width: @screen-sm) and (max-width: @screen-sm-max) { + .sidenav-horizontal; + .aside-horizontal; +} +@media (max-width: @screen-xs-max) { + .sidenav-horizontal; + .aside-horizontal; +} \ No newline at end of file diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index ca19615..92acc81 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -13,6 +13,7 @@ @import url(tables.less); /* Import of the Theme */ @import url(theme.less); + /* basic layout */ .row-0 { .make-row(); @@ -115,7 +116,7 @@ p { padding-bottom: 9999px; /* erasing the predefined paddings in the columns */ padding-right: 0; - padding-left: 0; + padding-left: 0; } /* fixing margins in the 1st and last columns */ @@ -305,130 +306,11 @@ header { width: 100% } -/* systems selector */ -.spacewalk-bar a.button:first-of-type { - color: #ffffff; - background-color: #5bc0de; - border-color: #46b8da; - padding: .2em .6em; - border-radius: 4px; - margin: 0 .2em -} -.spacewalk-bar a.button:last-of-type { - color: #333; - background-color: #e2e2e2; - border-color: #d4d4d4; - padding: .2em .6em; - border-radius: 4px -} /* style for Menu in the left column */ .nav-stacked > li + li { margin-top: 0; } -#sidenav { - a { - color: #666; - .glow-text; - } - a:before { - content: "\f105 "; - font-family: 'FontAwesome'; - margin-right: .5em - } - li { - border-bottom: 1px solid #d8d8d8; - } - li.active > a, #sidenav li.active > a:hover { - color: @spacewalk-blue; - background: @spacewalk-list-menu-active; - } - li > a { - border-radius: 0 - } - ul li:last-child { - border-bottom: 1px solid #ccc; - -moz-box-shadow: 0px 1px 1px #fefefe; - -webkit-box-shadow: 0px 1px 1px #fefefe; - box-shadow: 0px 1px 1px #fefefe; - } - - /* ul-submenues */ - /* first submenu */ - ul>ul li { - padding: 0 0 0 1em !important; - margin: 0; - background: @spacewalk-list-first-submenu; - border-bottom: 1px solid #ccc; - } - ul>ul li.active, - ul>ul li.active:hover, - ul>ul li.active a, - ul>ul li.active a:hover { - background: @spacewalk-list-first-submenu-active; - .glow-text-deleted; - } - ul>ul li:hover, ul>ul li a:hover { - background: @spacewalk-list-first-submenu-hover; - } - ul>ul li:last-child { - border-bottom: 1px solid #c6c6c6; - } - /* second submenu */ - ul>ul>ul li { - padding: 0 0 0 1.5em !important; - margin: 0; - background: @spacewalk-list-second-submenu; - border-bottom: 1px solid #bbb; - } - ul>ul>ul li.active, - ul>ul>ul li.active:hover, - ul>ul>ul li.active a, - ul>ul>ul li.active a:hover { - background: @spacewalk-list-second-submenu-active; - .glow-text-deleted; - } - ul>ul>ul li:hover, ul>ul>ul li a:hover { - background: @spacewalk-list-second-submenu-hover; - } - ul>ul>ul li:last-child { - border-bottom: 1px solid #c4c4c4; - } -} - -aside ul > ul li { - list-style: none; - padding: 0 -} -aside .nav > li > a { - padding: .4em 1em -} - -/* TABLES */ -.table > thead > tr.active > th { - background: @gray-lighter; -} - -/* Icons Legend */ -aside .sideleg { - background: lighten(@gray-lighter, 10%); - width: 90%; - padding: .5em 1em; - border-radius: 4px; - margin: 2em auto; - font-size: 1em; - li { - list-style: none; - margin: 1em 0; - padding:0; - } - ul { - margin: 0; - padding: 0 - } -} - - /* login form */ #loginForm { border: 1px solid @gray-light; @@ -450,54 +332,6 @@ aside .sideleg { margin-bottom:2em; } - -/* question symbol for help pop up*/ -h1 .icon-stack .icon-question { - font-size: .6em; -} -h1 .icon-stack { - width: 1em; - height: 1em; - line-height: .7em; -} -.icon-stack .icon-stack-base.icon-circle { - font-size: .7em; - color: @spacewalk-blue; -} - -/* spacewalk toolbar */ -.spacewalk-toolbar-h1 { - margin-bottom: 1.5em; - .spacewalk-toolbar { - .pull-right; - padding: .5em 1em; - a { - border-right:1px solid @gray-light; - padding: 0 .5em - } - a:hover { - text-decoration: none; - } - a:last-child { - border-right:0 - } - } -} - -/* systems selected tool*/ -.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i { - cursor: pointer; -} -.spacewalk-bar i { - padding: 0 .3em; -} -#show-systems-bar { - padding: .5em 1.2em; - background: #fff; - border:1px solid #ccc; - border-radius: 0 0 4px 4px; -} - /* btn with margin top and bottom */ .btn.spacewalk-btn-margin-vertical{ margin: 1em 0 @@ -580,19 +414,6 @@ ul.nav.nav-tabs:last-child{ .pull-right; } - -.panel .panel-heading{ - h1, h2, h3, h4, h5, h6{ - padding: 0; - margin: 0; - } -} -.panel-body tr:first-child{ - td, th{ - border-top: 0; - } -} - // alerts .alert { margin: 18px 0; @@ -608,3 +429,9 @@ ul.nav.nav-tabs:last-child{ -moz-border-radius: 4px; border-radius: 4px; } + + + +// LEAVE THIS LINE AT THE END ALWAYS TO WARRANTY THE RESPONSIVE RULES REWRITE THE EXISTING STYLES +/* Responsive rules */ +@import url(responsive-rules.less); diff --git a/branding/css/tables.less b/branding/css/tables.less index ff9cde5..e067f73 100644 --- a/branding/css/tables.less +++ b/branding/css/tables.less @@ -1,3 +1,8 @@ +/* TABLES */ +.table > thead > tr.active > th { + background: @gray-lighter; +} + /* TABLES: GENERAL STYLE */ .table-rounded{ diff --git a/branding/css/theme.less b/branding/css/theme.less index ba34c3e..38dcb5e 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -32,7 +32,7 @@ } } -// Filter by system button besides the input search +// Filter by system: button besides the input search .spacewalk-button-filter{ border-left: 0; color: #666666; @@ -62,3 +62,180 @@ display: inline-block; border: 1px solid #dddddd; } + +/* Icons Legend */ +aside .sideleg { + background: lighten(@gray-lighter, 10%); + width: 90%; + padding: .5em 1em; + border-radius: 4px; + margin: 2em auto; + .hidden-sm; + .hidden-xs; + li { + list-style: none; + margin: 1em 0; + padding:0; + } + ul { + margin: 0; + padding: 0 + } +} + +//Menu in left column +aside ul > ul li { + list-style: none; + padding: 0 +} +aside .nav > li > a { + padding: .4em 1em +} +#sidenav { + a { + color: #666; + .glow-text; + } + a:before { + content: "\f105 "; + font-family: 'FontAwesome'; + margin-right: .5em + } + li { + border-bottom: 1px solid #d8d8d8; + } + li.active > a, #sidenav li.active > a:hover { + color: @spacewalk-blue; + background: @spacewalk-list-menu-active; + } + li > a { + border-radius: 0 + } + ul li:last-child { + border-bottom: 1px solid #ccc; + -moz-box-shadow: 0px 1px 1px #fefefe; + -webkit-box-shadow: 0px 1px 1px #fefefe; + box-shadow: 0px 1px 1px #fefefe; + } + + /* ul-submenues */ + /* first submenu */ + ul>ul li { + padding: 0 0 0 1em !important; + margin: 0; + background: @spacewalk-list-first-submenu; + border-bottom: 1px solid #ccc; + } + ul>ul li.active, + ul>ul li.active:hover, + ul>ul li.active a, + ul>ul li.active a:hover { + background: @spacewalk-list-first-submenu-active; + .glow-text-deleted; + } + ul>ul li:hover, ul>ul li a:hover { + background: @spacewalk-list-first-submenu-hover; + } + ul>ul li:last-child { + border-bottom: 1px solid #c6c6c6; + } + /* second submenu */ + ul>ul>ul li { + padding: 0 0 0 1.5em !important; + margin: 0; + background: @spacewalk-list-second-submenu; + border-bottom: 1px solid #bbb; + } + ul>ul>ul li.active, + ul>ul>ul li.active:hover, + ul>ul>ul li.active a, + ul>ul>ul li.active a:hover { + background: @spacewalk-list-second-submenu-active; + .glow-text-deleted; + } + ul>ul>ul li:hover, ul>ul>ul li a:hover { + background: @spacewalk-list-second-submenu-hover; + } + ul>ul>ul li:last-child { + border-bottom: 1px solid #c4c4c4; + } + +} + +/* question symbol for help pop up*/ +h1 .icon-stack .icon-question { + font-size: .6em; +} +h1 .icon-stack { + width: 1em; + height: 1em; + line-height: .7em; +} +.icon-stack .icon-stack-base.icon-circle { + font-size: .7em; + color: @spacewalk-blue; +} + +// Panels: reseting default margins and paddings in H tags +.panel .panel-heading{ + h1, h2, h3, h4, h5, h6{ + padding: 0; + margin: 0; + } +} +//Panels: deleting border-top in the first row of a table contained within a Panel class +.panel-body tr:first-child{ + td, th{ + border-top: 0; + } +} + +/* systems selected tool*/ +.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i { + cursor: pointer; +} +.spacewalk-bar i { + padding: 0 .3em; +} +#show-systems-bar { + padding: .5em 1.2em; + background: #fff; + border:1px solid #ccc; + border-radius: 0 0 4px 4px; +} + +/* spacewalk toolbar: contains the H1 of each page + the toolbar */ +.spacewalk-toolbar-h1 { + margin-bottom: 1.5em; + .spacewalk-toolbar { + .pull-right; + padding: .5em 1em; + a { + border-right:1px solid @gray-light; + padding: 0 .5em + } + a:hover { + text-decoration: none; + } + a:last-child { + border-right:0 + } + } +} + +/* systems selected manager */ +.spacewalk-bar a.button:first-of-type { + color: #ffffff; + background-color: #5bc0de; + border-color: #46b8da; + padding: .2em .6em; + border-radius: 4px; + margin: 0 .2em +} +.spacewalk-bar a.button:last-of-type { + color: #333; + background-color: #e2e2e2; + border-color: #d4d4d4; + padding: .2em .6em; + border-radius: 4px +} \ No newline at end of file

1 0

java/code
by Michael Mraka 25 Oct '13

25 Oct '13

java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 314dbff905b05b4bcf465a2ca9d86d80eadf4406 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 25 13:54:06 2013 +0200 1007521 - synchronize repo entries creation so two concurent threads can't try to insert same date into table addressing com.redhat.rhn.common.db.ConstraintViolationException: ORA-00001: unique constraint (RHNSAT.RHNPACKAGEREPODATA_PK) violated diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index 9c86620..312c8ed 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -1188,7 +1188,7 @@ public class PackageManager extends BaseManager { * Create all repoentries for a channel's packages if needed * @param cid the channel id */ - public static void createRepoEntrys(Long cid) { + public synchronized static void createRepoEntrys(Long cid) { Map params = new HashMap(); params.put("cid", cid); try {

1 0

Changes to 'refs/tags/spacewalk-java-2.1.62-1'
by Tomas Lestach 24 Oct '13

24 Oct '13

Tag 'spacewalk-java-2.1.62-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-10-24 15:56 +0000 Tagging package [spacewalk-java] version [2.1.62-1] in directory [java/]. Changes since spacewalk-schema-2.1.24-1: Matej Kollar (8): 1020952 - SSL for Postgresql: Java (rhn-search) Unchecked conversion removed in rhnsearch Removed unchecked conversion Put JDBC connect string creation into ConfigDefaults Removed redundant code from ConnectionManager Removed redundant code from SchedulerKernel 1020952 - SSL for Postgresql: Java (WebUI, Tascomatic) 1020952 - SSL for Postgresql: Java (Perl DBI) Tomas Lestach (3): 1013672 - let errata.getDetails API return errata id 1011856 - detect max lengths at repo creation Automatic commit of package [spacewalk-java] release [2.1.62-1]. --- java/code/src/com/redhat/rhn/common/conf/Config.java | 6 java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 69 ++++++++++ java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 26 --- java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 1 java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 30 ---- java/conf/rhn_java.conf | 3 java/spacewalk-java.spec | 11 + rel-eng/packages/spacewalk-java | 2 search-server/spacewalk-search/build.xml | 5 search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java | 12 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 31 +++- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java | 2 web/modules/rhn/RHN/DBI.pm | 6 22 files changed, 149 insertions(+), 85 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 24 Oct '13

24 Oct '13

java/spacewalk-java.spec | 11 ++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) New commits: commit 9a3bfed9d4071304747bb8c37e1cd8435ffb019c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 24 17:56:56 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.62-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 16fc52c..5c770a9 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.61 +Version: 2.1.62 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,15 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 24 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.62-1 +- 1011856 - detect max lengths at repo creation +- 1020952 - SSL for Postgresql: Java (WebUI, Tascomatic) +- Removed redundant code from SchedulerKernel +- Removed redundant code from ConnectionManager +- Put JDBC connect string creation into ConfigDefaults +- Removed unchecked conversion +- 1013672 - let errata.getDetails API return errata id + * Thu Oct 24 2013 Jan Dobes 2.1.61-1 - 1015747 - resources - 1015747 - page handling diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 79447bb..0cc39bc 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.61-1 java/ +2.1.62-1 java/

1 0

java/code
by Tomas Lestach 24 Oct '13

24 Oct '13

java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit ee753d84dab712ca9615eef07f72cf1ee54ebced Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 24 17:22:39 2013 +0200 1011856 - detect max lengths at repo creation diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd index 46a630b..d5f93bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd @@ -7,12 +7,14 @@ <attribute name="label"> <simpleType baseType="string"> <minLength value="1" /> + <maxLength value="64" /> </simpleType> </attribute> <attribute name="url"> <simpleType baseType="string"> <minLength value="1" /> + <maxLength value="512" /> </simpleType> </attribute> -</schema> \ No newline at end of file +</schema>

1 0

web/modules
by mkollar 24 Oct '13

24 Oct '13

web/modules/rhn/RHN/DBI.pm | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit bc89a7d2b00da730b1655606622ff61dfe789a8a Author: Matej Kollar <mkollar(a)redhat.com> Date: Wed Oct 23 14:35:14 2013 +0200 1020952 - SSL for Postgresql: Java (Perl DBI) diff --git a/web/modules/rhn/RHN/DBI.pm b/web/modules/rhn/RHN/DBI.pm index c47a369..d49873f 100644 --- a/web/modules/rhn/RHN/DBI.pm +++ b/web/modules/rhn/RHN/DBI.pm @@ -54,6 +54,12 @@ sub _get_dbi_connect_parameters { if (defined $port and $port ne '' and $port ne '5432') { $DSN .= ";port=$port"; } + my sslmode = PXT::Config->get("db_sslmode"); + if (defined $sslmode and $sslmode eq "verify-full") { + $DSN .= ";sslmode=verify-full"; + } elsif (defined $sslmode) { + die "Unsuported value for db_sslmode. Only 'verify-full' is supported.\n"; + } } } $LOGIN = PXT::Config->get("db_user");

1 0

5 commits - java/code java/conf
by mkollar 24 Oct '13

24 Oct '13

java/code/src/com/redhat/rhn/common/conf/Config.java | 6 java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 69 ++++++++++ java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 26 --- java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 30 ---- java/conf/rhn_java.conf | 3 5 files changed, 81 insertions(+), 53 deletions(-) New commits: commit f04c975fc675e4eaa5d6535a2049f7e10abf8760 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 22 19:43:31 2013 +0200 1020952 - SSL for Postgresql: Java (WebUI, Tascomatic) diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index d20b618..c847f32 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -145,9 +145,12 @@ public class ConfigDefaults { public static final String DB_NAME = "db_name"; public static final String DB_HOST = "db_host"; public static final String DB_PORT = "db_port"; + public static final String DB_SSLMODE = "db_sslmode"; public static final String DB_PROTO = "hibernate.connection.driver_proto"; public static final String DB_CLASS = "hibernate.connection.driver_class"; + public static final String SSL_TRUSTSTORE = "java.ssl_truststore"; + public static final String LOOKUP_EXCEPT_SEND_EMAIL = "lookup_exception_email"; public static final String KS_PARTITION_DEFAULT = "kickstart.partition.default"; @@ -530,6 +533,16 @@ public class ConfigDefaults { return DB_BACKEND_POSTGRESQL.equals(Config.get().getString(DB_BACKEND)); } + private void setSslTrustStore() throws ConfigException { + String trustStore = Config.get().getString(SSL_TRUSTSTORE); + if (trustStore == null || !new File(trustStore).isFile()) { + throw new ConfigException("Can not find java truststore at " + + trustStore + ". Path can be changed with " + + SSL_TRUSTSTORE + " option."); + } + System.setProperty("javax.net.ssl.trustStore", trustStore); + } + /** * Constructs JDBC connection string based on configuration, checks for * some basic sanity. @@ -551,6 +564,11 @@ public class ConfigDefaults { connectionUrl += dbHost + ":" + dbPort + ":"; } connectionUrl += dbName; + + if (dbSslmode != null) { + throw new ConfigException( + "Option sslmode is not supported for Oracle database backend"); + } } else if (isPostgresql()) { connectionUrl = dbProto + ":"; @@ -562,6 +580,17 @@ public class ConfigDefaults { connectionUrl += "/"; } connectionUrl += dbName; + + if (dbSslmode != null && dbSslmode.equals("verify-full")) { + connectionUrl += "?ssl=true"; + setSslTrustStore(); + } + else if (dbSslmode != null) { + throw new ConfigException("Unsuported value for " + + DB_SSLMODE + + ". Only 'verify-full' is supported."); + } + } else { throw new ConfigException( diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf index 839c27b..d603442 100644 --- a/java/conf/rhn_java.conf +++ b/java/conf/rhn_java.conf @@ -77,3 +77,6 @@ java.sc_enh = 1 # how many workers should generate channels metadata concurently java.taskomatic_channel_repodata_workers = 1 + +# path to ssl TrustStore +java.ssl_truststore = /etc/rhn/javatruststore.jks commit e99906651bb176b3f833409bbd649aee88d70666 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 21 19:39:41 2013 +0200 Removed redundant code from SchedulerKernel ... was moved to ConfigDefaults. diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java index c4dd86b..71a5574 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java +++ b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java @@ -62,10 +62,8 @@ public class SchedulerKernel { */ public SchedulerKernel() throws InstantiationException, UnknownHostException { Properties props = Config.get().getNamespaceProperties("org.quartz"); - String dbName = Config.get().getString(ConfigDefaults.DB_NAME); String dbUser = Config.get().getString(ConfigDefaults.DB_USER); String dbPass = Config.get().getString(ConfigDefaults.DB_PASSWORD); - String dbProto = Config.get().getString(ConfigDefaults.DB_PROTO); props.setProperty(dataSourceConfigPath, defaultDataSource); String ds = dataSourcePrefix + "." + defaultDataSource; props.setProperty(ds + ".user", dbUser); @@ -79,15 +77,7 @@ public class SchedulerKernel { String driver = Config.get().getString(ConfigDefaults.DB_CLASS, "oracle.jdbc.driver.OracleDriver"); props.setProperty(ds + ".driver", driver); - - String dbUrl = dbProto + ":@"; - if (dbProto.contains("thin")) { - String dbHost = Config.get().getString(ConfigDefaults.DB_HOST); - String dbPort = Config.get().getString(ConfigDefaults.DB_PORT); - dbUrl += dbHost + ":" + dbPort + ":"; - } - dbUrl += dbName; - props.setProperty(ds + ".URL", dbUrl); + props.setProperty(ds + ".URL", ConfigDefaults.get().getJdbcConnectionString()); } else if (ConfigDefaults.get().isPostgresql()) { props.setProperty("org.quartz.jobStore.driverDelegateClass", @@ -96,23 +86,11 @@ public class SchedulerKernel { String driver = Config.get().getString(ConfigDefaults.DB_CLASS, "org.postgresql.Driver"); props.setProperty(ds + ".driver", driver); - - String connectionUrl = Config.get().getString( - ConfigDefaults.DB_PROTO) + - ":"; - String dbHost = Config.get().getString(ConfigDefaults.DB_HOST); - String dbPort = Config.get().getString(ConfigDefaults.DB_PORT); - if (dbHost != null && dbHost.length() > 0) { - connectionUrl += "//" + dbHost; - if (dbPort != null && dbPort.length() > 0) { - connectionUrl += ":" + dbPort; - } - connectionUrl += "/"; - } - connectionUrl += dbName; - props.setProperty(ds + ".URL", connectionUrl); + props.setProperty(ds + ".URL", ConfigDefaults.get().getJdbcConnectionString()); } else { + // This code should never get called as Exception would get + // thrown in getJdbcConnectionString. throw new InstantiationException( "Unknown db backend set, expecting oracle or postgresql"); } commit 0455656ca4c385f85d641ff53a0ad65129eb50a0 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 21 19:37:15 2013 +0200 Removed redundant code from ConnectionManager ... was moved to ConfigDefaults. diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java index c059e1a..b5580a8 100644 --- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java +++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java @@ -169,29 +169,9 @@ class ConnectionManager { hibProperties.put("hibernate.connection.password", Config.get() .getString(ConfigDefaults.DB_PASSWORD)); - String connectionUrl = - Config.get().getString(ConfigDefaults.DB_PROTO) + ":"; - String dbName = Config.get().getString(ConfigDefaults.DB_NAME); - String dbHost = Config.get().getString(ConfigDefaults.DB_HOST); - String dbPort = Config.get().getString(ConfigDefaults.DB_PORT); - - if (ConfigDefaults.get().isOracle() && connectionUrl.contains("thin")) { - connectionUrl += "@" + dbHost + ":" + dbPort + ":" + dbName; - } - else if (ConfigDefaults.get().isOracle()) { - connectionUrl += "@" + dbName; - } - else { - if (dbHost != null && dbHost.length() > 0) { - connectionUrl += "//" + dbHost; - if (dbPort != null && dbPort.length() > 0) { - connectionUrl += ":" + dbPort; - } - connectionUrl += "/"; - } - connectionUrl += dbName; - } - hibProperties.put("hibernate.connection.url", connectionUrl); + + hibProperties.put("hibernate.connection.url", + ConfigDefaults.get().getJdbcConnectionString()); config.addProperties(hibProperties); // Force the use of our txn factory commit 72fdd663221f09de51358eb64d0da7222e708b9e Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 21 18:31:33 2013 +0200 Put JDBC connect string creation into ConfigDefaults diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 8ed6b38..d20b618 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -531,6 +531,46 @@ public class ConfigDefaults { } /** + * Constructs JDBC connection string based on configuration, checks for + * some basic sanity. + * @return JDBC connection string + * @throws ConfigException if unknown database backend is set, + */ + public String getJdbcConnectionString() throws ConfigException { + String dbName = Config.get().getString(DB_NAME); + String dbHost = Config.get().getString(DB_HOST); + String dbPort = Config.get().getString(DB_PORT); + String dbProto = Config.get().getString(DB_PROTO); + String dbSslmode = Config.get().getString(DB_SSLMODE); + + String connectionUrl; + + if (isOracle()) { + connectionUrl = dbProto + ":@"; + if (dbProto.contains("thin")) { + connectionUrl += dbHost + ":" + dbPort + ":"; + } + connectionUrl += dbName; + } + else if (isPostgresql()) { + connectionUrl = dbProto + ":"; + if (dbHost != null && dbHost.length() > 0) { + connectionUrl += "//" + dbHost; + if (dbPort != null && dbPort.length() > 0) { + connectionUrl += ":" + dbPort; + } + connectionUrl += "/"; + } + connectionUrl += dbName; + } + else { + throw new ConfigException( + "Unknown db backend set, expecting oracle or postgresql"); + } + return connectionUrl; + } + + /** * is documentation available * @return true if so */ commit 2e74a5109f609ce56bd7c9a35d57e12dc6c875bd Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 21 18:29:43 2013 +0200 Removed unchecked conversion com/redhat/rhn/common/conf/Config.java:85: warning: [unchecked] unchecked conversion found : <anonymous java.util.Comparator> required: java.util.Comparator<? super java.io.File> private final TreeSet<File> fileList = new TreeSet<File>(new Comparator() { diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index 82359a7..11573bf 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -82,18 +82,16 @@ public class Config { /** hash of configuration properties */ private final Properties configValues = new Properties(); /** set of configuration file names */ - private final TreeSet<File> fileList = new TreeSet<File>(new Comparator() { + private final TreeSet<File> fileList = new TreeSet<File>(new Comparator<File>() { /** {inheritDoc} */ - public int compare(Object o1, Object o2) { + public int compare(File f1, File f2) { // Need to make sure we read the child namespace before the base // namespace. To do that, we sort the list in reverse order based // on the length of the file name. If two filenames have the same // length, then we need to do a lexigraphical comparison to make // sure that the filenames themselves are different. - File f1 = (File) o1; - File f2 = (File) o2; int lenDif = f2.getAbsolutePath().length() - f1.getAbsolutePath().length(); if (lenDif != 0) {

1 0

java/code
by Tomas Lestach 24 Oct '13

24 Oct '13

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 1 + 1 file changed, 1 insertion(+) New commits: commit b5bf577e61de27a1d88b7612a515a6496db95317 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 24 14:55:21 2013 +0200 1013672 - let errata.getDetails API return errata id diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java index 5d961f6..b0e7a99 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -221,6 +221,7 @@ public class ErrataHandler extends BaseHandler { Map errataMap = new HashMap(); + errataMap.put("id", errata.getId()); if (errata.getIssueDate() != null) { errataMap.put("issue_date", LocalizationService.getInstance()

1 0

2 commits - search-server/spacewalk-search
by mkollar 24 Oct '13

24 Oct '13

search-server/spacewalk-search/build.xml | 5 + search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java | 12 +-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 31 +++++++--- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java | 4 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 4 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 4 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 6 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java | 2 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java | 2 12 files changed, 47 insertions(+), 29 deletions(-) New commits: commit 3702f261e2cb90fff66f9af9d62a2728529e6ebc Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 24 14:23:12 2013 +0200 Unchecked conversion removed in rhnsearch Also change in build so in future this will be enforced by compiler. diff --git a/search-server/spacewalk-search/build.xml b/search-server/spacewalk-search/build.xml index 70c7717..b830a0d 100644 --- a/search-server/spacewalk-search/build.xml +++ b/search-server/spacewalk-search/build.xml @@ -157,7 +157,10 @@ destdir="${build.dir}" deprecation="on" excludesfile="buildconf/exclude" - debug="on" /> + debug="on"> + <compilerarg value="-Xlint:unchecked" /> + <compilerarg value="-Werror" /> + </javac> <copy todir="${build.dir}/com/redhat/satellite/search/db"> <fileset dir="${config.src.dir}/com/redhat/satellite/search/db/"> <include name="*.xml" /> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java index 562ce09..9e1c2a1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java @@ -96,18 +96,16 @@ public class Configuration { private List<KeyTranslator> translators; /** set of configuration file names */ - private TreeSet<File> fileList = new TreeSet<File>(new Comparator() { + private TreeSet<File> fileList = new TreeSet<File>(new Comparator<File>() { /** {inheritDoc} */ - public int compare(Object o1, Object o2) { + public int compare(File f1, File f2) { // Need to make sure we read the child namespace before the base // namespace. To do that, we sort the list in reverse order based // on the length of the file name. If two filenames have the same // length, then we need to do a lexigraphical comparison to make // sure that the filenames themselves are different. - File f1 = (File) o1; - File f2 = (File) o2; int lenDif = f2.getAbsolutePath().length() - f1.getAbsolutePath().length(); if (lenDif != 0) { @@ -226,7 +224,7 @@ public class Configuration { */ public Map<String, String> getMap(String name) { String value = getString(name); - Map retval = null; + Map<String,String> retval = null; if (value != null) { retval = new HashMap<String, String>(); String[] pairs = value.split(","); @@ -365,8 +363,8 @@ public class Configuration { * @param name config entry name * @return instance of java.util.List populated with config values */ - public List getList(String name) { - List retval = new LinkedList(); + public List<String> getList(String name) { + List<String> retval = new LinkedList<String>(); String[] vals = getStringArray(name); if (vals != null) { retval.addAll(Arrays.asList(vals)); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java index 85bac6c..ce409bd 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java @@ -36,7 +36,7 @@ public class MatchingField { protected Document doc; protected Object[] terms; protected String query; - protected Map needNumberToolsAdjust; + protected Map<String, Boolean> needNumberToolsAdjust; /** * @@ -53,7 +53,7 @@ public class MatchingField { else { terms = new Term[0]; } - needNumberToolsAdjust = new HashMap(); + needNumberToolsAdjust = new HashMap<String, Boolean>(); needNumberToolsAdjust.put("cpuMHz", true); needNumberToolsAdjust.put("cpuBogoMIPS", true); needNumberToolsAdjust.put("cpuMHz", true); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java index 15a41be..376de7f 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java @@ -145,7 +145,7 @@ public class DatabaseHandler { index = index + delim.length() - 1; // We want to be pointed to end of location of // delim String[] temps = queryIn.substring(index + delim.length() - 1, indexB).split(","); - Map params = new HashMap<String, String>(); + Map<String, Object> params = new HashMap<String, Object>(); for (int i = 0; i < temps.length; i++) { params.put("param" + new Integer(i).toString(), temps[i].trim()); } @@ -164,7 +164,7 @@ public class DatabaseHandler { throws SQLException, SqlMapException { // Look up Query in DB args.put("sessionId", sessionId); - Query query = databaseManager.getQuery(queryName); + Query<Result> query = databaseManager.getQuery(queryName); List<Result> retval; try { retval = query.loadList(args); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 8f856ea..26c26f7 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -196,7 +196,7 @@ public class IndexHandler { if (log.isDebugEnabled()) { log.debug("NO HITS FOUND"); } - return Collections.EMPTY_LIST; + return Collections.<Result>emptyList(); } List<Long> ids = new ArrayList<Long>(); for (Result pr : hits) { @@ -219,7 +219,7 @@ public class IndexHandler { return hits; } - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("session_id", sessionId); params.put("id_list", ids); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java index 1c4d382..f997ed8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java @@ -105,7 +105,7 @@ public abstract class GenericIndexTask implements Job { WriteQuery insertQuery = databaseManager.getWriterQuery(getQueryCreateLastRecord()); try { - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", sid); params.put("last_modified", Calendar.getInstance().getTime()); @@ -180,7 +180,7 @@ public abstract class GenericIndexTask implements Job { Query<GenericRecord> srvrQuery = databaseManager.getQuery( getQueryRecordsToIndex()); try { - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", sid); params.put("last_modified", lastRun); log.info("GenericIndexTask<" + super.getClass().toString() + @@ -216,7 +216,7 @@ public abstract class GenericIndexTask implements Job { log.info("Skipping the handleDeletedRecords() method"); return 0; } - idSet = new HashSet(); + idSet = new HashSet<String>(); for (Long num : ids) { idSet.add(num.toString()); } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java index 0eb2d47..69d8999 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java @@ -92,7 +92,7 @@ public class IndexErrataTask implements Job { WriteQuery insertQuery = databaseManager.getWriterQuery("createLastErrata"); try { - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", eid); params.put("last_modified", Calendar.getInstance().getTime()); if (updateQuery.update(params) == 0) { diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java index 7d81691..6434c2d 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java @@ -116,7 +116,7 @@ public class IndexPackagesTask implements Job { WriteQuery updateQuery = databaseManager.getWriterQuery("updateLastPackage"); WriteQuery insertQuery = databaseManager.getWriterQuery("createLastPackage"); try { - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", packageId); params.put("last_modified", Calendar.getInstance().getTime()); if (updateQuery.update(params) == 0) { diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java index f9236c2..32d7af8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java @@ -60,7 +60,7 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { log.info("Skipping the handleDeletedRecords() method"); return 0; } - idSet = new HashSet(); + idSet = new HashSet<String>(); for (ServerCustomInfo scInfo : ids) { idSet.add(scInfo.getUniqId()); } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java index ba27ac2..f729d7e 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java @@ -53,7 +53,7 @@ public class IndexErrataTaskTest extends BaseTestCase { DatabaseManager databaseManager = (DatabaseManager) container.getComponentInstanceOfType(DatabaseManager.class); WriteQuery updateQuery = databaseManager.getWriterQuery("updateLastErrata"); - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", 0L); params.put("last_modified", new Date(0)); updateQuery.update(params); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java index b8e35dd..252b113 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java @@ -53,7 +53,7 @@ public class IndexSystemsTaskTest extends BaseTestCase { DatabaseManager databaseManager = (DatabaseManager) container.getComponentInstanceOfType(DatabaseManager.class); WriteQuery updateQuery = databaseManager.getWriterQuery("updateLastServer"); - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("id", 0L); params.put("last_modified", new Date(0)); updateQuery.update(params); commit b59805075c45e0d03156b48d76c4e9fb9b4c46d9 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 21 22:46:25 2013 +0200 1020952 - SSL for Postgresql: Java (rhn-search) diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index e68d9c9..269b3ed 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -15,6 +15,7 @@ package com.redhat.satellite.search.db; +import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; @@ -26,6 +27,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; import com.ibatis.sqlmap.client.SqlMapSession; import com.redhat.satellite.search.config.Configuration; +import com.redhat.satellite.search.config.ConfigException; /** * Manages DB activity - connections, running queries, etc @@ -67,13 +69,28 @@ public class DatabaseManager { if (config.getString("db_backend").equals("oracle")) { overrides.setProperty("db_name", "@" + overrides.getProperty("db_name")); } else { - String db_host = config.getString("db_host"); - String db_port = config.getString("db_port"); - if (db_host != null && db_host.length() > 0) { - if (db_port != null && db_port.length() > 0) { - overrides.setProperty("db_name", "//" + db_host + ":" + db_port + "/" + overrides.getProperty("db_name")); - } else { - overrides.setProperty("db_name", "//" + db_host + "/" + overrides.getProperty("db_name")); + String dbHost = config.getString("db_host"); + String dbPort = config.getString("db_port"); + if (dbHost != null && dbHost.length() > 0) { + String connectionUrl = "//" + dbHost; + if (dbPort != null && dbPort.length() > 0) { + connectionUrl += ":" + dbPort; + } + connectionUrl += "/" + overrides.getProperty("db_name"); + + String sslmode = config.getString("db_sslmode"); + if (sslmode != null && sslmode.equals("verify-full")) { + connectionUrl += "?ssl=true"; + String trustStore = config.getString("java.ssl_truststore"); + if (trustStore == null || ! new File(trustStore).isFile()) { + throw new ConfigException("Can not find java truststore at " + + trustStore + ". Path can be changed with java.ssl_truststore option."); + } + System.setProperty("javax.net.ssl.trustStore", trustStore); + } + else if (sslmode != null) { + throw new ConfigException( + "Unsuported value for db_sslmode. Only 'verify-full' is supported."); } } }

1 0

Branch 'bootstrap-css' - 56 commits - branding/css branding/spacewalk-branding.spec branding/templates java/code web/html web/modules
by Silvio Moioli 24 Oct '13

24 Oct '13

branding/css/spacewalk.less | 131 ++ branding/css/tables.less | 6 branding/css/theme.less | 20 branding/spacewalk-branding.spec | 6 branding/templates/header.pxt | 3 java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java | 27 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 541 ++------- java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 338 ++++++ java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java | 5 java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java | 322 ----- java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java | 7 java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 336 ++++- java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 22 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java | 62 + java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java | 76 + java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 18 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java | 18 java/code/webapp/WEB-INF/decorators/layout_c.jsp | 2 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 2 java/code/webapp/WEB-INF/includes/footer.jsp | 7 java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 6 java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 10 java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 6 java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 24 java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 26 java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 20 java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 30 java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 180 +-- java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 69 - java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 51 java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 234 ++-- java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 96 - java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 60 - java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp | 3 java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 60 - java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 18 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 142 +- java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 156 +- java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp | 44 java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 68 - java/code/webapp/WEB-INF/pages/channel/all.jsp | 4 java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 561 +++++----- java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 362 +++--- java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 12 java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 14 java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 java/code/webapp/WEB-INF/pages/channel/popular.jsp | 11 java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf | 28 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 15 java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf | 42 java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 96 - java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 9 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 352 +++--- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf | 77 - java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf | 86 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 16 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 224 ++- java/code/webapp/WEB-INF/pages/common/login.jsp | 5 java/code/webapp/WEB-INF/pages/common/relogin.jsp | 5 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 9 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 11 java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 214 +-- java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 6 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 79 - java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 78 - java/code/webapp/WEB-INF/pages/errata/create.jsp | 319 ++--- java/code/webapp/WEB-INF/pages/errata/edit.jsp | 464 ++++---- java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 99 + java/code/webapp/WEB-INF/pages/errata/published.jsp | 2 java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 14 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 64 - java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 36 java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp | 36 java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 11 java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 9 java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 16 java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 53 java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp | 50 java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 44 java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 32 java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 44 java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf | 173 +-- java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 9 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 22 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 54 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 24 java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 9 java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 5 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 6 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 4 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 49 java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp | 5 web/html/javascript/check_all.js | 234 ---- web/html/javascript/display.js | 10 web/html/javascript/focus.js | 10 web/html/javascript/images.js | 24 web/html/javascript/spacewalk-checkall.js | 232 ++++ web/html/javascript/spacewalk-essentials.js | 4 web/html/javascript/spacewalk-images.js | 24 web/html/javascript/spacewalk-login.js | 26 web/modules/sniglets/Sniglets/ListView/Style.pm | 1 web/modules/sniglets/Sniglets/Servers.pm | 2 111 files changed, 4093 insertions(+), 3738 deletions(-) New commits: commit 6318f88adfa18558b21363f337f856585adf5bf3 Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 24 14:24:21 2013 +0200 Add the missing fonts directory with all its content diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index e35f77e..ada7b41 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -51,6 +51,7 @@ install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/ install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults cp -p css/*.css %{buildroot}/%{_var}/www/html/css +cp -pR fonts %{buildroot}/%{_var}/www/html/ cp -pR img %{buildroot}/%{_var}/www/html/ # Appplication expects two favicon's for some reason, copy it so there's just # one in source: @@ -69,6 +70,8 @@ rm -rf %{buildroot} %files %dir %{_var}/www/html/css %{_var}/www/html/css/* +%dir %{_var}/www/html/fonts +%{_var}/www/html/fonts/* %dir /%{_var}/www/html/img %{_var}/www/html/img/* %{_var}/www/html/favicon.ico commit 0924647eb16bad03b9c3479761eac1a0eff40aa9 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Oct 24 14:09:34 2013 +0200 TB3: Channels/channel details presentation form diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index f297317..0f24fec 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -5,258 +5,315 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> -<body> -<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> -<BR> +<html:html> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> + <html:form action="/channels/ChannelDetail" styleClass="form-horizontal"> + <rhn:csrf /> + <div class="panel panel-default"> + <div class="panel-heading"> + <h2><bean:message key="channel.edit.jsp.basicchanneldetails"/></h2> + </div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.name"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.name}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.label"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.label}"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.parentchannel"/> + </label> + <div class="col-lg-6"> + <c:if test="${empty channel.parentChannel}"> + (none) + </c:if> + <c:if test="${!empty channel.parentChannel}"> + <a class="btn btn-info" href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}"> + <c:out value="${channel.parentChannel.name}" /> <i class="fa fa-arrow-right"></i> + </a> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.checksum"/> + </label> + <div class="col-lg-6"> + <c:if test="${empty channel.checksumType}"> + (none) + </c:if> + <c:if test="${!empty channel.checksumType}"> + <c:out value="${channel.checksumType}" /> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="packagelist.jsp.packagearch"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.channelArch.name}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.summary"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.summary}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="details.jsp.description"/> + </label> + <div class="col-lg-6"> + <c:if test="${empty channel.description}"> + (none) + </c:if> + <c:if test="${!empty channel.description}"> + <c:out value="${channel.description}" /> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.chanent"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.channelFamily.name}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channelfiles.jsp.lastmod"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel_last_modified}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.repolastbuild"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${repo_last_build != null}"> + <c:out value="${repo_last_build}" /> + </c:when> + <c:otherwise> + (none) + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.repodata"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${repo_status == null}"> + (none) + </c:when> + <c:when test="${repo_status == true}"> + <bean:message key="channel.jsp.repodata.inProgress"/> + </c:when> + <c:when test="${repo_status == false && repo_last_build != null}"> + <bean:message key="channel.jsp.repodata.completed"/> + </c:when> + <c:otherwise> + (none) + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="header.jsp.packages"/> + </label> + <div class="col-lg-6"> + <a class="btn btn-info" href="/rhn/channels/ChannelPackages.do?cid=${channel.id}"> + ${pack_size} <i class="fa fa-arrow-right"></i> + </a> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.perusersub"/> + </label> + <div class="col-lg-6"> + <div class="checkbox"> + <label> + <c:choose> + <c:when test="${has_access}"> + <html:radio property="global" value="all" /> + </c:when> + <c:otherwise> + <html:radio property="global" value="all" disabled="true"/> + </c:otherwise> + </c:choose> + <bean:message key="channel.edit.jsp.allusers"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <c:choose> + <c:when test="${has_access == true}"> + <html:radio property="global" value="selected" /> + </c:when> + <c:otherwise> + <html:radio property="global" value="selected" disabled="true"/> + </c:otherwise> + </c:choose> + <bean:message key="channel.edit.jsp.selectedusers"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.jsp.systemssubsribed"/> + </label> + <div class="col-lg-6"> + <a class="btn btn-info" href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}"> + ${systems_subscribed} <i class="fa fa-arrow-right"></i> + </a> + </div> + </div> + </div> + </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h2><bean:message key="channel.edit.jsp.contactsupportinfo"/></h2> + </div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.maintainername"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.maintainerName}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.maintainercontactinfo"/> + </label> + <div class="col-lg-6"> + <div class="input-group"> + <span class="input-group-addon"> + <bean:message key="channel.edit.jsp.emailaddress"/> + </span> + <div class="form-control"> + <c:out value="${channel.maintainerEmail}" /> + </div> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="input-group"> + <span class="input-group-addon"> + <bean:message key="channel.edit.jsp.phonenumber"/> + </span> + <div class="form-control"> + <c:out value="${channel.maintainerPhone}" /> + </div> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.supportpolicy"/> + </label> + <div class="col-lg-6"> + <c:out value="${channel.supportPolicy}" /> + </div> + </div> + </div> + </div> -<h2><bean:message key="channel.edit.jsp.basicchanneldetails"/></h2> + <div class="panel panel-default"> + <div class="panel-heading"> + <h2><bean:message key="channel.edit.jsp.security.gpg"/></h2> + </div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.gpgkeyurl"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${channel.GPGKeyUrl != null}"> + <c:out value="${channel.GPGKeyUrl}" /> + </c:when> + <c:otherwise> + (none entered) + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.gpgkeyid"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${channel.GPGKeyId != null}"> + <c:out value="${channel.GPGKeyId}" /> + </c:when> + <c:otherwise> + (none entered) + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.gpgkeyfingerprint"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${channel.GPGKeyFp != null}"> + <c:out value="${channel.GPGKeyFp}" /> + </c:when> + <c:otherwise> + (none entered) + </c:otherwise> + </c:choose> + </div> + </div> + </div> + </div> -<div> - -<html:form action="/channels/ChannelDetail"> - - <rhn:csrf /> - - <table class="details" width="100%"> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.name"/>: - </th> - <td class="small-form"> - <c:out value="${channel.name}" /> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.label"/>: - </th> - <td class="small-form"> - <c:out value="${channel.label}"/> - </td> - </tr> - <tr> - <th><bean:message key="channel.jsp.parentchannel"/>:</th> - <td> - <c:if test="${empty channel.parentChannel}"> - <span class="no-details">(none)</span> - </c:if> - <c:if test="${!empty channel.parentChannel}"> - <a href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}"> - <c:out value="${channel.parentChannel.name}" /> - </a> - </c:if> - </td> - </tr> - <tr> - <th><bean:message key="channel.edit.jsp.checksum"/>:</th> - <td> - <c:if test="${empty channel.checksumType}"> - <span class="no-details">(none)</span> - </c:if> - <c:if test="${!empty channel.checksumType}"> - <c:out value="${channel.checksumType}" /> - </c:if> - </td> - </tr> - <tr> - <th><bean:message key="packagelist.jsp.packagearch"/>:</th> - <td><c:out value="${channel.channelArch.name}" /></td> - </tr> - <tr> - <th><bean:message key="channel.jsp.summary"/>:</th> - <td><c:out value="${channel.summary}" /></td> - </tr> - <tr> - <th><bean:message key="details.jsp.description"/>:</th> - <td> - <c:if test="${empty channel.description}"> - <span class="no-details">(none)</span> - </c:if> - <c:if test="${!empty channel.description}"> - <c:out value="${channel.description}" /> - </c:if> - </td> - </tr> - <tr> - <th><bean:message key="channel.jsp.chanent"/>:</th> - <td><c:out value="${channel.channelFamily.name}" /></td> - </tr> - <tr> - <th><bean:message key="channelfiles.jsp.lastmod"/>:</th> - <td><c:out value="${channel_last_modified}" /></td> - </tr> - <tr> - <th><bean:message key="channel.jsp.repolastbuild"/>:</th> - <td> - <c:choose> - <c:when test="${repo_last_build != null}"> - <c:out value="${repo_last_build}" /></td> - </c:when> - <c:otherwise> - <span class="no-details">(none)</span> - </c:otherwise> - </c:choose> - </tr> - <tr> - <th><bean:message key="channel.jsp.repodata"/>:</th> - <td> - <c:choose> - <c:when test="${repo_status == null}"> - <span class="no-details">(none)</span> - </c:when> - <c:when test="${repo_status == true}"> - <bean:message key="channel.jsp.repodata.inProgress"/> - </c:when> - <c:when test="${repo_status == false && repo_last_build != null}"> - <bean:message key="channel.jsp.repodata.completed"/> - </c:when> - <c:otherwise> - <span class="no-details">(none)</span> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th><bean:message key="header.jsp.packages"/>:</th> - <td><a href="/rhn/channels/ChannelPackages.do?cid=${channel.id}"> - ${pack_size}</a></td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.perusersub"/>: - </th> - <td class="small-form"> - <table> - <tr> - <c:choose> - <c:when test="${has_access}"> - <td><html:radio property="global" value="all" /></td> - </c:when> - <c:otherwise> - <td><html:radio property="global" value="all" disabled="true"/></td> - </c:otherwise> - </c:choose> - <td><bean:message key="channel.edit.jsp.allusers"/></td> - </tr><tr> - <c:choose> - <c:when test="${has_access == true}"> - <td><html:radio property="global" value="selected" /></td> - </c:when> - <c:otherwise> - <td><html:radio property="global" value="selected" disabled="true"/></td> - </c:otherwise> - </c:choose> - <td><bean:message key="channel.edit.jsp.selectedusers"/></td> - </tr> - </table> - </td> - </tr> - - <tr> - <th><bean:message key="channel.jsp.systemssubsribed"/>:</th> - <td><a href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}">${systems_subscribed}</a></td> - </tr> - </table> - <h2><bean:message key="channel.edit.jsp.contactsupportinfo"/></h2> - <table class="details"> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.maintainername"/>: - </th> - <td class="small-form"> - <c:out value="${channel.maintainerName}" /> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.maintainercontactinfo"/>: - </th> - <td class="small-form"> - <table> - <tr> - <td><bean:message key="channel.edit.jsp.emailaddress"/>:</td> - <td><c:out value="${channel.maintainerEmail}" /></td> - </tr><tr> - <td><bean:message key="channel.edit.jsp.phonenumber"/>:</td> - <td><c:out value="${channel.maintainerPhone}" /></td> - </tr> - </table> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.supportpolicy"/>: - </th> - <td class="small-form"> - <c:out value="${channel.supportPolicy}" /> - </td> - </tr> - </table> - <h2><bean:message key="channel.edit.jsp.security.gpg"/></h2> - <table class="details"> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.gpgkeyurl"/>: - </th> - <td class="small-form"> - <c:choose> - <c:when test="${channel.GPGKeyUrl != null}"> - <c:out value="${channel.GPGKeyUrl}" /><br><br> - </c:when> - <c:otherwise> - (none entered)<br><br> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.gpgkeyid"/>: - </th> - <td class="small-form"> - <c:choose> - <c:when test="${channel.GPGKeyId != null}"> - <c:out value="${channel.GPGKeyId}" /><br><br> - </c:when> - <c:otherwise> - (none entered)<br><br> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.gpgkeyfingerprint"/>: - </th> - <td class="small-form"> - <c:choose> - <c:when test="${channel.GPGKeyFp != null}"> - <c:out value="${channel.GPGKeyFp}" /><br><br> - </c:when> - <c:otherwise> - (none entered)<br><br> - </c:otherwise> - </c:choose> - </td> - </tr> - </table> - - <c:if test="${has_access}"> - <p align="right"> - <html:submit property="Update"> - <bean:message key="message.Update"/> - </html:submit> - </p> - </c:if> - <rhn:submitted/> - <html:hidden property="cid" value="${channel.id}" /> -</html:form> - - - -</div> - -</body> + <c:if test="${has_access}"> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="Update" styleClass="btn btn-success"> + <bean:message key="message.Update"/> + </html:submit> + </div> + </div> + </c:if> + <rhn:submitted/> + <html:hidden property="cid" value="${channel.id}" /> + </html:form> + </body> </html:html> - commit ddf451ea922cb64b733d8f0173d88a7d29546ffe Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 24 11:03:10 2013 +0200 Rename check_all.js to spacewalk-checkall.js diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt index 576a489..d2e3955 100644 --- a/branding/templates/header.pxt +++ b/branding/templates/header.pxt @@ -20,7 +20,7 @@ <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> - <script src="/javascript/check_all.js"></script> + <script src="/javascript/spacewalk-checkall.js"></script> </head> </pxt-passthrough> diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index b2decfe..713f219 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -41,7 +41,7 @@ <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> - <script src="/javascript/check_all.js"></script> + <script src="/javascript/spacewalk-checkall.js"></script> <script src="/rhn/dwr/engine.js"></script> <script src="/rhn/dwr/util.js"></script> diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js deleted file mode 100644 index 319fb3d..0000000 --- a/web/html/javascript/check_all.js +++ /dev/null @@ -1,232 +0,0 @@ -function blockEnter(evt) { - evt = (evt) ? evt : event; - var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which : evt.keyCode); - if (charCode == 13) { - return false; - } else { - return true; - } -} - -function create_checkall_checkbox() { - var checkall = document.getElementById("rhn_javascriptenabled_checkall_checkbox"); - - if (checkall) { - checkall.style.display = "inline"; - } - - var update_list_key = document.getElementById("update_list_key_id"); - if (update_list_key) { - update_list_key.style.display = "none"; - } -} - -function check_all_on_page(form, set_label) { - var form_name = form.name; - if (form_name == "") { - form_name = form.id; - } - var flag = eval("document.forms['" + form_name + "'].checkall.checked"); - var cboxes = eval("document.forms['" + form_name + "'].items_selected"); - process_check_all(set_label, cboxes, flag, []); -} - -function process_check_all(set_label, cbox_items, flag, ignorables_ids) { - var ignorables = ids_to_elements(ignorables_ids); - var cboxes = new Array(); - cboxes = cboxes.concat(ignorables); - if (cbox_items.length) { - for (var i = 0 ; i < cbox_items.length; i++) { - cboxes.push(cbox_items[i]); - } - } - else { - //for a single element check box - //push the form element - cboxes.push(cbox_items); - } - - var boxes = process_group(set_label, cboxes, flag); - var includes = new Array(); - for (var i = 0; i < boxes.length; i++) { - var include = true; - for (var j = 0; j < ignorables.length; j++) { - if (ignorables[j].value == boxes[i]) { - include = false; - break; - } - } - if (include) { - includes.push(boxes[i]); - } - } - update_server_set("ids", set_label, flag, includes); -} - -function ids_to_elements(elem_ids) { - var elements = new Array(); - for (var i = 0; i < elem_ids.length; i++) { - elements.push(document.getElementById(elem_ids[i])); - } - return elements; -} - - -function process_group(set_label, cboxes, flag) { - var i; - var changed = new Array(); - - if (cboxes.length) { - for (i = 0; i < cboxes.length; i++) { - //check the box only if it is enabled - if (!cboxes[i].disabled) { - if (cboxes[i].checked != flag) { - changed.push(cboxes[i].value); - } //if - cboxes[i].checked = flag; - } //if - } //for - } //if - else { - if (cboxes.checked != flag) { - changed.push(cboxes.value) - } - cboxes.checked = flag; - } - return changed; -} - -function checkbox_clicked(thebox, set_label) { - var form_name = thebox.form.name; - if (form_name == "") { - form_name = thebox.form.id; - } - var checkall = eval("document.forms['" + form_name + "'].checkall"); - process_checkbox_clicked(thebox, set_label, checkall, [], [],"", true); -} - - -/** - * This method is called when a single checkbox is clicked - * thebox - The check box that was clicked - * set_label - The rhnSet label of the checkbox that was clicked - * checkall - The link to the select all box - * - * If this list tag is using some sort of tree/grouping structure - * - * children - if this is a parent node then list the children or [] otherwise - * members - if this is a child node then list the siblings and include the child or [] otherwise - * parent_id - if this is a child node then list the parent_id or [] otherwise - **/ - -function process_checkbox_clicked(thebox, set_label, checkall, children, members, parent_id, parentIsElement) { - var a = process_checkbox_clicked_client_side(thebox, set_label, checkall, children, members, parent_id, parentIsElement); - update_server_set("ids", set_label, thebox.checked, a); -} - -function process_checkbox_clicked_client_side(thebox, set_label, checkall, children, members, parent_id, parentIsElement) { - var a = new Array(); - if (parent_id == '') { - if(parentIsElement) { - a.push(thebox.value); - } - } - else { - a.push(thebox.value); - } - - var checkboxes = new Array(); - for (var i = 0; i < children.length; i++) { - var checkbox = document.getElementById(children[i]); - checkboxes.push(checkbox); - a.push(checkbox.value); - } - if (checkboxes.length > 0) { - process_group(set_label, checkboxes, thebox.checked); - } - - if (parent_id) { - var parentBox = document.getElementById(parent_id); - var boxes = ids_to_elements(members) ; - process_single_checkbox(boxes, parentBox); - } - var form_name = thebox.form.name; - if (form_name == "") { - form_name = thebox.form.id; - } - var cboxes = eval("document.forms['" + form_name + "']." + thebox.name); - process_single_checkbox(cboxes, checkall); - return a; -} - - - -function process_single_checkbox(cboxes, checkall) { - var i; - var count_checked_or_disabled = 0; - var all_checked = false; - if (cboxes.length) { - for (i = 0; i < cboxes.length; i++) { - if (cboxes[i].checked || cboxes[i].disabled) { - count_checked_or_disabled++; - } - } - - if (count_checked_or_disabled == cboxes.length) { - all_checked = true; - } - } - else { - if (cboxes.checked) { - all_checked = true; - } - } - if (checkall) { - checkall.checked = all_checked; - } -} - -function update_server_set(variable, set_label, checked, values) { - DWRItemSelector.select(set_label, values, checked,pageResponse); -} - -function pageResponse(data) { - var resp = eval(data); - if (typeof(resp['header']) != 'undefined') { - dwr.util.setValue("header_selcount", resp.header, {escapeHtml: false}); - } - if (document.getElementById('pagination_selcount_top')) { - dwr.util.setValue("pagination_selcount_top", resp.pagination); - dwr.util.setValue("pagination_selcount_bottom", resp.pagination); - } - updateSsmToolbarOpacity(); -} - -// the function we call to read the number of systems selected and hide/show the toolbar -function updateSsmToolbarOpacity() { - var systemsSpan = $("#spacewalk-set-system_list-counter").text(); - - if (systemsSpan == 0){ - - $(".spacewalk-bar").animate({"opacity": "0"}, 300, function() { - /* stuff to do after animation is complete */ - $(this).hide(); - }); - } - else{ - - $(".spacewalk-bar").animate({"opacity":"100"}, 300, - function(){ - /* stuff to do after animation is complete */ - $(this).show(); - }); - } -} - -function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) { - var sortBy = document.getElementById(sortByWidget); - sortBy.value = sortByValue; - var sortDir = document.getElementById(sortDirWidget); - sortDir.value = sortDirValue; - sortBy.form.submit(); -} diff --git a/web/html/javascript/spacewalk-checkall.js b/web/html/javascript/spacewalk-checkall.js new file mode 100644 index 0000000..319fb3d --- /dev/null +++ b/web/html/javascript/spacewalk-checkall.js @@ -0,0 +1,232 @@ +function blockEnter(evt) { + evt = (evt) ? evt : event; + var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which : evt.keyCode); + if (charCode == 13) { + return false; + } else { + return true; + } +} + +function create_checkall_checkbox() { + var checkall = document.getElementById("rhn_javascriptenabled_checkall_checkbox"); + + if (checkall) { + checkall.style.display = "inline"; + } + + var update_list_key = document.getElementById("update_list_key_id"); + if (update_list_key) { + update_list_key.style.display = "none"; + } +} + +function check_all_on_page(form, set_label) { + var form_name = form.name; + if (form_name == "") { + form_name = form.id; + } + var flag = eval("document.forms['" + form_name + "'].checkall.checked"); + var cboxes = eval("document.forms['" + form_name + "'].items_selected"); + process_check_all(set_label, cboxes, flag, []); +} + +function process_check_all(set_label, cbox_items, flag, ignorables_ids) { + var ignorables = ids_to_elements(ignorables_ids); + var cboxes = new Array(); + cboxes = cboxes.concat(ignorables); + if (cbox_items.length) { + for (var i = 0 ; i < cbox_items.length; i++) { + cboxes.push(cbox_items[i]); + } + } + else { + //for a single element check box + //push the form element + cboxes.push(cbox_items); + } + + var boxes = process_group(set_label, cboxes, flag); + var includes = new Array(); + for (var i = 0; i < boxes.length; i++) { + var include = true; + for (var j = 0; j < ignorables.length; j++) { + if (ignorables[j].value == boxes[i]) { + include = false; + break; + } + } + if (include) { + includes.push(boxes[i]); + } + } + update_server_set("ids", set_label, flag, includes); +} + +function ids_to_elements(elem_ids) { + var elements = new Array(); + for (var i = 0; i < elem_ids.length; i++) { + elements.push(document.getElementById(elem_ids[i])); + } + return elements; +} + + +function process_group(set_label, cboxes, flag) { + var i; + var changed = new Array(); + + if (cboxes.length) { + for (i = 0; i < cboxes.length; i++) { + //check the box only if it is enabled + if (!cboxes[i].disabled) { + if (cboxes[i].checked != flag) { + changed.push(cboxes[i].value); + } //if + cboxes[i].checked = flag; + } //if + } //for + } //if + else { + if (cboxes.checked != flag) { + changed.push(cboxes.value) + } + cboxes.checked = flag; + } + return changed; +} + +function checkbox_clicked(thebox, set_label) { + var form_name = thebox.form.name; + if (form_name == "") { + form_name = thebox.form.id; + } + var checkall = eval("document.forms['" + form_name + "'].checkall"); + process_checkbox_clicked(thebox, set_label, checkall, [], [],"", true); +} + + +/** + * This method is called when a single checkbox is clicked + * thebox - The check box that was clicked + * set_label - The rhnSet label of the checkbox that was clicked + * checkall - The link to the select all box + * + * If this list tag is using some sort of tree/grouping structure + * + * children - if this is a parent node then list the children or [] otherwise + * members - if this is a child node then list the siblings and include the child or [] otherwise + * parent_id - if this is a child node then list the parent_id or [] otherwise + **/ + +function process_checkbox_clicked(thebox, set_label, checkall, children, members, parent_id, parentIsElement) { + var a = process_checkbox_clicked_client_side(thebox, set_label, checkall, children, members, parent_id, parentIsElement); + update_server_set("ids", set_label, thebox.checked, a); +} + +function process_checkbox_clicked_client_side(thebox, set_label, checkall, children, members, parent_id, parentIsElement) { + var a = new Array(); + if (parent_id == '') { + if(parentIsElement) { + a.push(thebox.value); + } + } + else { + a.push(thebox.value); + } + + var checkboxes = new Array(); + for (var i = 0; i < children.length; i++) { + var checkbox = document.getElementById(children[i]); + checkboxes.push(checkbox); + a.push(checkbox.value); + } + if (checkboxes.length > 0) { + process_group(set_label, checkboxes, thebox.checked); + } + + if (parent_id) { + var parentBox = document.getElementById(parent_id); + var boxes = ids_to_elements(members) ; + process_single_checkbox(boxes, parentBox); + } + var form_name = thebox.form.name; + if (form_name == "") { + form_name = thebox.form.id; + } + var cboxes = eval("document.forms['" + form_name + "']." + thebox.name); + process_single_checkbox(cboxes, checkall); + return a; +} + + + +function process_single_checkbox(cboxes, checkall) { + var i; + var count_checked_or_disabled = 0; + var all_checked = false; + if (cboxes.length) { + for (i = 0; i < cboxes.length; i++) { + if (cboxes[i].checked || cboxes[i].disabled) { + count_checked_or_disabled++; + } + } + + if (count_checked_or_disabled == cboxes.length) { + all_checked = true; + } + } + else { + if (cboxes.checked) { + all_checked = true; + } + } + if (checkall) { + checkall.checked = all_checked; + } +} + +function update_server_set(variable, set_label, checked, values) { + DWRItemSelector.select(set_label, values, checked,pageResponse); +} + +function pageResponse(data) { + var resp = eval(data); + if (typeof(resp['header']) != 'undefined') { + dwr.util.setValue("header_selcount", resp.header, {escapeHtml: false}); + } + if (document.getElementById('pagination_selcount_top')) { + dwr.util.setValue("pagination_selcount_top", resp.pagination); + dwr.util.setValue("pagination_selcount_bottom", resp.pagination); + } + updateSsmToolbarOpacity(); +} + +// the function we call to read the number of systems selected and hide/show the toolbar +function updateSsmToolbarOpacity() { + var systemsSpan = $("#spacewalk-set-system_list-counter").text(); + + if (systemsSpan == 0){ + + $(".spacewalk-bar").animate({"opacity": "0"}, 300, function() { + /* stuff to do after animation is complete */ + $(this).hide(); + }); + } + else{ + + $(".spacewalk-bar").animate({"opacity":"100"}, 300, + function(){ + /* stuff to do after animation is complete */ + $(this).show(); + }); + } +} + +function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) { + var sortBy = document.getElementById(sortByWidget); + sortBy.value = sortByValue; + var sortDir = document.getElementById(sortDirWidget); + sortDir.value = sortDirValue; + sortBy.form.submit(); +} diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index edf2a5a..7cf0345 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -25,7 +25,7 @@ $(document).on("ready", function(){ // See if there is a system already selected as soon as the page loads updateSsmToolbarOpacity(); - // This is in check_all.js + // This is a function from spacewalk-checkall.js create_checkall_checkbox(); }); commit c79eab4ee9208cb2225cc93f69bd026ba483b1c3 Author: cyntss <csanchez(a)suse.com> Date: Thu Oct 24 10:40:19 2013 +0200 Alphabet filter reduced to fit in small screens diff --git a/branding/css/theme.less b/branding/css/theme.less index 181c1ef..ba34c3e 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -1,8 +1,7 @@ //PAGINATOR from 0 - 9 and A - Z .spacewalk-alphabar{ - border-bottom: 1px solid #dddddd; - //padding: .7em; + padding-bottom: .3em; &.pagination{ margin: 0 } @@ -11,6 +10,7 @@ border-bottom: 1px solid #dddddd; border-left: 0; border-right: 0; + font-size: .9em; } &.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ border-left: 1px solid #dddddd; @@ -21,7 +21,7 @@ padding-right: 8px; } &.pagination-sm > li > a, .pagination-sm > li > span{ - padding: 4px 6px; + padding: 4px; } &.pagination-sm > li:nth-child(11) > a{ border-left: 1px solid #dddddd; commit 7d40a175f2985269aadb4a417f79f32c5d5a23ca Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 18:30:48 2013 +0200 buttons and panel style added diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp index 44a10c7..3c3947a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp @@ -109,11 +109,9 @@ </rl:list> - <div align="right"> - - <hr /> - <html:submit property="dispatch"> - <bean:message key="Delete Selected"/> + <div class="text-right"> + <html:submit styleClass="btn btn-default" property="dispatch"> + <bean:message key="Delete Selected"/> </html:submit> </div> @@ -121,6 +119,5 @@ </rl:listset> - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp index e6f9e39..8daf769 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -73,10 +73,9 @@ <input type="hidden" name="key" value="${param.key}"/> <input type="hidden" name="key_type" value="${param.key_type}"/> - <div align="right"> - + <div class="text-right"> <hr /> - <input type="submit" name="refresh" value="<bean:message key='Refresh Comparison'/>" /> + <button type="submit" class="btn btn-default" name="refresh"><i class="icon-refresh"></i> <bean:message key='Refresh Comparison'/></button> </div> <rhn:submitted/> <br/> @@ -106,10 +105,10 @@ </c:forEach> </tr> <tr> - <th colspan="${requestScope.systems.size + 1}"><bean:message key="System Identity Properties"/>  + <td colspan="${requestScope.systems.size + 1}"><bean:message key="System Identity Properties"/>  <a id='sysIdHide' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message key="Click Here To Hide"/> </a> <a style="display:none" id='sysIdShow' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message key="Click Here To Show"/> </a> - </th> + </td> </tr> <tr class="list-row-odd" id="lastCheckinRow"> <c:set var ="key" value="systemlist.jsp.last_checked_in"/> @@ -142,10 +141,10 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr> - <th colspan="${requestScope.systems.size + 1}"><bean:message key="Extended System Identity Properties"/>   + <td colspan="${requestScope.systems.size + 1}"><bean:message key="Extended System Identity Properties"/>   <a id='extendedSysIdHide' href="javascript:pageToggleRows('extendedSysId', ['registrationDateRow', 'systemIdRow','activationKeysRow'])"><bean:message key="Click Here To Hide"/> </a> <a style="display:none" id='extendedSysIdShow' href="javascript:pageToggleRows('sysId', ['registrationDateRow', 'systemIdRow','activationKeysRow'])"><bean:message key="Click Here To Show"/> </a> - </th> + </td> </tr> <tr class="list-row-odd" id = "registrationDateRow"> <c:set var ="key" value="Registration Date"/> @@ -167,10 +166,10 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr> - <th colspan="${requestScope.systems.size + 1}"><bean:message key="System Content And Monitoring"/>   + <td colspan="${requestScope.systems.size + 1}"><bean:message key="System Content And Monitoring"/>   <a id='sysContentIdHide' href="javascript:pageToggleRows('sysContentId', ['baseChannelRow', 'childChannelsRow','configChannelsRow','monitoringProbesRow'])"><bean:message key="Click Here To Hide"/> </a> <a style="display:none" id='sysContentIdShow' href="javascript:pageToggleRows('sysContentId', ['baseChannelRow', 'childChannelsRow','configChannelsRow','monitoringProbesRow'])"><bean:message key="Click Here To Show"/> </a> - </th> + </td> </tr> <tr class="list-row-odd" id = "baseChannelRow"> @@ -198,10 +197,10 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr> - <th colspan="${requestScope.systems.size + 1}"><bean:message key="softwareEntitlementDetails.header.entitlementUsage"/>   + <td colspan="${requestScope.systems.size + 1}"><bean:message key="softwareEntitlementDetails.header.entitlementUsage"/>   <a id='sysEntUsageIdHide' href="javascript:pageToggleRows('sysEntUsageId', ['systemEntitlementsRow', 'softwareEntitlementsRow'])"><bean:message key="Click Here To Hide"/> </a> <a style="display:none" id='sysEntUsageIdShow' href="javascript:pageToggleRows('sysEntUsageId', ['systemEntitlementsRow', 'softwareEntitlementsRow'])"><bean:message key="Click Here To Show"/> </a> - </th> + </td> </tr> <tr class="list-row-odd" id = "systemEntitlementsRow"> <c:set var ="key" value="System Entitlements"/> @@ -222,6 +221,5 @@ </c:choose> </rl:listset> - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp index 89b8704..11a8639 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -65,24 +65,26 @@  <c:if test="${requestScope.showCommands}"> + <hr/> + <div class="panel panel-default"> <table class="table">  <tr> <th><bean:message key="systementitlements.jsp.baseentitlement" /></th> - <td align="right"> + <td class="text-right"> <c:if test="${requestScope.showUpdateAspects}"> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.set_to_update_entitled" /> </html:submit> </c:if> <c:if test="${requestScope.showManagementAspects}"> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.set_to_manage_entitled" /> </html:submit> </c:if> <c:if test="${requestScope.showUnentitled}"> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.set_to_unentitled" /> </html:submit> </c:if> @@ -92,62 +94,70 @@ <c:if test="${requestScope.showAddOnAspects}"> <tr> <th><bean:message key="systementitlements.jsp.addonentitlement" /></th> - <td align="right"> + <td class="text-right"> <html:select property="addOnEntitlement"> <html:optionsCollection name="addOnEntitlements"/> </html:select> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.add_entitlement" /> </html:submit> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.remove_entitlement" /> </html:submit> </td> </tr> </c:if> </table> + </div> </c:if>  <h2><bean:message key="systementitlements.jsp.entitlement_counts" /></h2>  - <h3><bean:message key="systementitlements.jsp.base_entitlements"/></h3> - <table class="details"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h5><bean:message key="systementitlements.jsp.base_entitlements"/></h5> + </div> + <table class="table"> <tr> - <th><bean:message key="Spacewalk Update Entitled Servers"/>:</th> - <td>${requestScope.updateCountsMessage}</td> + <td><bean:message key="Spacewalk Update Entitled Servers"/>:</td> + <td>${requestScope.updateCountsMessage}</td> </tr> - <tr> - <th><bean:message key="Spacewalk Management Entitled Servers"/>:</th> - <td>${requestScope.managementCountsMessage}</td> + <td><bean:message key="Spacewalk Management Entitled Servers"/>:</td> + <td>${requestScope.managementCountsMessage}</td> </tr> </table> - + </div>  - <h3><bean:message key="systementitlements.jsp.addonentitlement"/></h3> - <table class="details"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h5><bean:message key="systementitlements.jsp.addonentitlement"/></h5> + </div> + <table class="table"> <tr> - <th><bean:message key="provisioning_entitled"/>:</th> + <td><bean:message key="provisioning_entitled"/>:</td> <td>${requestScope.provisioningCountsMessage}</td> </tr> <c:if test="${requestScope.showMonitoring}"> <tr> - <th><bean:message key="monitoring_entitled"/>:</th> + <td><bean:message key="monitoring_entitled"/>:</td> <td>${requestScope.monitoringCountsMessage}</td> </tr> </c:if> <tr> - <th><bean:message key="virtualization_host"/>:</th> + <td><bean:message key="virtualization_host"/>:</td> <td>${requestScope.virtualizationCountsMessage}</td> </tr> <tr> - <th><bean:message key="virtualization_host_platform"/>:</th> + <td><bean:message key="virtualization_host_platform"/>:</td> <td>${requestScope.virtualizationPlatformCountsMessage}</td> </tr> </table> + </div> +  </html:form> commit 104a3129eaea5cbf38511ee87eba2807bc94ba2d Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 18:29:59 2013 +0200 Colour added to icons in legends diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index ee81a7b..ca19615 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -593,16 +593,14 @@ ul.nav.nav-tabs:last-child{ } } -<<<<<<< Updated upstream // alerts .alert { margin: 18px 0; } -======= // icon size smaller than the ones default by Font Awesome .icon-1-5x { - font-size: 1.5em; + font-size: 1.3em; } .icon-1-5x.icon-border { border-width: 2px; @@ -610,4 +608,3 @@ ul.nav.nav-tabs:last-child{ -moz-border-radius: 4px; border-radius: 4px; } ->>>>>>> Stashed changes diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp index 7675aa2..2cc92f7 100644 --- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp @@ -3,8 +3,8 @@ <div class="sideleg"> <h4><bean:message key="errata-legend.jsp.title"/></h4> <ul> - <li><i class="icon-shield"></i><bean:message key="errata-legend.jsp.security"/></li> - <li><i class="icon-bug"></i><bean:message key="errata-legend.jsp.bugfix"/></li> - <li><i class="spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement"/></li> + <li><i class="icon-shield icon-1-5x"></i><bean:message key="errata-legend.jsp.security"/></li> + <li><i class="icon-bug icon-1-5x"></i><bean:message key="errata-legend.jsp.bugfix"/></li> + <li><i class="spacewalk-icon-enhancement icon-1-5x"></i><bean:message key="errata-legend.jsp.enhancement"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp index b1c5173..53918cc 100644 --- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp @@ -3,19 +3,19 @@ <div class="sideleg"> <h4><bean:message key="probes-list-legend.jsp.title"/></h4> <ul> - <li><i class="spacewalk-icon-health spacewalk-icon-green"></i> + <li><i class="spacewalk-icon-health spacewalk-icon-green icon-1-5x"></i> <bean:message key="probes-list-legend.jsp.ok"/> </li> - <li><i class="spacewalk-icon-health spacewalk-icon-yellow"></i> + <li><i class="spacewalk-icon-health spacewalk-icon-yellow icon-1-5x"></i> <bean:message key="probes-list-legend.jsp.warning"/> </li> - <li><i class="spacewalk-icon-health spacewalk-icon-red"></i> + <li><i class="spacewalk-icon-health spacewalk-icon-red icon-1-5x"></i> <bean:message key="probes-list-legend.jsp.critical"/> </li> - <li><i class="spacewalk-icon-health-unknown"></i> + <li><i class="spacewalk-icon-health-unknown icon-1-5x"></i> <bean:message key="probes-list-legend.jsp.unknown"/> </li> - <li><i class="spacewalk-icon-health-pending"></i> + <li><i class="spacewalk-icon-health-pending icon-1-5x"></i> <bean:message key="probes-list-legend.jsp.pending"/> </li> </ul> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp index 29c1eeb..410d965 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp @@ -3,8 +3,8 @@ <div class="sideleg"> <h4><bean:message key="system-group-legend.jsp.title"/></h4> <ul> - <li><i class="icon-ok-sign"></i><bean:message key="system-group-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign"></i><bean:message key="system-group-legend.jsp.updates"/></li> - <li><i class="icon-warning-sign"></i><bean:message key="system-group-legend.jsp.critical"/></li> + <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-group-legend.jsp.fully"/></li> + <li><i class="icon-exclamation-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-group-legend.jsp.updates"/></li> + <li><i class="icon-warning-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-group-legend.jsp.critical"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index 1fa91aa..f416e72 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -4,23 +4,23 @@ <div class="sideleg"> <h4><bean:message key="system-legend.jsp.title"/></h4> <ul> - <li><i class="icon-ok-sign"></i><bean:message key="system-legend.jsp.fully"/></li> - <li><i class="icon-exclamation-sign"></i><bean:message key="system-legend.jsp.critical"/></li> - <li><i class="icon-warning-sign"></i><bean:message key="system-legend.jsp.updates"/></li> - <li><i class="spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin"/></li> + <li><i class="icon-ok-sign spacewalk-icon-green icon-1-5x"></i><bean:message key="system-legend.jsp.fully"/></li> + <li><i class="icon-exclamation-sign spacewalk-icon-yellow icon-1-5x"></i><bean:message key="system-legend.jsp.critical"/></li> + <li><i class="icon-warning-sign spacewalk-icon-red icon-1-5x"></i><bean:message key="system-legend.jsp.updates"/></li> + <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin"/></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked"/></li> + <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked"/></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><i class="icon-rocket"></i><bean:message key="system-legend.jsp.kickstarting"/></li> + <li><i class="icon-rocket icon-1-5x"></i><bean:message key="system-legend.jsp.kickstarting"/></li> </rhn:require> - <li><i class="icon-time"></i><bean:message key="system-legend.jsp.pending"/></li> - <li><i class="spacewalk-icon-Unentitled"></i><bean:message key="system-legend.jsp.unentitled"/></li> + <li><i class="icon-time icon-1-5x"></i><bean:message key="system-legend.jsp.pending"/></li> + <li><i class="spacewalk-icon-Unentitled icon-1-5x"></i><bean:message key="system-legend.jsp.unentitled"/></li> <rhn:require acl="org_entitlement(rhn_monitor)"> - <li><i class="spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring"/></li> + <li><i class="spacewalk-icon-monitoring-status icon-1-5x"></i><bean:message key="system-legend.jsp.monitoring"/></li> </rhn:require> - <li><i class="spacewalk-icon-virtual-host"></i><bean:message key="systemlist.jsp.virthost"/></li> - <li><i class="spacewalk-icon-virtual-guest"></i><bean:message key="systemlist.jsp.virtguest"/></li> - <li><i class="icon-laptop"></i><bean:message key="systemlist.jsp.nonvirt"/></li> + <li><i class="spacewalk-icon-virtual-host icon-1-5x"></i><bean:message key="systemlist.jsp.virthost"/></li> + <li><i class="spacewalk-icon-virtual-guest icon-1-5x"></i><bean:message key="systemlist.jsp.virtguest"/></li> + <li><i class="icon-laptop icon-1-5x"></i><bean:message key="systemlist.jsp.nonvirt"/></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp index b88aa79..57df068 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -4,24 +4,24 @@ <div class="sideleg"> <h4><bean:message key="yourrhn-legend.jsp.title" /></h4> <ul> - <li><i class="icon-ok-sign"></i><bean:message key="system-legend.jsp.fully" /></li> - <li><i class="icon-exclamation-sign"></i><bean:message key="system-legend.jsp.critical" /></li> - <li><i class="icon-warning-sign"></i><bean:message key="system-legend.jsp.updates" /></li> - <li><i class="spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin" /></li> + <li><i class="icon-ok-sign icon-1-5x spacewalk-icon-green"></i><bean:message key="system-legend.jsp.fully" /></li> + <li><i class="icon-exclamation-sign icon-1-5x spacewalk-icon-yellow"></i><bean:message key="system-legend.jsp.critical" /></li> + <li><i class="icon-warning-sign icon-1-5x spacewalk-icon-red"></i><bean:message key="system-legend.jsp.updates" /></li> + <li><i class="spacewalk-icon-unknown-system icon-1-5x"></i><bean:message key="system-legend.jsp.notcheckingin" /></li> <rhn:require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked" /></li> + <li><i class="spacewalk-icon-locked-system icon-1-5x"></i><bean:message key="system-legend.jsp.locked" /></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><i class="icon-rocket"></i><bean:message key="system-legend.jsp.kickstarting" /></li> + <li><i class="icon-rocket icon-1-5x"></i><bean:message key="system-legend.jsp.kickstarting" /></li> </rhn:require> - <li><i class="icon-time"></i><bean:message key="system-legend.jsp.pending" /></li> - <li><i class="icon-remove-circle"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> - <li><i class="icon-ok-circle"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> + <li><i class="icon-time icon-1-5x"></i><bean:message key="system-legend.jsp.pending" /></li> + <li><i class="icon-remove-circle icon-1-5x"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> + <li><i class="icon-ok-circle icon-1-5x"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> <rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> - <li><i class="spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring" /></li> + <li><i class="spacewalk-icon-monitoring-status icon-1-5x"></i><bean:message key="system-legend.jsp.monitoring" /></li> </rhn:require> - <li><i class="icon-shield"></i><bean:message key="errata-legend.jsp.security" /></li> - <li><i class="icon-bug"></i><bean:message key="errata-legend.jsp.bugfix" /></li> - <li><i class="spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement" /></li> + <li><i class="icon-shield icon-1-5x"></i><bean:message key="errata-legend.jsp.security" /></li> + <li><i class="icon-bug icon-1-5x"></i><bean:message key="errata-legend.jsp.bugfix" /></li> + <li><i class="spacewalk-icon-enhancement icon-1-5x"></i><bean:message key="errata-legend.jsp.enhancement" /></li> </ul> </div> commit 102fc033839d4187622f3393f07baaa58ee7e8ba Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 17:40:19 2013 +0200 Should be obsolete since we call the function on doc ready diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm index cce562b..580d408 100644 --- a/web/modules/sniglets/Sniglets/ListView/Style.pm +++ b/web/modules/sniglets/Sniglets/ListView/Style.pm @@ -79,7 +79,6 @@ sub footer { my $ret =<<EOQ; </table> -<script src="/javascript/check_all.js"></script> EOQ return $ret; commit 5e9de5f9037e0dfe8995f3fe3c1179a3434fc49e Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 17:17:02 2013 +0200 All *.js should be loaded from within the <head> diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt index 7bd0ee7..576a489 100644 --- a/branding/templates/header.pxt +++ b/branding/templates/header.pxt @@ -20,8 +20,7 @@ <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> - + <script src="/javascript/check_all.js"></script> </head> - <script src="/javascript/check_all.js" type="text/javascript"></script> </pxt-passthrough> commit 59dc789bce3203e09ad449349bbba52a07b96df5 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 15:28:55 2013 +0200 Fix typo in comment diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java index 7f60a53..8ec0044 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java @@ -44,7 +44,7 @@ public class MessagesTag extends TagSupport { try { out = pageContext.getOut(); - // Use boostrap alert classes + // Use bootstrap alert classes baseTag = new HtmlTag("div"); baseTag.setAttribute("class", "alert alert-info"); commit 8e56e9ac1d4059baaa5a85469e2a3ac4de12a319 Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 16:44:45 2013 +0200 Panels added and tables well formated diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index a450a61..ee81a7b 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -593,8 +593,21 @@ ul.nav.nav-tabs:last-child{ } } +<<<<<<< Updated upstream // alerts .alert { margin: 18px 0; } +======= +// icon size smaller than the ones default by Font Awesome +.icon-1-5x { + font-size: 1.5em; +} +.icon-1-5x.icon-border { + border-width: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +>>>>>>> Stashed changes diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf index 37e4fb2..9fade55 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf @@ -1,4 +1,4 @@ -<div class="row"> +<div class="row-0"> <div class="col-md-1"> <bean:message key="channel.jsp.manage.package.channel"/>: </div> @@ -25,4 +25,5 @@ <div class="col-md-7 text-left"> <input type="submit" name="view" class="btn btn-default" value="<bean:message key="channel.jsp.package.viewpackages"/>"> </div> -</div> \ No newline at end of file +</div> +<hr/> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf index 498ae0d..c9d1074 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf @@ -1,47 +1,65 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <html> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.header"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.leadin"/></p> + <div class="checkbox"> + <html:checkbox property="emailNotif" value="1" /><bean:message key="preferences.jsp.receivenote"/> + </div> + </div> +</div> -<h2><bean:message key="preferences.jsp.header"/></h2> -<p><bean:message key="preferences.jsp.leadin"/></p> - -<div class="preference"><html:checkbox property="emailNotif" value="1" /><bean:message key="preferences.jsp.receivenote"/></div> -<br /> - -<h2><bean:message key="preferences.jsp.listsize"/></h2> -<p><bean:message key="preferences.jsp.controlentry"/></p> -<div class="preference"><bean:message key="preferences.jsp.show"/> -<html:select property="pagesize"> - <html:options collection="pagesizes" - property="value" - labelProperty="display" /> -</html:select> -<bean:message key="preferences.jsp.entriesperpage"/></div> -<br /> - -<h2><bean:message key="preferences.jsp.startpagetitle"/></h2> -<p><bean:message key="preferences.jsp.startpagedesc"/></p> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.listsize"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.controlentry"/></p> + <bean:message key="preferences.jsp.show"/> + <html:select property="pagesize"> + <html:options collection="pagesizes" + property="value" + labelProperty="display" /> + </html:select> + <bean:message key="preferences.jsp.entriesperpage"/> + </div> +</div> -<div class="preference"> -<c:forEach items="${userPrefForm.map.possiblePanes}" var="item"> - <html:multibox property="selectedPanes" value="${item.value}" disabled="${item.disabled}" styleId="type_${item.value}"/> - <label for="type_${item.value}">${item.label}</label> - <br /> -</c:forEach> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.startpagetitle"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.startpagedesc"/></p> + <c:forEach items="${userPrefForm.map.possiblePanes}" var="item"> + <div class="checkbox"> + <label for="type_${item.value}"> + <html:multibox property="selectedPanes" value="${item.value}" disabled="${item.disabled}" styleId="type_${item.value}"/> + ${item.label}</label> + </div> + </c:forEach> + </div> </div> -<h2><bean:message key="preferences.jsp.csvtitle" /></h2> -<p><bean:message key="preferences.jsp.csvdesc" /></p> -<div class="preference"> - <html:radio property="csvSeparator" value="," styleId="radio-comma" /> - <label for="radio-comma"><bean:message key="preferences.jsp.csvcomma" /></label><br /> - <html:radio property="csvSeparator" value=";" styleId="radio-semicolon" /> - <label for="radio-semicolon"><bean:message key="preferences.jsp.csvsemicolon" /></label> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="preferences.jsp.csvtitle" /></h4> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.csvdesc" /></p> + <html:radio property="csvSeparator" value="," styleId="radio-comma" /> + <label for="radio-comma"><bean:message key="preferences.jsp.csvcomma" /></label><br /> + <html:radio property="csvSeparator" value=";" styleId="radio-semicolon" /> + <label for="radio-semicolon"><bean:message key="preferences.jsp.csvsemicolon" /></label> + </div> </div> <input type="hidden" name="pxt:trap" value="rhn:user_prefs_edit_cb" /> <html:hidden property="uid" /> -<div align="right"> -<hr /> +<div class="text-left"> <rhn:submit valueKey="preferences.jsp.submitvalue"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 67bae47..92b9741 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -18,19 +18,13 @@ <a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}"> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <img src="/img/icon_crit_update.gif" border="0" - alt="<bean:message key="grouplist.jsp.security"/>" - title="<bean:message key="grouplist.jsp.security"/>" /> + <i class="icon-warning-sign icon-1-5x spacewalk-icon-red" title="<bean:message key="grouplist.jsp.security"/>"></i> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <img src="/img/icon_reg_update.gif" border="0" - alt="<bean:message key="grouplist.jsp.updates"/>" - title="<bean:message key="grouplist.jsp.updates"/>" /> + <i class="icon-exclamation-sign icon-1-5x spacewalk-icon-yellow" title="<bean:message key="grouplist.jsp.updates"/>"></i> </c:when> <c:otherwise> - <img src="/img/icon_up2date.gif" border="0" - alt="<bean:message key="grouplist.jsp.noerrata"/>" - title="<bean:message key="grouplist.jsp.noerrata"/>" /> + <i class="icon-ok-sign icon-1-5x spacewalk-icon-green" title="<bean:message key="grouplist.jsp.noerrata"/>"></i> </c:otherwise> </c:choose> </a> @@ -50,10 +44,8 @@ </rl:list> - <span class="full-width-note-right"> <a href="/rhn/systems/SystemGroupList.do"> - <div class="btn btn-default spacewalk-btn-margin-vertical"><bean:message key="yourrhn.jsp.allgroups" /></div> + <div class="btn btn-default spacewalk-btn-margin-vertical"><i class="spacewalk-icon-system-groups"></i><bean:message key="yourrhn.jsp.allgroups" /></div> </a> - </span> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp index eb63a4c..ed25795 100644 --- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp @@ -13,42 +13,54 @@ <h2><bean:message key="cloneerrata.jsp.cloneerrata"/></h2> - <div class="page-summary"> - <p><bean:message key="cloneerrata.jsp.pagesummary"/></p> - </div> - - <br/> - + <p><bean:message key="cloneerrata.jsp.pagesummary"/></p> <rl:listset name="groupList" legend="errata"> <rhn:csrf /> - <p> - <bean:message key="cloneerrata.jsp.viewapplicableerrata"/>: - <select name="channel"> - <c:forEach items="${clonablechannels}" var="option"> - <option value="<c:out value="${option.value}"/>" - <c:if test="${option.value == param.channel}">selected="1"</c:if>> - <c:out value="${option.label}"/> - </option> - </c:forEach> - </select> - <html:submit> - <bean:message key="cloneerrata.jsp.view"/> - </html:submit> - <br/> - - <c:if test="${param.showalreadycloned == 1}"> - <input type="checkbox" name="showalreadycloned" value="1" checked> - </c:if> - <c:if test="${param.showalreadycloned != 1}"> - <input type="checkbox" name="showalreadycloned" value="1"> - </c:if> - - <bean:message key="cloneerrata.jsp.showclonederrata"/> - - </p> + <div class="panel panel-default"> + <div class="panel-body"> + <div class="row-0"> + <div class="col-md-3"> + <bean:message key="cloneerrata.jsp.viewapplicableerrata"/>: + </div> + <div class="col-md-5"> + <select name="channel" class="form-control"> + <c:forEach items="${clonablechannels}" var="option"> + <option value="<c:out value="${option.value}"/>" + <c:if test="${option.value == param.channel}">selected="1"</c:if>> + <c:out value="${option.label}"/> + </option> + </c:forEach> + </select> + </div> + </div> + <div class="row-0"> + <div class="col-md-offset-3 col-md-5"> + <div class="checkbox"> + <label> + <c:if test="${param.showalreadycloned == 1}"> + <input type="checkbox" name="showalreadycloned" value="1" checked> + </c:if> + <c:if test="${param.showalreadycloned != 1}"> + <input type="checkbox" name="showalreadycloned" value="1"> + </c:if> + <bean:message key="cloneerrata.jsp.showclonederrata"/> + </label> + </div> + </div> + </div> + <div class="row-0"> + <div class="col-md-offset-3 col-md-5"> + <html:submit styleClass="btn btn-success"> + <bean:message key="cloneerrata.jsp.view"/> + </html:submit> + </div> + </div> + + </div> + </div> <rl:list emptykey="cloneerrata.jsp.noerrata"> @@ -90,11 +102,11 @@ </rl:list> - <div align="right"> + <div class="text-right"> <rhn:submitted/> - <hr/> <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="cloneerrata.jsp.cloneerrata"/>'/> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp index c0d072d..89b8704 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -65,7 +65,7 @@  <c:if test="${requestScope.showCommands}"> - <table class="details"> + <table class="table">  <tr> <th><bean:message key="systementitlements.jsp.baseentitlement" /></th> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index fb42ade..a3780f1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -27,7 +27,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> @@ -56,17 +56,14 @@ </option> </c:forEach> </select> - <html:submit property="show"> + <html:submit styleClass="btn btn-default" property="show"> <bean:message key="system.errata.show"/> </html:submit> <br/> - <rl:list styleclass="list" - emptykey="${empty_msg}" - - > + emptykey="${empty_msg}"> <rl:decorator name="PageSizeDecorator"/> <c:if test="${not empty requestScope.selectable && not empty requestScope.dataset}"> <rl:decorator name="SelectableDecorator"/> @@ -74,17 +71,12 @@ selected="${current.selected}"/> </c:if> - - -  <rl:column headerkey="systemlist.jsp.system" filterattr="name" filtermessage="${filtermessage}" styleclass="${namestyle}" sortattr="name" - defaultsort="asc" - > - + defaultsort="asc"> <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> <c:choose> @@ -118,19 +110,15 @@ <rhn:submitted/> <c:if test="${not empty requestScope.selectable && not empty requestScope.dataset}"> - <div align="right"> - - <hr /> - <html:submit property="dispatch"> + <div class="text-right"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="Make Flex"/> </html:submit> </div> </c:if> - </rl:listset> - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp index a6bb28f..95d7cba 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp @@ -14,16 +14,14 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> - <p/> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/virt_entitlements.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - <div style="clear: both; width: 65%; float: left;"> <h2><bean:message key="guestlimited.jsp.header2" /></h2> <p> <bean:message key="guestlimited.jsp.para1" /> @@ -37,16 +35,15 @@ dataset="pageList" emptykey="guestlimited.jsp.nosystems" width="100%"> - <rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.hostsystem"> + <rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.hostsystem"> <a href="/rhn/systems/details/Overview.do?sid=${current.hostId}"> <c:out value="${current.hostName}" escapeXml="true" /> </a> </rl:column> - <rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.guest"> + <rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.guest"> <a href="/rhn/systems/details/Overview.do?sid=${current.hostId}">${current.numberOfGuests}</a> </rl:column> </rl:list> </rl:listset> - </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp index f393fb0..0d15014 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp @@ -14,16 +14,14 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> - <p/> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/virt_entitlements.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - <div style="clear: both; width: 65%; float: left;"> <h2><bean:message key="guestunlimited.jsp.header2" /></h2> <p> <bean:message key="guestunlimited.jsp.para1" /> @@ -45,6 +43,5 @@ </rl:column> </rl:list> </rl:listset> - </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp index a63c62a..b36da7b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp @@ -13,16 +13,15 @@ </head> <body> - <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> - <p/> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/virt_entitlements.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - <div style="clear: both; width: 65%; float: left;"> <h2><bean:message key="physicalhosts.jsp.header2" /></h2> <p> <bean:message key="physicalhosts.jsp.para1" /> @@ -79,6 +78,5 @@ <bean:message key="physicalhosts.jsp.nonredhatnote" /> </p> - </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp index 5506fea..fe3dd6f 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp @@ -8,9 +8,8 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-preferences.gif" - helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-prefs" - imgAlt="preferences.jsp.alt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-files" + helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-prefs"> <bean:message key="Your Preferences"/> </rhn:toolbar> <html:form action="/account/PrefSubmit"> commit b4300b08897c4e0b0f9ef67de14777cd71588938 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 14:24:50 2013 +0200 Add top and bottom margin to all alerts diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index d74fa7c..a450a61 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -593,3 +593,8 @@ ul.nav.nav-tabs:last-child{ } } +// alerts +.alert { + margin: 18px 0; +} + commit 3490c0d1acc4347eed0af7dc75aea938a113dd5b Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 14:24:30 2013 +0200 Use alert-info and alert-warning classes correctly diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java index c56c9a5..7f60a53 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java @@ -44,10 +44,9 @@ public class MessagesTag extends TagSupport { try { out = pageContext.getOut(); - // For now, hard-code the site-info class. If we want to abstract - // this later, we can. + // Use boostrap alert classes baseTag = new HtmlTag("div"); - baseTag.setAttribute("class", "site-info"); + baseTag.setAttribute("class", "alert alert-info"); out.print(baseTag.renderOpenTag()); return (EVAL_BODY_INCLUDE); diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index 217b58c..d4d07b8 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -27,7 +27,7 @@ <section id="spacewalk-content">  <logic:messagesPresent> - <div class="alert alert-info"> + <div class="alert alert-warning"> <ul> <html:messages id="message"> <li><c:out value="${message}"/></li> commit f0a97379943eb39168f3dc83eebddd4131614cce Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 13:36:56 2013 +0200 Bootstrapify all obsoleted site-alerts diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp index be0d019..fed4c61 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -10,7 +10,7 @@ <body> <c:if test="${schemaUpgradeRequired == 'true'}"> - <div class="site-alert"> + <div class="alert alert-danger"> <bean:message key="login.jsp.schemaupgraderequired" /> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp index 742a5bd..a1a904f 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -9,7 +9,7 @@ <body> <c:if test="${schemaUpgradeRequired == 'true'}"> - <div class="site-alert"> + <div class="alert alert-danger"> <bean:message key="login.jsp.schemaupgraderequired" /> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp index 0a4e8f4..d1136a7 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp @@ -10,7 +10,7 @@ <c:if test="${requestScope.pageList != null}"> - <div class="site-alert"> + <div class="alert alert-danger"> <bean:message key="distro-delete.jsp.cantdelete"/> </div> </c:if> diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 2b5bc13..556c0a1 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -160,7 +160,7 @@ sub proxy_entitlement_form { $subs{proxy_message} = "This machine is currently a licensed Red Hat Satellite Proxy (v$version)."; } else { - $subs{proxy_message} = "<div class=\"site-alert\">WebUI Spacewalk Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>"; + $subs{proxy_message} = "<div class=\"alert alert-danger\">WebUI Spacewalk Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>"; } $block = PXT::Utils->perform_substitutions($block, \%subs); commit ee632698b089ef680782d52ac85e00868893b7fe Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 13:30:32 2013 +0200 Adjust column sizes diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index 2a61800..3db4dfe 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -37,7 +37,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.vcpus" /> </label> - <div class="col-lg-1"> + <div class="col-lg-2"> <html:text property="vcpus" size="15" value="1" styleClass="form-control" /> </div> </div> @@ -45,7 +45,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.memory" /> </label> - <div class="col-lg-1"> + <div class="col-lg-2"> <html:text property="mem_mb" size="15" value="512" styleClass="form-control" /> </div> </div> @@ -53,7 +53,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.bridge" /> </label> - <div class="col-lg-1"> + <div class="col-lg-2"> <html:text property="bridge" size="15" value="br0" styleClass="form-control" /> </div> </div> @@ -63,7 +63,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxyserver" /> </label> - <div class="col-lg-3"> + <div class="col-lg-4"> <html:text property="proxy_server" size="30" value="" styleClass="form-control" /> </div> </div> @@ -71,7 +71,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxyuser" /> </label> - <div class="col-lg-3"> + <div class="col-lg-4"> <html:text property="proxy_user" size="15" value="" styleClass="form-control" /> </div> </div> @@ -79,7 +79,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxypass" /> </label> - <div class="col-lg-3"> + <div class="col-lg-4"> <html:password property="proxy_pass" size="15" value="" styleClass="form-control" /> </div> </div> commit ff40da3c830dc6323d82c9e6560572bdbca4b70d Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 14:07:29 2013 +0200 Panels + tables formated diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp index fee77d3..9c8d55b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp @@ -26,9 +26,6 @@ <bean:message key="channel.jsp.manage.package.title"/> </rhn:toolbar> - - - <rl:listset name="packageSet"> <rhn:csrf /> <bean:message key="channel.jsp.manage.package.message"/> @@ -83,18 +80,15 @@ ${current.provider} </rl:column> - - </rl:list> - - <p align="right"> - <input type="submit" name="confirm" value="<bean:message key="channel.jsp.manage.package.confirmbutton"/>" + <div class="text-right"> + <input type="submit" class="btn btn-default" name="confirm" value="<bean:message key="channel.jsp.manage.package.confirmbutton"/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> > - </p> + </div> <rhn:submitted/> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp index 5f99f53..077de98 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -8,17 +8,10 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> -<BR> - - - -<div> <h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="systemlist.jsp.packages"/></h2> <bean:message key="package.jsp.list"/> - - <rl:listset name="packageSet"> <rhn:csrf /> <rhn:submitted /> @@ -66,10 +59,5 @@ </rl:listset> - - -</div> - </body> -</html:html> - +</html:html> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code/webapp/WEB-INF/pages/channel/popular.jsp index fe16d36..6953269 100644 --- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"> <bean:message key="channel.nav.popular"/> </rhn:toolbar> @@ -27,11 +27,10 @@ function showFiltered() { <bean:message key="channels.popular.jsp.header1" /> </p> - <form method="post" name="rhn_list" action="/rhn/software/channels/Popular.do"> <rhn:csrf /> <rhn:submitted /> - <table class="details"> + <table class="table"> <th> <bean:message key="channels.popular.jsp.label0" />: </th> @@ -49,13 +48,11 @@ function showFiltered() { </c:forEach> </select> <bean:message key="channels.popular.jsp.label2" /> - <INPUT type="submit" value="<bean:message key="channels.popular.jsp.button" />"> + <INPUT type="submit" class="btn btn-default" value="<bean:message key="channels.popular.jsp.button" />"> </td> </table> - <BR> + <br/> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree_multiorg.jspf" %> - - </form> </body> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf index d1fc3e0..37e4fb2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf @@ -1,8 +1,9 @@ -<table class="details" width="80%"> - - <tr> <th width="10%"><bean:message key="channel.jsp.manage.package.channel"/>:</th> - <td width="40%"> - <select name="selected_channel"> +<div class="row"> + <div class="col-md-1"> + <bean:message key="channel.jsp.manage.package.channel"/>: + </div> + <div class="col-md-4"> + <select name="selected_channel" class="form-control input-sm"> <option value="all_managed_packages" <c:if test="${all_selected eq true}">selected = "selected"</c:if>><bean:message key="channel.jsp.manage.package.allpackages"/></option> <option value="orphan_packages" <c:if test="${orphan_selected eq true}">selected = "selected"</c:if>><bean:message key="channel.jsp.manage.package.packagesnochannels"/></option> <optgroup> @@ -10,7 +11,7 @@ <c:choose> <c:when test="${option.baseChannel}"> </optgroup> - <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name} </option> + <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name} </option> <optgroup> </c:when> <c:otherwise> @@ -20,12 +21,8 @@ </c:forEach> </optgroup> </select> - </td> - <td> - <input type="submit" name="view" value="<bean:message key="channel.jsp.package.viewpackages"/>"> - </td> - </tr> - - - -</table> \ No newline at end of file + </div> + <div class="col-md-7 text-left"> + <input type="submit" name="view" class="btn btn-default" value="<bean:message key="channel.jsp.package.viewpackages"/>"> + </div> +</div> \ No newline at end of file commit f3fab9463d96e66406170e6dd6fbbf512b5f8229 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 23 13:22:48 2013 +0200 use a panel for makeEmptyTable diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java index 83f2a94..ce94bb1 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java @@ -15,11 +15,6 @@ package com.redhat.rhn.frontend.action.renderers; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper; -import com.redhat.rhn.frontend.dto.SystemOverviewComparator; - import java.io.IOException; import java.util.Arrays; @@ -28,6 +23,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper; +import com.redhat.rhn.frontend.dto.SystemOverviewComparator; + /** * General helper for fragment rendering * @@ -36,21 +36,16 @@ import javax.servlet.http.HttpServletResponse; public class RendererHelper { private static final String FULL_TABLE_HEADER = - "<div style=\"clear:both; padding-top: 30px;\">" + - "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" class=\"list\">" + - "<thead><tr><th style=\"text-align:left;\">"; + "<div class=\"spacewalk-full-table panel panel-default\"><div class=\"panel-heading\"><h3 class=\"panel-title\">"; - private static final String FULL_TABLE_FOOTER = "</td></tr></thead></table></div>"; + private static final String FULL_TABLE_FOOTER = "</div></div>"; - private static final String HALF_TABLE_HEADER = - "<table cellspacing=\"0\" cellpadding=\"0\" class=\"half-table\">" + - "<thead><tr><th style=\"text-align:left;\">"; + private static final String HALF_TABLE_HEADER = + "<div class=\"spacewalk-half-table panel panel-default\"><div class=\"panel-heading\"><h3 class=\"panel-title\">"; - private static final String HALF_TABLE_FOOTER = "</td></tr></thead></table>"; + private static final String HALF_TABLE_FOOTER = "</div></div>"; - private static final String TABLE_BODY = - "</th></tr><tr class=\"list-row-odd\">" + - "<td style=\"padding-bottom: 24px;\" class=\"first-column last-column\">"; + private static final String TABLE_BODY = "</h3></div><div class=\"panel-body\">"; private RendererHelper() { commit aed62fb360c77ffa39f947ed8a8bb6feb5787d74 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 23 13:37:04 2013 +0200 TB3: Errata update form diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 9ed783a..a2e7623 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -4067,6 +4067,12 @@ value for this entitlement, excluding the default organization's consumption.</s <context context-type="sourcefile">/rhn/errata/manage/Create.do</context> </context-group> </trans-unit> + <trans-unit id="errata.create.jsp.newbug"> + <source>New Bug</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/errata/manage/Create.do</context> + </context-group> + </trans-unit> <trans-unit id="errata.create.jsp.id"> <source>ID:</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp index d0d0c2d..d4ad25f 100644 --- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp @@ -5,235 +5,255 @@ <html:xhtml/> <html> -<head> - <meta name="page-decorator" content="none" /> -</head> -<body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" - helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp" - deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}" - deletionType="errata"> - <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> - </rhn:toolbar> + <head> + <meta name="page-decorator" content="none" /> + </head> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" + helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp" + deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}" + deletionType="errata"> + <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> + </rhn:toolbar> - <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> -<%-- Publish or Send notification --%> - <html:form action="/errata/manage/Edit"> - <rhn:csrf /> - <rhn:submitted /> - <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" /> - <c:if test="${isPublished == true}"> - <h2><bean:message key="errata.edit.senderratamail"/></h2> - <div class="page-summary"> - <p><bean:message key="errata.edit.youmaynotify" /></p> - </div> - <div align="right"> - <html:submit property="dispatch"> - <bean:message key="errata.edit.sendnotification" /> - </html:submit> - </div> - </c:if> + <%-- Publish or Send notification --%> + <html:form action="/errata/manage/Edit" styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted /> + <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" /> - <c:if test="${isPublished == false}"> - <h2><bean:message key="errata.edit.publisherrata"/></h2> - <div class="page-summary"> - <p><bean:message key="errata.edit.youmaypublish" /></p> - </div> - <div align="right"> - <html:submit property="dispatch"> - <bean:message key="errata.edit.publisherrata" /> - </html:submit> - </div> - </c:if> - </html:form> + <c:if test="${isPublished == true}"> + <h2><bean:message key="errata.edit.senderratamail"/></h2> + <p><bean:message key="errata.edit.youmaynotify" /></p> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="errata.edit.sendnotification" /> + </html:submit> + </div> + </div> + </c:if> - <html:form action="/errata/manage/Edit"> - <rhn:csrf /> - <rhn:submitted /> -<%-- Edit the errata details --%> - <h2><bean:message key="errata.edit.editerrata" /></h2> + <c:if test="${isPublished == false}"> + <h2><bean:message key="errata.edit.publisherrata"/></h2> + <p><bean:message key="errata.edit.youmaypublish" /></p> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch"> + <bean:message key="errata.edit.publisherrata" /> + </html:submit> + </div> + </div> + </c:if> + </html:form> - <div class="page-summary"> - <p><bean:message key="errata.edit.instructions" /></p> - </div> -<table class="details"> - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.synopsis"/> - </th> - <td class="small-form"> - <html:text property="synopsis" size="60" maxlength="4000" /> - </td> - </tr> + <html:form action="/errata/manage/Edit" styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted /> + <%-- Edit the errata details --%> + <h2><bean:message key="errata.edit.editerrata" /></h2> + <p><bean:message key="errata.edit.instructions" /></p> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.synopsis"/> + </label> + <div class="col-lg-6"> + <html:text property="synopsis" size="60" maxlength="4000" styleClass="form-control"/> + </div> + </div> - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisory"/> - </th> - <td class="small-form"> - <html:text property="advisoryName" size="25" maxlength="32" /> - </td> - </tr> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisory"/> + </label> + <div class="col-lg-6"> + <html:text property="advisoryName" size="25" maxlength="32" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisoryrelease"/> + </label> + <div class="col-lg-6"> + <html:text property="advisoryRelease" size="4" maxlength="4" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisorytype"/> + </label> + <div class="col-lg-6"> + <html:select property="advisoryType" styleClass="form-control"> + <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/> + </html:select> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.product"/> + </label> + <div class="col-lg-6"> + <html:text property="product" size="30" maxlength="64" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.from"/> + </label> + <div class="col-lg-6"> + <html:text property="errataFrom" size="30" maxlength="127" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.topic"/> + </label> + <div class="col-lg-6"> + <html:textarea property="topic" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.description"/> + </label> + <div class="col-lg-6"> + <html:textarea property="description" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.solution"/> + </label> + <div class="col-lg-6"> + <html:textarea property="solution" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <h3><bean:message key="errata.create.jsp.bugs"/></h3> + </div> + </div> - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisoryrelease"/> - </th> - <td class="small-form"> - <html:text property="advisoryRelease" size="4" maxlength="4"/> - </td> - </tr> + <c:forEach items="${bugs}" var="bug"> + <div class="form-group"> + <div class="well well-sm"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.id"/> + </label> + <div class="col-lg-2"> + <html:text property="buglistId${bug.id}" + styleClass="form-control" + size="6" value="${bug.id}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.summary"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistSummary${bug.id}" + size="60" styleClass="form-control" + value="${bug.summary}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.bugurl"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistUrl${bug.id}" size="60" + styleClass="form-control" + value="${bug.url}" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <a class="btn btn-danger" + href="/rhn/errata/manage/DeleteBug.do?eid=<c:out value="${param.eid}"/>&bid=<c:out value="${bug.id}"/>"> + <bean:message key="errata.edit.deletebug"/> + </a> + </div> + </div> + </div> + </div> + </c:forEach> - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisorytype"/> - </th> - <td class="small-form"> - <html:select property="advisoryType"> - <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/> - </html:select> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.product"/> - </th> - <td class="small-form"> - <html:text property="product" size="30" maxlength="64" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.from"/> - </th> - <td class="small-form"> - <html:text property="errataFrom" size="30" maxlength="127" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.topic"/> - </th> - <td class="small-form"> - <html:textarea property="topic" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.description"/> - </th> - <td class="small-form"> - <html:textarea property="description" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.solution"/> - </th> - <td class="small-form"> - <html:textarea property="solution" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.bugs"/> - </th> - <td class="small-form"> - - <c:forEach items="${bugs}" var="bug"> - <table cellpadding="3"> - <tr> - <td><bean:message key="errata.create.jsp.id"/></td> - <td><html:text property="buglistId${bug.id}" size="6" - value="${bug.id}" /></td> - </tr> - <tr> - <td><bean:message key="errata.create.jsp.summary"/></td> - <td><html:text property="buglistSummary${bug.id}" size="60" - value="${bug.summary}" /></td> - </tr> - <tr> - <td><bean:message key="errata.create.jsp.bugurl"/></td> - <td><html:text property="buglistUrl${bug.id}" size="60" - value="${bug.url}" /> - -    - <a href="/rhn/errata/manage/DeleteBug.do?eid=<c:out value="${param.eid}"/>&bid=<c:out value="${bug.id}"/>"> - <img src="/img/action-del.gif" alt="<bean:message key="errata.edit.deletebug"/>" /> - </a> - </td> - </tr> - </table> - <hr /> - </c:forEach> - - <%-- Display an empty bug shell for input --%> - <table> - <tr> - <td><bean:message key="errata.create.jsp.id"/></td> - <td><html:text property="buglistIdNew" value="" size="6"/></td> - </tr> - <tr> - <td><bean:message key="errata.create.jsp.summary"/></td> - <td><html:text property="buglistSummaryNew" value="" size="60"/></td> - </tr> - <tr> - <td><bean:message key="errata.create.jsp.bugurl"/></td> - <td><html:text property="buglistUrlNew" value="" size="60"/></td> - </tr> - </table> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.keywords"/> <br /> - <bean:message key="errata.edit.commadelimited"/> - </th> - <td class="small-form"> - <html:text property="keywords" size="40"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.references"/> - </th> - <td class="small-form"> - <html:textarea property="refersTo" cols="40" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.notes"/> - </th> - <td class="small-form"> - <html:textarea property="notes" cols="40" rows="6"/> - </td> - </tr> - - </table> - - - <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" /> - <div align="right"> - <hr /> - <html:submit property="dispatch"> - <bean:message key="errata.edit.updateerrata"/> - </html:submit> - </div> - - </html:form> - -</body> + <%-- Display an empty bug shell for input --%> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <h3><bean:message key="errata.create.jsp.newbug"/></h3> + </div> + </div> + <div class="form-group"> + <div class="panel panel-default"> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.id"/> + </label> + <div class="col-lg-2"> + <html:text property="buglistIdNew" value="" size="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.summary"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistSummaryNew" value="" size="60" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.bugurl"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistUrlNew" value="" size="60" styleClass="form-control"/> + </div> + </div> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.keywords"/> + </label> + <div class="col-lg-6"> + <html:text property="keywords" size="40" styleClass="form-control"/> + <span class="help-block"> + <bean:message key="errata.edit.commadelimited"/> + </span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.references"/> + </label> + <div class="col-lg-6"> + <html:textarea property="refersTo" cols="40" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.notes"/> + </label> + <div class="col-lg-6"> + <html:textarea property="notes" cols="40" rows="6" styleClass="form-control"/> + </div> + </div> + <input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" /> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="errata.edit.updateerrata"/> + </html:submit> + </div> + </div> + </html:form> + </body> </html> commit b736f78425a6b7fc4233e7c71b308602d2d4b1d9 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 23 12:59:43 2013 +0200 fix empty lists diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index ab19441..d74fa7c 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -511,48 +511,73 @@ ul.nav.nav-tabs:last-child{ // data lists .spacewalk-list { - .spacewalk-list-top { - padding: 0.7em; - .spacewalk-list-top-wrap { - .make-row(0); - - .spacewalk-list-top-alphabar { - .make-md-column(9); - .text-left; - } - .spacewalk-list-top-addons { - .make-md-column(3); - .text-right; - } - .spacewalk-list-filter { - .make-md-column(4); - .text-left; - } - .spacewalk-list-top-pagination { - .make-md-column(8); - .text-right; - } + .spacewalk-list-top-addons { + .make-row(0); + .spacewalk-list-alphabar { + .make-md-column(9); + .text-left; + padding-left: 0; } - .spacewalk-list-top-extra { - .make-row(); + .spacewalk-list-pagination { + .make-md-column(3); + .text-right; + padding-right: 0; } + padding-top: 0.5em; } - .spacewalk-list-bottom { - .spacewalk-list-bottom-wrap { - .make-row(0); - .spacewalk-list-bottom-addons { - .make-md-column(4); - .text-left; - } - .spacewalk-list-bottom-pagination { - .make-md-column(8); + .spacewalk-list-head-addons { + padding-top: 0.7em; + .make-row(0); + .spacewalk-list-filter { + .make-md-column(4); + .text-left; + padding-left: 0; + .spacewalk-list-channel-show-hide { + .pull-right; .text-right; } } + .spacewalk-list-head-addons-extra { + .make-md-column(8); + .text-right; + padding-right: 0; + } + } + + .spacewalk-list-head-extra { + .make-row(); } + + .spacewalk-list-footer-addons { + .make-row(0); + .spacewalk-list-footer-addons-extra { + .pull-left; + .text-left; + } + .spacewalk-list-reflinks { + .pull-right; + .text-right; + } + } + .spacewalk-list-footer-extra { + } + + .spacewalk-list-bottom-addons { + .make-row(0); + .spacewalk-list-pagination { + .text-right; + .pull-right; + } + .spacewalk-list-bottom-addons-extra { + } + } +} + +.spacewalk-csv-download { + .pull-right; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 6908bc8..2b85f07 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -620,6 +620,11 @@ public class ListTag extends BodyTagSupport { if (manip.isListEmpty()) { renderEmptyList(); ListTagUtil.write(pageContext, "</table>"); + // close panel + ListTagUtil.write(pageContext, "</div>"); + // close list + ListTagUtil.write(pageContext, "</div>"); + return BodyTagSupport.SKIP_BODY; } ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), commit 454246561b3e1155d84c8d96429421369adc9204 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 23 12:39:11 2013 +0200 Port the old list and unify more code with UnpagedListDisplay diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 41ce24c..0809ae4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.taglibs; import java.io.IOException; +import java.io.Writer; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -480,20 +481,30 @@ public class ListDisplayTag extends ListDisplayTagBase { out.println(target.toString()); } + @Override + protected void renderHeadExtraAddons(Writer out) throws IOException { + renderSetButtons(out); + } - private void renderSetButtons(JspWriter out) throws IOException { + private void renderSetButtons(Writer out) throws IOException { StringBuffer buf = new StringBuffer(); - buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY, - "update_list_key_id").render()); - buf.append(" "); - buf.append(addButtonTo(buf, RequestContext.DISPATCH, SELECT_ALL_KEY).render()); - - if (numItemsChecked > 0) { - buf.append(" "); - buf.append(addButtonTo(buf, RequestContext.DISPATCH, UNSELECT_ALL_KEY) - .render()); + if (set != null) { + if (showSetButtons) { + buf.append("<span class=\"spacewalk-list-selection-btns\">"); + buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY, + "update_list_key_id").render()); + buf.append(" "); + buf.append(addButtonTo(buf, RequestContext.DISPATCH, SELECT_ALL_KEY).render()); + + if (numItemsChecked > 0) { + buf.append(" "); + buf.append(addButtonTo(buf, RequestContext.DISPATCH, UNSELECT_ALL_KEY) + .render()); + } + buf.append("</span>"); + } } - out.println(buf.toString()); + out.append(buf.toString()); } private HtmlTag addButtonTo(StringBuffer buf, String name, @@ -862,30 +873,7 @@ public class ListDisplayTag extends ListDisplayTagBase { out.print("<div class=\"panel panel-default\">"); - out.print("<div class=\"panel-heading\">"); - - renderTitle(out); - - out.println("<div class=\"spacewalk-list-head-addons\">"); - out.println("<div class=\"spacewalk-list-filter\">"); - if (getPageList().hasFilter()) { - renderFilterBox(out); - } - out.println("</div>"); - out.println("<div class=\"spacewalk-list-head-addons-extra\">"); - if (set != null) { - if (showSetButtons) { - out.print("<span class=\"spacewalk-list-selection-btns\">"); - renderSetButtons(out); - out.print("</span>"); - } - } - out.println("</div>"); - out.println("</div>"); - - - // end panel heading - out.println("</div>"); + renderPanelHeading(out); /* If the type is list, we must set the width explicitly. Otherwise, * it shouldn't matter diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java index e2b4eda..444f2a6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -2,6 +2,7 @@ package com.redhat.rhn.frontend.taglibs; import java.io.IOException; import java.io.StringWriter; +import java.io.Writer; import java.util.Iterator; import javax.servlet.jsp.JspTagException; @@ -227,21 +228,56 @@ public class ListDisplayTagBase extends BodyTagSupport { iterator = pageList.iterator(); } + protected void renderHeadExtraAddons(Writer out) throws IOException { + // noop + } + + protected void renderPanelHeading(JspWriter out) throws IOException { + + StringWriter headFilterContent = new StringWriter(); + StringWriter titleContent = new StringWriter(); + StringWriter headAddons = new StringWriter(); + + renderTitle(titleContent); + if (getPageList().hasFilter()) { + headFilterContent.append("<div class=\"spacewalk-list-filter\">"); + renderFilterBox(headFilterContent); + headFilterContent.append("</div>"); + } + renderHeadExtraAddons(headAddons); + + int headContentLength = headFilterContent.getBuffer().length() + + titleContent.getBuffer().length() + + headAddons.getBuffer().length(); + + if (headContentLength > 0) { + out.println("<div class=\"panel-heading\">"); + out.println(titleContent.toString()); + out.println("<div class=\"spacewalk-list-head-addons\">"); + out.println(headFilterContent.toString()); + out.println("<div class=\"spacewalk-list-head-addons-extra\">"); + out.println(headAddons.toString()); + out.println("</div>"); + out.println("</div>"); + out.println("</div>"); + } + } + /** * Renders the title header if set. * @param out JspWriter * @throws IOException thrown if there's a problem writing to the JSP */ - protected void renderTitle(JspWriter out) throws IOException { + protected void renderTitle(Writer out) throws IOException { if (!StringUtils.isEmpty(title)) { HtmlTag h4 = new HtmlTag("h4"); h4.setAttribute("class", "panel-title"); h4.addBody(LocalizationService.getInstance().getMessage(title)); - out.println(h4.render()); + out.append(h4.render()); } } - protected void renderFilterBox(JspWriter out) throws IOException { + protected void renderFilterBox(Writer out) throws IOException { LocalizationService ls = LocalizationService.getInstance(); HtmlTag tag = new HtmlTag("div"); @@ -280,7 +316,7 @@ public class ListDisplayTagBase extends BodyTagSupport { buf.append(btnSpan.render()); tag.addBody(buf.toString()); - out.println(tag.render()); + out.append(tag.render()); } /** {@inheritDoc} */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java index f0611b5..76b5112 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.taglibs; import java.io.IOException; +import java.io.Writer; import java.util.Arrays; import java.util.Collections; @@ -142,18 +143,17 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase { // RENDER methods ////////////////////////////////////////////////////////////////////////// - @Override - protected void renderFilterBox(JspWriter out) throws IOException { - super.renderFilterBox(out); + protected void renderHeadExtraAddons(Writer out) throws IOException { + super.renderHeadExtraAddons(out); LocalizationService ls = LocalizationService.getInstance(); if (getType().equals("treeview")) { - out.print("<div style=\"text-align: right;\">" + out.append("<div class=\"spacewalk-list-channel-show-hide\">" + - "<a href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + + "<a class=\"spacewalk-list-channel-show-all\" href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + ls.getMessage("channels.overview.showall") + "</a>  |  " + - "<a href=\"javascript:hideAllRows();\" style=\"cursor: pointer;\">" + + "<a class=\"spacewalk-list-channel-hide-all\" href=\"javascript:hideAllRows();\" style=\"cursor: pointer;\">" + ls.getMessage("channels.overview.hideall") + "</a></div>"); } } @@ -266,10 +266,10 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase { doSort(sortedColumn); } - out.print("<div class=\"spacewalk-list-container\">"); - out.print("<div class=\"spacewalk-list panel panel-default\">"); + out.print("<div class=\"spacewalk-list\">"); + out.print("<div class=\"panel panel-default\">"); - renderTitle(out); + renderPanelHeading(out); /* If the type is list, we must set the width explicitly. Otherwise, * it shouldn't matter @@ -291,18 +291,6 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase { out.println(">"); - out.println("<thead>"); - - out.println("\n<tr>"); - out.println("\n<td colspan=\"" + getColumnCount() + "\">"); - if (getPageList().hasFilter()) { - renderFilterBox(out); - } - out.println("\n</td>"); - out.println("\n</tr>"); - - out.println("\n<tr>"); - if (getIterator() != null && getIterator().hasNext()) { // Push a new BodyContent writer onto the stack so that // we can buffer the body data. diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index ec107a7..6908bc8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -1046,7 +1046,6 @@ public class ListTag extends BodyTagSupport { } } - ListTagUtil.write(pageContext, "  "); ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES, manip.getPaginationLinks()); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java index 71f985e..4ead24f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java @@ -108,6 +108,20 @@ public abstract class BaseListDecorator implements ListDecorator { /** * {@inheritDoc} */ + public void onHeadExtraContent() throws JspException { + + } + + /** + * {@inheritDoc} + */ + public void onFooterExtraContent() throws JspException { + + } + + /** + * {@inheritDoc} + */ public void onBottomExtraContent() throws JspException { } @@ -115,14 +129,28 @@ public abstract class BaseListDecorator implements ListDecorator { /** * {@inheritDoc} */ - public void onTopAddons() throws JspException { + public void onTopExtraAddons() throws JspException { + + } + + /** + * {@inheritDoc} + */ + public void onHeadExtraAddons() throws JspException { + + } + + /** + * {@inheritDoc} + */ + public void onFooterExtraAddons() throws JspException { } /** * {@inheritDoc} */ - public void onBottomAddons() throws JspException { + public void onBottomExtraAddons() throws JspException { } } commit 895e161ee3cde2e38ff4503cae12f37268e62919 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 23 11:44:25 2013 +0200 New list structure based on Cynthia's mockup. Updated decorator and its documentation to reflect the structure. Also updated https://fedorahosted.org/spacewalk/wiki/UserInterface diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 933c927..41ce24c 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -456,7 +456,7 @@ public class ListDisplayTag extends ListDisplayTagBase { if (request.getQueryString() != null) { page.append("&" + request.getQueryString()); } - out.println("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + page + + out.println("<div class=\"spacewalk-csv-download\"><a href=\"" + page + "\"><i class=\"spacewalk-icon-download-csv\"></i>" + LocalizationService.getInstance().getMessage("listdisplay.csv") + "</a></div>"); @@ -610,9 +610,7 @@ public class ListDisplayTag extends ListDisplayTagBase { return; } - - out.println("<div class=\"text-right\">"); - + out.println("<div>"); if (getButton() != null && AclManager.hasAcl(getButtonAcl(), (HttpServletRequest) pageContext.getRequest(), getMixins())) { @@ -836,47 +834,45 @@ public class ListDisplayTag extends ListDisplayTagBase { doSort(sortedColumn); } - out.print("<div class=\"spacewalk-list-container\">"); - out.print("<div class=\"spacewalk-list panel panel-default\">"); + out.print("<div class=\"spacewalk-list\">"); - renderTitle(out); - - /* If the type is list, we must set the width explicitly. Otherwise, - * it shouldn't matter + out.println("<div class=\"spacewalk-list-top-addons\">"); + out.println("<div class=\"spacewalk-list-alphabar\">"); + /* + * If pageList contains an index and pageList.size() (what we are + * displaying on the page) is less than pageList.getTotalSize() (the + * total number of items in the data result), render alphabar. This + * prevents the alphabar from showing up on pages that show all of + * the entries on a single page and is similar to how the perl code + * behaves. */ - if (type.equals("list")) { - out.print("<table class=\"table table-striped\""); + if (getPageList().getIndex().size() > 0 + && getPageList().size() < getPageList().getTotalSize()) { + + renderViewAllLink(out); + renderAlphabar(out); } - else { - out.print("<table class=\"" + type + "\""); + out.println("</div>"); + if (isPaging()) { + renderPagination(out, true); + renderBoundsVariables(out); } + out.println("</div>"); - /*if (isTransparent()) { - out.print(" style=\"border-bottom: 1px solid #ffffff;\" "); - }*/ - - if (tableId != null) { - out.print(" id=\"" + tableId + "\""); - } - out.println(">"); + out.print("<div class=\"panel panel-default\">"); - // we render the pagination controls as an additional head - out.println("<thead>"); - out.println("<tr>"); - out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); + out.print("<div class=\"panel-heading\">"); - out.println("<div class=\"spacewalk-list-top\">"); - out.println("<div class=\"spacewalk-list-top-wrap\">"); - out.println("<div class=\"spacewalk-list-top-alphabar\">"); - if (getPageList().getIndex().size() > 0 - && getPageList().size() < getPageList().getTotalSize()) { + renderTitle(out); - renderViewAllLink(out); - renderAlphabar(out); + out.println("<div class=\"spacewalk-list-head-addons\">"); + out.println("<div class=\"spacewalk-list-filter\">"); + if (getPageList().hasFilter()) { + renderFilterBox(out); } out.println("</div>"); - out.println("<div class=\"spacewalk-list-top-addons\">"); + out.println("<div class=\"spacewalk-list-head-addons-extra\">"); if (set != null) { if (showSetButtons) { out.print("<span class=\"spacewalk-list-selection-btns\">"); @@ -886,32 +882,33 @@ public class ListDisplayTag extends ListDisplayTagBase { } out.println("</div>"); out.println("</div>"); - out.println("<div class=\"spacewalk-list-top-wrap\">"); - out.println("<div class=\"spacewalk-list-filter\">"); - if (getPageList().hasFilter()) { - renderFilterBox(out); - } - out.println("</div>"); - out.println("<div class=\"spacewalk-list-top-pagination\">"); - if (isPaging()) { - renderPagination(out, true); - renderBoundsVariables(out); - } - out.println("</div>"); - out.println("</div>"); + + + // end panel heading out.println("</div>"); - /* If pageList contains an index and pageList.size() (what we are - * displaying on the page) is less than pageList.getTotalSize() - * (the total number of items in the data result), render alphabar. - * This prevents the alphabar from showing up on pages that show - * all of the entries on a single page and is similar to how the - * perl code behaves. + + /* If the type is list, we must set the width explicitly. Otherwise, + * it shouldn't matter */ + if (type.equals("list")) { + out.print("<table class=\"table table-striped\""); + } + else { + out.print("<table class=\"" + type + "\""); + } + + /*if (isTransparent()) { + out.print(" style=\"border-bottom: 1px solid #ffffff;\" "); + }*/ + if (tableId != null) { + out.print(" id=\"" + tableId + "\""); + } - out.println("</td>"); - out.println("</tr>"); + out.println(">"); + // we render the pagination controls as an additional head + out.println("<thead>"); out.println("\n<tr>"); if (getIterator() != null && getIterator().hasNext()) { @@ -972,22 +969,56 @@ public class ListDisplayTag extends ListDisplayTagBase { } out.println("</tbody>"); + out.println("</table>"); + /* If the type is a half-table, we must draw an extra row on the * end of the table if the reflink has been set */ - out.println("<tfoot>"); - out.println("<tr>"); - out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); + out.println("<div class=\"panel-footer\">"); + out.println("<div class=\"spacewalk-list-footer-addons\">"); + out.println("<div class=\"spacewalk-list-footer-addons-extra\">"); + if (isPaging()) { + renderActionButtons(out); + } + out.println("</div>"); + out.println("<div class=\"spacewalk-list-reflinks\">"); + if (reflink != null) { + setColumnCount(0); + out.println("<a href=\"" + reflink + "\" >"); - out.println("<div class=\"spacewalk-list-bottom\">"); - out.println("<div class=\"spacewalk-list-bottom-wrap\">"); - out.println("<div class=\"spacewalk-list-bottom-addons\">"); + /* + * Here we render the reflink and its key. If the key hasn't + * been set we just display the link address itself. + */ + if (reflinkkey != null) { + Object[] args = new Object[2]; + + args[0] = new Integer(getPageList().getTotalSize()); + args[1] = reflinkkeyarg0; + + String message = LocalizationService.getInstance() + .getMessage(reflinkkey, args); + out.println(message); + } else { + out.println(reflink); + } + + out.println("</a>"); + } out.println("</div>"); - out.println("<div class=\"spacewalk-list-bottom-pagination\">"); + out.println("</div>"); + + // close footer + out.println("</div>"); + + // close panel + out.println("</div>"); + + out.println("<div class=\"spacewalk-list-bottom-addons\">"); + out.println("<div class=\"spacewalk-list-pagination\">"); /* If paging is on, we render the pagination */ if (isPaging()) { renderPagination(out, false); - renderActionButtons(out); } /* If paging is off and we are rendering a normal list, * we show a count of the results in the lower left corner @@ -1006,59 +1037,18 @@ public class ListDisplayTag extends ListDisplayTagBase { args[2] = new Integer(getPageList().getTotalSize()); args[3] = LocalizationService.getInstance().getMessage(description); - out.print("<span class=\"text-left\">\n"); + out.print("<span class=\"text-right\">\n"); out.print(LocalizationService.getInstance() .getMessage("message.range.withtypedescription", args)); out.println("</span>"); } out.println("</div>"); out.println("</div>"); - out.println("<div class=\"spacewalk-list-extra\">"); - out.println("</div>"); - - out.println("</div>"); - - out.println("</tr>"); - out.println("</td>"); - out.println("</tfoot>\n"); - - out.println("</table>\n"); - - if (reflink != null) { - setColumnCount(0); - - out.println("<div class=\"panel-footer\">"); - - out.println("<a href=\"" + reflink + "\" >"); - - /* Here we render the reflink and its key. If the key hasn't been set - * we just display the link address itself. - */ - if (reflinkkey != null) { - Object[] args = new Object[2]; - - args[0] = new Integer(getPageList().getTotalSize()); - args[1] = reflinkkeyarg0; - - String message = LocalizationService.getInstance(). - getMessage(reflinkkey, args); - out.println(message); - } - else { - out.println(reflink); - } - - out.println("</a>"); - out.println("</div>"); - } - - out.println("</div>\n"); // export button goes outside of the panel if (getExportColumns() != null) { renderExport(out); } - out.println("</div>\n"); setColumnCount(0); setNumberOfColumns(0); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java index 5b560cf..e2b4eda 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -234,13 +234,10 @@ public class ListDisplayTagBase extends BodyTagSupport { */ protected void renderTitle(JspWriter out) throws IOException { if (!StringUtils.isEmpty(title)) { - HtmlTag heading = new HtmlTag("div"); - heading.setAttribute("class", "panel-heading"); - HtmlTag h3 = new HtmlTag("h3"); - h3.setAttribute("class", "panel-title"); - h3.addBody(LocalizationService.getInstance().getMessage(title)); - heading.addBody(h3); - out.println(heading.render()); + HtmlTag h4 = new HtmlTag("h4"); + h4.setAttribute("class", "panel-title"); + h4.addBody(LocalizationService.getInstance().getMessage(title)); + out.println(h4.render()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java index 0e729a7..382f299 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java @@ -196,7 +196,7 @@ public class CSVTag extends BodyTagSupport { private void renderExport() throws JspException { StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI); page.append("?" + makeCSVRequestParams()); - String exportLink = new String("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + + String exportLink = new String("<div class=\"spacewalk-csv-download\"><a href=\"" + page + "\"><i class=\"spacewalk-icon-download-csv\"></i>" + LocalizationService.getInstance().getMessage( "listdisplay.csv") + "</a></div>"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 1a99031..ec107a7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -406,8 +406,6 @@ public class ListTag extends BodyTagSupport { */ @Override public int doEndTag() throws JspException { - ListTagUtil.write(pageContext, "</div>"); - // print the hidden fields after the list widget is printed // but before the form of the listset is closed. ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, @@ -450,128 +448,144 @@ public class ListTag extends BodyTagSupport { if (haveColsEnumerated && !haveTblHeadingRendered) { ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.TBL_HEADING); - - // only if there is a title, add a panel-heading - if (!StringUtils.isBlank(title)) { - ListTagUtil.write(pageContext, "<div class=\"panel-heading\">"); - HtmlTag h3 = new HtmlTag("h3"); - h3.setAttribute("class", "panel-title"); - h3.addBody(title); - ListTagUtil.write(pageContext, h3.render()); - ListTagUtil.write(pageContext, "</div>"); - } } else if (haveColsEnumerated && !haveTblAddonsRendered) { - startTable(); - - // as the header addons is populated with decorators, we don't - // know if there will be content or not, but we want to avoid - // writing the head tag at all if there is none, so we push a - // buffer into the stack, and empty it later. - StringWriter theadAlphaBarContent = new StringWriter(); - StringWriter theadAddons = new StringWriter(); - StringWriter theadBeforeTopPagDecContent = new StringWriter(); - StringWriter theadFilterContent = new StringWriter(); - StringWriter theadExtraContent = new StringWriter(); - setupManipulator(); manip.sort(); pageData = manip.getPage(); - pageContext.pushBody(theadAlphaBarContent); + StringWriter topAlphaBarContent = new StringWriter(); + StringWriter topPaginationContent = new StringWriter(); + StringWriter topAddonsContent = new StringWriter(); + StringWriter topExtraContent = new StringWriter(); + + pageContext.pushBody(topAlphaBarContent); if (!manip.isListEmpty() && !StringUtils.isBlank(alphaBarColumn)) { AlphaBarHelper.getInstance().writeAlphaBar(pageContext, manip.getAlphaBarIndex(), getUniqueName()); } pageContext.popBody(); - pageContext.pushBody(theadAddons); + pageContext.pushBody(topPaginationContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.setCurrentList(this); - dec.onTopAddons(); + dec.beforeTopPagination(); } } + renderTopPaginationControls(); pageContext.popBody(); - pageContext.pushBody(theadFilterContent); - if (filter != null && manip.getUnfilteredDataSize() != 0) { - ListTagUtil.renderFilterUI(pageContext, filter, - getUniqueName(), width, columnCount, - searchParent, searchChild); + pageContext.pushBody(topAddonsContent); + if (!isEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onTopExtraAddons(); + } } pageContext.popBody(); + + int topContentLength = topAddonsContent.getBuffer().length() + + topAlphaBarContent.getBuffer().length() + + topPaginationContent.getBuffer().length() + + topExtraContent.getBuffer().length(); - pageContext.pushBody(theadBeforeTopPagDecContent); + if (topContentLength > 0) { + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-addons\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-alphabar\">"); + ListTagUtil.write(pageContext, topAlphaBarContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-pagination\">"); + ListTagUtil.write(pageContext, topPaginationContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-addons-extra\">"); + ListTagUtil.write(pageContext, topAddonsContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-extra\">"); + ListTagUtil.write(pageContext, "</div>"); + } + + ListTagUtil.write(pageContext, "<div class=\"panel panel-default\">"); + // as the header addons is populated with decorators, we don't + // know if there will be content or not, but we want to avoid + // writing the head tag at all if there is none, so we push a + // buffer into the stack, and empty it later. + StringWriter headAddons = new StringWriter(); + StringWriter headFilterContent = new StringWriter(); + StringWriter headExtraContent = new StringWriter(); + + pageContext.pushBody(headAddons); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.setCurrentList(this); - dec.beforeTopPagination(); + dec.onHeadExtraAddons(); } } pageContext.popBody(); - pageContext.pushBody(theadExtraContent); + pageContext.pushBody(headFilterContent); + if (filter != null && manip.getUnfilteredDataSize() != 0) { + ListTagUtil.renderFilterUI(pageContext, filter, + getUniqueName(), width, columnCount, + searchParent, searchChild); + } + pageContext.popBody(); + + pageContext.pushBody(headExtraContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.setCurrentList(this); - dec.onTopExtraContent(); + dec.onHeadExtraContent(); } } pageContext.popBody(); - ListTagUtil.write(pageContext, "<thead>"); + int headContentLength = headFilterContent.getBuffer().length() + + headAddons.getBuffer().length() + + headExtraContent.getBuffer().length(); + if (!StringUtils.isBlank(title)) { + headContentLength += title.length(); + } // this avoid render the row is there is no content at all - if ((theadAlphaBarContent.getBuffer().length() + - theadFilterContent.getBuffer().length() + - theadBeforeTopPagDecContent.getBuffer().length() + - theadAddons.getBuffer().length()) > 0) { + if (headContentLength > 0) { + ListTagUtil.write(pageContext, "<div class=\"panel-heading\">"); + // only if there is a title, add a panel-heading + if (!StringUtils.isBlank(title)) { + HtmlTag h3 = new HtmlTag("h3"); + h3.setAttribute("class", "panel-title"); + h3.addBody(title); + ListTagUtil.write(pageContext, h3.render()); + } // render the navigation and filters as a row of the header - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td colspan=\"" - + getColumnCount() + "\">"); ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top\">"); + "<div class=\"spacewalk-list-head-addons\">"); ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-wrap\">"); - ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-alphabar\">"); - ListTagUtil.write(pageContext, theadAlphaBarContent.toString()); - ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-addons\">"); - ListTagUtil.write(pageContext, theadAddons.toString()); - ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "</div>"); - - ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-wrap\">"); - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-filter\">"); - ListTagUtil.write(pageContext, theadFilterContent.toString()); + ListTagUtil.write(pageContext, headFilterContent.toString()); ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-pagination\">"); - ListTagUtil.write(pageContext, - theadBeforeTopPagDecContent.toString()); - // column with the pagination controls - renderTopPaginationControls(); + "<div class=\"spacewalk-list-head-addons-extra\">"); + ListTagUtil.write(pageContext, headAddons.toString()); ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-top-extra\">"); - ListTagUtil.write(pageContext, theadExtraContent.toString()); + "<div class=\"spacewalk-list-head-extra\">"); + ListTagUtil.write(pageContext, headExtraContent.toString()); ListTagUtil.write(pageContext, "</div>"); - + // close the panel heading ListTagUtil.write(pageContext, "</div>"); - - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); } HttpServletRequest request = (HttpServletRequest) pageContext @@ -591,6 +605,8 @@ public class ListTag extends BodyTagSupport { if (haveColsEnumerated && haveTblAddonsRendered && !haveColHeadersRendered) { + startTable(); + ListTagUtil.write(pageContext, "<thead>"); // open the row tag for the column header th's ListTagUtil.write(pageContext, "<tr>"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), @@ -634,31 +650,36 @@ public class ListTag extends BodyTagSupport { else if (haveTblFootersRendered) { retval = BodyTagSupport.SKIP_BODY; + ListTagUtil.write(pageContext, "</table>"); // as the footer addons are populated with decorators, we don't // know if there will be content or not, but we want to avoid // writing the tfoot tag at all if there is none, so we push a // buffer into the stack, and empty it later. - StringWriter tfootAddonsContent = new StringWriter(); - pageContext.pushBody(tfootAddonsContent); - renderFooterPaginationControls(); - pageContext.popBody(); + StringWriter footAddonsContent = new StringWriter(); + StringWriter footLinksContent = new StringWriter(); + StringWriter footExtraContent = new StringWriter(); - if (tfootAddonsContent.getBuffer().length() > 0) { - // render the pagination controls as the footer of the table - ListTagUtil.write(pageContext, "<tfoot>"); - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); - ListTagUtil.write(pageContext, tfootAddonsContent.toString()); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); - ListTagUtil.write(pageContext, "</tfoot>"); + pageContext.pushBody(footAddonsContent); + if (!manip.isListEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.onFooterExtraAddons(); + dec.setCurrentList(null); + } } + pageContext.popBody(); - ListTagUtil.write(pageContext, "</table>"); + pageContext.pushBody(footExtraContent); + if (!manip.isListEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.onFooterExtraContent(); + dec.setCurrentList(null); + } + } + pageContext.popBody(); + pageContext.pushBody(footLinksContent); // if there is reference links, put them as a panel footer if ((refLink != null) && (!isEmpty())) { - ListTagUtil.write(pageContext, "<div class=\"panel-footer\">"); ListTagUtil.write(pageContext, "<a href=\"" + refLink + "\" >"); /* Here we render the reflink and its key. If the key hasn't been set @@ -678,10 +699,59 @@ public class ListTag extends BodyTagSupport { } ListTagUtil.write(pageContext, "</a>"); + } + pageContext.popBody(); + + int footerContentLength = footLinksContent.getBuffer().length() + + footAddonsContent.getBuffer().length() + + footExtraContent.getBuffer().length(); + + if (footerContentLength > 0) { + ListTagUtil.write(pageContext, "<div class=\"panel-footer\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-footer-addons\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-reflinks\">"); + ListTagUtil.write(pageContext, footLinksContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-footer-addons-extra\">"); + ListTagUtil.write(pageContext, footAddonsContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-footer-extra\">"); + ListTagUtil.write(pageContext, footExtraContent.toString()); + ListTagUtil.write(pageContext, "</div>"); // closes the panel footer ListTagUtil.write(pageContext, "</div>"); } + // close the panel + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-bottom-addons\">"); + renderFooterPaginationControls(); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-bottom-addons-extra\">"); + if (!isEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onBottomExtraAddons(); + } + } + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-bottom-addons-extra\">"); + if (!isEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onBottomExtraContent();; + } + } + ListTagUtil.write(pageContext, "</div>"); // we render the hidden fields outside of the table if (isSortable()) { renderSortableHiddenFields(); @@ -758,10 +828,9 @@ public class ListTag extends BodyTagSupport { dec.beforeList(); } - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list panel panel-default\" id=\"" + getUniqueName() + "\">"); - + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list\" id=\"" + getUniqueName() + "\">"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.ENUMERATE); + ListCommand.ENUMERATE); return BodyTagSupport.EVAL_BODY_INCLUDE; } @@ -903,12 +972,11 @@ public class ListTag extends BodyTagSupport { } private void startTable() throws JspException { - ListTagUtil.write(pageContext, "<table class=\"table table-striped\""); + ListTagUtil.write(pageContext, "<table class=\"table table-striped "); if (styleClass != null) { - ListTagUtil.write(pageContext, " class=\""); ListTagUtil.write(pageContext, styleClass); - ListTagUtil.write(pageContext, "\""); } + ListTagUtil.write(pageContext, "\""); ListTagUtil.write(pageContext, " id=\""); ListTagUtil.write(pageContext, getStyleId()); @@ -947,20 +1015,8 @@ public class ListTag extends BodyTagSupport { return; } - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom\">"); - ListTagUtil.write(pageContext, - "<div class=\"spacewalk-list-bottom-wrap\">"); - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-addons\">"); - if (!manip.isListEmpty()) { - for (ListDecorator dec : getDecorators()) { - dec.onBottomAddons(); - dec.setCurrentList(null); - } - } - ListTagUtil.write(pageContext, "</div>"); - - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-pagination\">"); + "<div class=\"spacewalk-list-pagination\">"); if (!isEmpty() && !hidePageNums) { ListTagUtil.write(pageContext, manip.getPaginationMessage()); } @@ -973,28 +1029,13 @@ public class ListTag extends BodyTagSupport { } } - ListTagUtil.write(pageContext, "  "); ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES, manip.getPaginationLinks()); ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "</div>"); - - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-extra\">"); - if (!manip.isListEmpty()) { - for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); - dec.onBottomExtraContent(); - dec.setCurrentList(null); - } - } - ListTagUtil.write(pageContext, "</div>"); - - ListTagUtil.write(pageContext, "</div>"); } private void renderTopPaginationControls() throws JspException { - if (!isEmpty() && !hidePageNums) { ListTagUtil.write(pageContext, manip.getPaginationMessage()); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index f907f8b..8cff5d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -15,15 +15,6 @@ package com.redhat.rhn.frontend.taglibs.list; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.taglibs.list.decorators.ExtraButtonDecorator; - -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.StringEscapeUtils; - import java.io.IOException; import java.io.Writer; import java.util.Enumeration; @@ -42,6 +33,15 @@ import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.decorators.ExtraButtonDecorator; + /** * Provides various utility functions for the ListTag, ColumnTag, and SpanTag * @@ -573,7 +573,7 @@ public class ListTagUtil { for (int x = 0; x < linkNames.length; x++) { String[] linkData = (String[]) links.get(linkNames[x]); ListTagUtil.write(pageContext, "<button "); - ListTagUtil.write(pageContext, "class=\"btn btn-default "); + ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs "); ListTagUtil.write(pageContext, linkData[0]); // if the link is disabled... @@ -586,7 +586,7 @@ public class ListTagUtil { ListTagUtil.write(pageContext, "\" value=\""); ListTagUtil.write(pageContext, linkData[2]); } - ListTagUtil.write(pageContext, "\" />"); + ListTagUtil.write(pageContext, "\"></button>"); /* if (linkData[1] = null) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java index 9a6b0fd..af145f4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators; -import com.redhat.rhn.frontend.taglibs.list.ListSetTag; -import com.redhat.rhn.frontend.taglibs.list.ListTag; - import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; +import com.redhat.rhn.frontend.taglibs.list.ListSetTag; +import com.redhat.rhn.frontend.taglibs.list.ListTag; + /** * Decorator for a given list * @@ -76,32 +76,74 @@ public interface ListDecorator { void setCurrentList(ListTag currentList); /** - * Notifies the decorator that the list is about to render the top pagination control - * @throws JspException exception + * Use this hook to insert content before the top pagination + * + * @throws JspException + * exception */ void beforeTopPagination() throws JspException; /** - * Notifies the decorator that the list is on the top extra content section - * @throws JspException exception + * With this hook one can insert content before the list + * + * @throws JspException + * exception */ void onTopExtraContent() throws JspException; /** - * Notifies the decorator that the list is on the bottom extra content section - * @throws JspException exception + * With this hook one can insert content in the heading + * + * @throws JspException + * exception + */ + void onHeadExtraContent() throws JspException; + + /** + * With this hook one can insert content in the footer + * + * @throws JspException + * exception + */ + void onFooterExtraContent() throws JspException; + + /** + * With this hook one can insert content after the list + * + * @throws JspException + * exception */ void onBottomExtraContent() throws JspException; /** - * Notifies the decorator that the list is in the addons section - * @throws JspException something bad happened + * With this hook one can insert extra addons in the before the list + * + * @throws JspException + * something bad happened */ - void onTopAddons() throws JspException; + void onTopExtraAddons() throws JspException; /** - * Notifies the decorator that the list is in the addons section - * @throws JspException something bad happened + * With this hook one can insert extra addons in the heading + * + * @throws JspException + * something bad happened + */ + void onHeadExtraAddons() throws JspException; + + /** + * With this hook one can insert extra addons in the footer + * + * @throws JspException + * something bad happened + */ + void onFooterExtraAddons() throws JspException; + + /** + * With this hook one can insert extra addons after the list + * + * @throws JspException + * something bad happened */ - void onBottomAddons() throws JspException; + void onBottomExtraAddons() throws JspException; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index c19bcf0..b5e6a4e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators; -import com.redhat.rhn.common.conf.ConfigDefaults; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -29,6 +21,14 @@ import java.util.List; import javax.servlet.ServletRequest; import javax.servlet.jsp.JspException; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; + +import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; + /** * PageSizeDecorator * @version $Rev$ @@ -107,7 +107,7 @@ public class PageSizeDecorator extends BaseListDecorator { * {@inheritDoc} */ @Override - public void onTopAddons() throws JspException { + public void onHeadExtraAddons() throws JspException { if (!getCurrentList().isEmpty()) { StringBuilder stringBuild = new StringBuilder(); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java index ad29244..b5b978b 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java @@ -66,7 +66,7 @@ public class SelectableDecorator extends BaseListDecorator { } @Override - public void onBottomAddons() throws JspException { + public void onFooterExtraAddons() throws JspException { renderSelectButtons(); } @@ -98,7 +98,7 @@ public class SelectableDecorator extends BaseListDecorator { pageContext.getRequest()); if (!RhnSetDecl.SYSTEMS.getLabel().equals(setName)) { String msg = ls.getMessage("message.numselected", args); - ListTagUtil.write(pageContext, " <strong><span id=\""); + ListTagUtil.write(pageContext, "<span id=\""); if (isHeader) { ListTagUtil.write(pageContext, "pagination_selcount_top"); } @@ -107,7 +107,7 @@ public class SelectableDecorator extends BaseListDecorator { } ListTagUtil.write(pageContext, "\">"); ListTagUtil.write(pageContext, msg); - ListTagUtil.write(pageContext, "</span></strong>"); + ListTagUtil.write(pageContext, "</span>"); } } } commit eee345fd7e373144d769846f60d1eba04a4c3a16 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 22 15:43:51 2013 +0200 Refactor UnpagedListDisplayTag and ListDisplayTag so that all the copy pasted code is now common in ListDisplayTagBase. diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 728864e..ab19441 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -514,7 +514,7 @@ ul.nav.nav-tabs:last-child{ .spacewalk-list-top { padding: 0.7em; .spacewalk-list-top-wrap { - .make-row(); + .make-row(0); .spacewalk-list-top-alphabar { .make-md-column(9); @@ -539,6 +539,20 @@ ul.nav.nav-tabs:last-child{ .make-row(); } } + + .spacewalk-list-bottom { + .spacewalk-list-bottom-wrap { + .make-row(0); + .spacewalk-list-bottom-addons { + .make-md-column(4); + .text-left; + } + .spacewalk-list-bottom-pagination { + .make-md-column(8); + .text-right; + } + } + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index a4b0bd4..933c927 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -15,28 +15,7 @@ package com.redhat.rhn.frontend.taglibs; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.CSVWriter; -import com.redhat.rhn.common.util.DynamicComparator; -import com.redhat.rhn.common.util.ExportWriter; -import com.redhat.rhn.common.util.ServletExportHandler; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.listview.AlphaBar; -import com.redhat.rhn.frontend.listview.PaginationUtil; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; -import com.redhat.rhn.manager.acl.AclManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; - import java.io.IOException; -import java.io.StringWriter; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -48,10 +27,24 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTagSupport; + +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.DynamicComparator; +import com.redhat.rhn.common.util.ExportWriter; +import com.redhat.rhn.common.util.ServletExportHandler; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.frontend.dto.UserOverview; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.listview.AlphaBar; +import com.redhat.rhn.frontend.listview.PaginationUtil; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.acl.AclManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; /** * The ListDisplayTag defines the structure of the ListView. This tag iterates @@ -135,8 +128,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; * @see com.redhat.rhn.frontend.taglibs.SetTag * @see com.redhat.rhn.domain.rhnset.RhnSet */ -public class ListDisplayTag extends BodyTagSupport { - public static final String FILTER_DISPATCH = "filter.dispatch"; +public class ListDisplayTag extends ListDisplayTagBase { private static final String LAST = "Last"; private static final String NEXT = "Next"; private static final String PREV = "Prev"; @@ -147,21 +139,9 @@ public class ListDisplayTag extends BodyTagSupport { private static final String FIRST_LOWER = "first_lower"; private static final Set PAGINATION_WASH_SET = buildPaginationWashSet(); - /** iterates through the page list */ - private Iterator iterator; - /** list of data to show on page */ - private DataResult pageList; /** row count determines whether we're an even or odd row */ protected int rowCnt = 0; - /** How many columns are there? */ - protected int numberOfColumns = 0; - /** Which column are we rendering now? */ - protected int columnCount = 0; - - private String filterBy; private RhnSet set; - private String hiddenvars; - /** contains the number of items checked */ private int numItemsChecked; /** true if we are to show the set operation buttons */ private boolean showSetButtons; @@ -195,18 +175,13 @@ public class ListDisplayTag extends BodyTagSupport { */ private boolean transparent = false; /** determines whether we should show the disabled CSS */ - private boolean renderDisabled; - /** buttons and associated acls */ private String button; private String buttonAcl; private String button2; private String button2Acl; private String mixins; private String domainClass; - /** comma separated list of columns to be exported */ - private String exportColumns; - /** optional title attribute for displaying a titled list */ - private String title; + /** **/ private String tableId; @@ -333,18 +308,7 @@ public class ListDisplayTag extends BodyTagSupport { public void setMixins(String mixinsIn) { this.mixins = mixinsIn; } - /** - * @return Returns the disabled. - */ - public boolean renderDisabled() { - return renderDisabled; - } - /** - * @param disabled The disabled to set. - */ - public void setRenderDisabled(String disabled) { - renderDisabled = disabled.equals("true"); - } + /** * Set the set for this listview. * @param s The set to set. @@ -362,44 +326,6 @@ public class ListDisplayTag extends BodyTagSupport { } /** - * @return Returns the hiddenvars. - */ - public String getHiddenvars() { - return hiddenvars; - } - - /** - * @param hv The hiddenvars to set. - */ - public void setHiddenvars(String hv) { - this.hiddenvars = hv; - } - - /** - * Set the header of the filter on which to filter - * @param filterByIn The filterBy to set. - */ - public void setFilterBy(String filterByIn) { - this.filterBy = filterByIn; - } - - /** - * Returns the title message key. - * @return Returns the title. - */ - public String getTitle() { - return title; - } - - /** - * Sets the title message key. - * @param titleIn The title to set. - */ - public void setTitle(String titleIn) { - title = titleIn; - } - - /** * Returns true if this is a paging list. * @return true if this is a paging list. */ @@ -505,7 +431,7 @@ public class ListDisplayTag extends BodyTagSupport { } private void doSort(String sortedColumn) { HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); - Collections.sort(pageList, new DynamicComparator(sortedColumn, + Collections.sort(getPageList(), new DynamicComparator(sortedColumn, request.getParameter(RequestContext.SORT_ORDER))); } @@ -515,70 +441,7 @@ public class ListDisplayTag extends BodyTagSupport { return request.getParameter(RequestContext.LIST_SORT); } - private void setupPageList() throws JspTagException { - ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class); - if (listTag == null) { - throw new JspTagException("Tag nesting error: " + - "listDisplay must be nested in a list tag"); - } - pageList = listTag.getPageList(); - iterator = pageList.iterator(); - } - - /** - * Method to fetch a new ExportWriter instance. Override - * if desired to use different instance. Currently creates - * a new CSVWriter instance. - * @return new instance of an ExportWriter - */ - protected ExportWriter createExportWriter() { - return new CSVWriter(new StringWriter()); - } - - /** - * Increment the column # that is being rendered at this moment. - **/ - public void incrColumnCount() { - this.columnCount++; - } - - /** - * Increment the total number of columns - **/ - public void incrNumberOfColumns() { - this.numberOfColumns++; - } - - /** - * Get the number of the column that is being rendered at this moment. - * (0 == The first column) - * @return int the column number - **/ - public int getColumnCount() { - return this.columnCount; - } - - /** - * Get the number of columns in the list. - * @return int the number of columns - **/ - public int getNumberOfColumns() { - return this.numberOfColumns; - } - - /** - * Set the column # that is being rendered at this moment - * - * Used when 'colspan' is used for an element to skip over the - * intervening columns. - * - * @param columnCountIn The column count to set. - **/ - public void setColumnCount(int columnCountIn) { - this.columnCount = columnCountIn; - } - - ////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////// // RENDER methods ////////////////////////////////////////////////////////////////////////// @@ -599,33 +462,16 @@ public class ListDisplayTag extends BodyTagSupport { "</a></div>"); } - /** - * Renders the title header if set. - * @param out JspWriter - * @throws IOException thrown if there's a problem writing to the JSP - */ - private void renderTitle(JspWriter out) throws IOException { - if (!StringUtils.isEmpty(title)) { - HtmlTag heading = new HtmlTag("div"); - heading.setAttribute("class", "panel-heading"); - HtmlTag h3 = new HtmlTag("h3"); - h3.setAttribute("class", "panel-title"); - h3.addBody(LocalizationService.getInstance().getMessage(title)); - heading.addBody(h3); - out.println(heading.render()); - } - } - private void renderBoundsVariables(JspWriter out) throws IOException { StringBuffer target = new StringBuffer(); // pagination formvars - renderHidden(target, "lower", String.valueOf(pageList.getStart())); + renderHidden(target, "lower", String.valueOf(getPageList().getStart())); PaginationUtil putil = new PaginationUtil( - pageList.getStart(), - pageList.getEnd(), - pageList.getEnd() - pageList.getStart() + 1, - pageList.getTotalSize()); + getPageList().getStart(), + getPageList().getEnd(), + getPageList().getEnd() - getPageList().getStart() + 1, + getPageList().getTotalSize()); renderHidden(target, FIRST_LOWER, putil.getFirstLower()); renderHidden(target, PREV_LOWER, putil.getPrevLower()); @@ -634,48 +480,6 @@ public class ListDisplayTag extends BodyTagSupport { out.println(target.toString()); } - private void renderFilterBox(JspWriter out) throws IOException { - LocalizationService ls = LocalizationService.getInstance(); - - HtmlTag tag = new HtmlTag("div"); - tag.setAttribute("class", "spacewalk-filter-input input-group"); - - StringBuffer buf = new StringBuffer(); - - HtmlTag input = new HtmlTag("input"); - input.setAttribute("type", "text"); - input.setAttribute("class", "form-control"); - input.setAttribute("name", RequestContext.FILTER_STRING); - input.setAttribute("value", pageList.getFilterData()); - String placeHolder = StringEscapeUtils.escapeHtml( - ls.getMessage("message.filterby", ls.getMessage(filterBy))); - input.setAttribute("placeholder", placeHolder); - - buf.append(input.render()); - - input = new HtmlTag("input"); - input.setAttribute("type", "hidden"); - input.setAttribute("name", RequestContext.PREVIOUS_FILTER_STRING); - input.setAttribute("value", pageList.getFilterData()); - buf.append(input.render()); - - HtmlTag btnSpan = new HtmlTag("span"); - btnSpan.setAttribute("class", "input-group-btn"); - - HtmlTag btn = new HtmlTag("button"); - btn.setAttribute("class", "btn btn-default icon-eye-open"); - btn.setAttribute("type", "submit"); - btn.setAttribute("name", FILTER_DISPATCH); - //input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); - - btnSpan.addBody(btn); - - buf.append(btnSpan.render()); - - tag.addBody(buf.toString()); - out.println(tag.render()); - } - private void renderSetButtons(JspWriter out) throws IOException { StringBuffer buf = new StringBuffer(); @@ -725,21 +529,21 @@ public class ListDisplayTag extends BodyTagSupport { out.println(">"); out.print("<div class=\"list-infotext\">"); - int finalResult = pageList.getEnd(); - if (finalResult > pageList.getTotalSize()) { - finalResult = pageList.getTotalSize(); + int finalResult = getPageList().getEnd(); + if (finalResult > getPageList().getTotalSize()) { + finalResult = getPageList().getTotalSize(); } Object [] args = new Object[4]; - if (pageList.size() == 0) { + if (getPageList().size() == 0) { args[0] = new Integer(0); args[1] = args[0]; args[2] = args[0]; } else { - args[0] = new Integer(pageList.getStart()); + args[0] = new Integer(getPageList().getStart()); args[1] = new Integer(finalResult); - args[2] = new Integer(pageList.getTotalSize()); + args[2] = new Integer(getPageList().getTotalSize()); } out.println(LocalizationService.getInstance() .getMessage("message.range", args)); @@ -766,8 +570,9 @@ public class ListDisplayTag extends BodyTagSupport { private void appendButtons(JspWriter out) throws IOException { out.println("<div class=\"list-navbuttons\">"); - boolean canGoForward = pageList.getEnd() < pageList.getTotalSize(); - boolean canGoBack = pageList.getStart() > 1; + boolean canGoForward = getPageList().getEnd() < getPageList() + .getTotalSize(); + boolean canGoBack = getPageList().getStart() > 1; if (canGoForward || canGoBack) { out.println(renderPaginationButton(FIRST, @@ -797,7 +602,7 @@ public class ListDisplayTag extends BodyTagSupport { } private void renderActionButtons(JspWriter out) throws IOException { - if (pageList.size() == 0 || getButton() == null) { + if (getPageList().size() == 0 || getButton() == null) { return; } @@ -949,7 +754,7 @@ public class ListDisplayTag extends BodyTagSupport { enabled.append("\">{0}</a><li>"); AlphaBar ab = new AlphaBar(enabled.toString(), "<li class=\"disabled\"><span>{0}</span></li>"); - target.append(ab.getAlphaList(pageList.getIndex())); + target.append(ab.getAlphaList(getPageList().getIndex())); target.append("</ul>"); target.append("</div>"); @@ -978,21 +783,7 @@ public class ListDisplayTag extends BodyTagSupport { public boolean isExport() { RequestContext ctx = new RequestContext((HttpServletRequest) pageContext.getRequest()); - return (ctx.isRequestedExport() && this.exportColumns != null); - } - - /** - * @return Returns the exportColumns. - */ - public String getExportColumns() { - return exportColumns; - } - - /** - * @param exportIn The export to set. - */ - public void setExportColumns(String exportIn) { - this.exportColumns = exportIn; + return (ctx.isRequestedExport() && this.getExportColumns() != null); } /** @@ -1026,7 +817,6 @@ public class ListDisplayTag extends BodyTagSupport { public int doStartTag() throws JspException { rowCnt = 0; numItemsChecked = 0; - numberOfColumns = 0; JspWriter out = null; showSetButtons = false; @@ -1079,8 +869,8 @@ public class ListDisplayTag extends BodyTagSupport { out.println("<div class=\"spacewalk-list-top\">"); out.println("<div class=\"spacewalk-list-top-wrap\">"); out.println("<div class=\"spacewalk-list-top-alphabar\">"); - if (pageList.getIndex().size() > 0 && - pageList.size() < pageList.getTotalSize()) { + if (getPageList().getIndex().size() > 0 + && getPageList().size() < getPageList().getTotalSize()) { renderViewAllLink(out); renderAlphabar(out); @@ -1098,7 +888,7 @@ public class ListDisplayTag extends BodyTagSupport { out.println("</div>"); out.println("<div class=\"spacewalk-list-top-wrap\">"); out.println("<div class=\"spacewalk-list-filter\">"); - if (pageList.hasFilter()) { + if (getPageList().hasFilter()) { renderFilterBox(out); } out.println("</div>"); @@ -1124,7 +914,7 @@ public class ListDisplayTag extends BodyTagSupport { out.println("\n<tr>"); - if (iterator != null && iterator.hasNext()) { + if (getIterator() != null && getIterator().hasNext()) { // Push a new BodyContent writer onto the stack so that // we can buffer the body data. bodyContent = pageContext.pushBody(); @@ -1142,13 +932,14 @@ public class ListDisplayTag extends BodyTagSupport { public int doEndTag() throws JspException { JspWriter out = null; try { - if (pageList.isEmpty()) { + if (getPageList().isEmpty()) { return EVAL_PAGE; } if (isExport()) { ExportWriter eh = createExportWriter(); - String[] columns = StringUtils.split(this.exportColumns, ','); + String[] columns = StringUtils.split(this.getExportColumns(), + ','); eh.setColumns(Arrays.asList(columns)); ServletExportHandler seh = new ServletExportHandler(eh); pageContext.getOut().clear(); @@ -1156,7 +947,7 @@ public class ListDisplayTag extends BodyTagSupport { pageContext.getResponse().reset(); seh.writeExporterToOutput( (HttpServletResponse) pageContext.getResponse(), - pageList); + getPageList()); return SKIP_PAGE; } @@ -1170,7 +961,7 @@ public class ListDisplayTag extends BodyTagSupport { String bodyString = body.getString(); // The toReplace string is kind of odd, but it is because // HtmlTag doesn't understand adding a property to be replaced. - if (numItemsChecked == pageList.size()) { + if (numItemsChecked == getPageList().size()) { bodyString = bodyString.replaceFirst("@@CHECKED@@=\"\"", "checked=\"1\""); } @@ -1204,15 +995,15 @@ public class ListDisplayTag extends BodyTagSupport { */ else if (type.equals("list")) { - int finalResult = pageList.getEnd(); - if (finalResult > pageList.getTotalSize()) { - finalResult = pageList.getTotalSize(); + int finalResult = getPageList().getEnd(); + if (finalResult > getPageList().getTotalSize()) { + finalResult = getPageList().getTotalSize(); } Object [] args = new Object[4]; - args[0] = new Integer(pageList.getStart()); + args[0] = new Integer(getPageList().getStart()); args[1] = new Integer(finalResult); - args[2] = new Integer(pageList.getTotalSize()); + args[2] = new Integer(getPageList().getTotalSize()); args[3] = LocalizationService.getInstance().getMessage(description); out.print("<span class=\"text-left\">\n"); @@ -1234,7 +1025,7 @@ public class ListDisplayTag extends BodyTagSupport { out.println("</table>\n"); if (reflink != null) { - columnCount = 0; + setColumnCount(0); out.println("<div class=\"panel-footer\">"); @@ -1246,7 +1037,7 @@ public class ListDisplayTag extends BodyTagSupport { if (reflinkkey != null) { Object[] args = new Object[2]; - args[0] = new Integer(pageList.getTotalSize()); + args[0] = new Integer(getPageList().getTotalSize()); args[1] = reflinkkeyarg0; String message = LocalizationService.getInstance(). @@ -1264,13 +1055,13 @@ public class ListDisplayTag extends BodyTagSupport { out.println("</div>\n"); // export button goes outside of the panel - if (exportColumns != null) { + if (getExportColumns() != null) { renderExport(out); } out.println("</div>\n"); setColumnCount(0); - numberOfColumns = 0; + setNumberOfColumns(0); } catch (IOException e) { throw new JspException("IO error" + e.getMessage()); @@ -1298,9 +1089,9 @@ public class ListDisplayTag extends BodyTagSupport { out.println("</tr>"); } - if (iterator.hasNext()) { - columnCount = 0; - Object next = iterator.next(); + if (getIterator().hasNext()) { + setColumnCount(0); + Object next = getIterator().next(); out.println(getTrElement(next)); pageContext.setAttribute("current", next); return EVAL_BODY_AGAIN; @@ -1319,27 +1110,18 @@ public class ListDisplayTag extends BodyTagSupport { @Override public void release() { // reset the state of the tag - iterator = null; - pageList = null; rowCnt = 0; - filterBy = null; set = null; - hiddenvars = null; numItemsChecked = 0; showSetButtons = false; paging = true; type = "list"; - renderDisabled = false; button = null; buttonAcl = null; button2 = null; button2Acl = null; mixins = null; domainClass = null; - exportColumns = null; - title = null; - columnCount = 0; - numberOfColumns = 0; buttonsAttrName = null; buttonsAttrValue = null; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java new file mode 100644 index 0000000..5b560cf --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -0,0 +1,305 @@ +package com.redhat.rhn.frontend.taglibs; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Iterator; + +import javax.servlet.jsp.JspTagException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.BodyTagSupport; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.CSVWriter; +import com.redhat.rhn.common.util.ExportWriter; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.struts.RequestContext; + +public class ListDisplayTagBase extends BodyTagSupport { + public static final String FILTER_DISPATCH = "filter.dispatch"; + + /** iterates through the page list */ + private Iterator iterator; + /** list of data to show on page */ + private DataResult pageList; + /** How many columns are there? */ + private int numberOfColumns = 0; + /** Which column are we rendering now? */ + private int columnCount = 0; + private String filterBy; + /** type of table we are using. default is list" */ + private String type = "list"; + /** determines whether we should show the disabled CSS */ + private boolean renderDisabled; + /** comma separated list of columns to be exported */ + private String exportColumns; + /** optional title attribute for displaying a titled list */ + private String title; + private String hiddenvars; + + /** Public constructor */ + public ListDisplayTagBase() { + + } + + /** + * @return returns the iterator of the data for this list + */ + protected Iterator getIterator() { + return iterator; + } + + /** + * @return returns the page list + */ + protected DataResult getPageList() { + return pageList; + } + + /** + * @return Returns the disabled. + */ + public boolean renderDisabled() { + return renderDisabled; + } + + /** + * @param disabled + * The disabled to set. + */ + public void setRenderDisabled(String disabled) { + renderDisabled = disabled.equals("true"); + } + + /** + * Returns the title message key. + * + * @return Returns the title. + */ + public String getTitle() { + return title; + } + + /** + * Sets the title message key. + * + * @param titleIn + * The title to set. + */ + public void setTitle(String titleIn) { + title = titleIn; + } + + /** + * Sets the type of the list + * + * @param stringIn + * desired alignment for the list + */ + public void setType(String stringIn) { + type = stringIn; + } + + /** + * Gets the type of the list + * + * @return String alignment of the list + */ + public String getType() { + return type; + } + + /** + * Set the header of the filter on which to filter + * + * @param filterByIn + * The filterBy to set. + */ + public void setFilterBy(String filterByIn) { + this.filterBy = filterByIn; + } + + /** + * @return Returns the hiddenvars. + */ + public String getHiddenvars() { + return hiddenvars; + } + + /** + * @param hv + * The hiddenvars to set. + */ + public void setHiddenvars(String hv) { + this.hiddenvars = hv; + } + + /** + * Method to fetch a new ExportWriter instance. Override if desired to use + * different instance. Currently creates a new CSVWriter instance. + * + * @return new instance of an ExportWriter + */ + protected ExportWriter createExportWriter() { + return new CSVWriter(new StringWriter()); + } + + /** + * Increment the column # that is being rendered at this moment. + **/ + public void incrColumnCount() { + this.columnCount++; + } + + /** + * Increment the total number of columns + **/ + public void incrNumberOfColumns() { + this.numberOfColumns++; + } + + /** + * Get the number of the column that is being rendered at this moment. (0 == + * The first column) + * + * @return int the column number + **/ + public int getColumnCount() { + return this.columnCount; + } + + /** + * Get the number of columns in the list. + * + * @return int the number of columns + **/ + public int getNumberOfColumns() { + return this.numberOfColumns; + } + + /** + * Set the number of columns in the list. + * + * @param num + * number of columns i nthe list + **/ + public void setNumberOfColumns(int num) { + this.numberOfColumns = num; + } + + /** + * Set the column # that is being rendered at this moment + * + * Used when 'colspan' is used for an element to skip over the intervening + * columns. + * + * @param columnCountIn + * The column count to set. + **/ + public void setColumnCount(int columnCountIn) { + this.columnCount = columnCountIn; + } + + /** + * @return Returns the exportColumns. + */ + public String getExportColumns() { + return exportColumns; + } + + /** + * @param exportIn The export to set. + */ + public void setExportColumns(String exportIn) { + this.exportColumns = exportIn; + } + + protected void setupPageList() throws JspTagException { + ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class); + if (listTag == null) { + throw new JspTagException("Tag nesting error: " + + "listDisplay must be nested in a list tag"); + } + pageList = listTag.getPageList(); + iterator = pageList.iterator(); + } + + /** + * Renders the title header if set. + * @param out JspWriter + * @throws IOException thrown if there's a problem writing to the JSP + */ + protected void renderTitle(JspWriter out) throws IOException { + if (!StringUtils.isEmpty(title)) { + HtmlTag heading = new HtmlTag("div"); + heading.setAttribute("class", "panel-heading"); + HtmlTag h3 = new HtmlTag("h3"); + h3.setAttribute("class", "panel-title"); + h3.addBody(LocalizationService.getInstance().getMessage(title)); + heading.addBody(h3); + out.println(heading.render()); + } + } + + protected void renderFilterBox(JspWriter out) throws IOException { + LocalizationService ls = LocalizationService.getInstance(); + + HtmlTag tag = new HtmlTag("div"); + tag.setAttribute("class", "spacewalk-filter-input input-group"); + + StringBuffer buf = new StringBuffer(); + + HtmlTag input = new HtmlTag("input"); + input.setAttribute("type", "text"); + input.setAttribute("class", "form-control"); + input.setAttribute("name", RequestContext.FILTER_STRING); + input.setAttribute("value", pageList.getFilterData()); + String placeHolder = StringEscapeUtils.escapeHtml( + ls.getMessage("message.filterby", ls.getMessage(filterBy))); + input.setAttribute("placeholder", placeHolder); + + buf.append(input.render()); + + input = new HtmlTag("input"); + input.setAttribute("type", "hidden"); + input.setAttribute("name", RequestContext.PREVIOUS_FILTER_STRING); + input.setAttribute("value", pageList.getFilterData()); + buf.append(input.render()); + + HtmlTag btnSpan = new HtmlTag("span"); + btnSpan.setAttribute("class", "input-group-btn"); + + HtmlTag btn = new HtmlTag("button"); + btn.setAttribute("class", "btn btn-default icon-eye-open"); + btn.setAttribute("type", "submit"); + btn.setAttribute("name", FILTER_DISPATCH); + btn.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); + + btnSpan.addBody(btn); + + buf.append(btnSpan.render()); + + tag.addBody(buf.toString()); + out.println(tag.render()); + } + + /** {@inheritDoc} */ + public void release() { + iterator = null; + filterBy = null; + renderDisabled = false; + exportColumns = null; + title = null; + columnCount = 0; + numberOfColumns = 0; + hiddenvars = null; + pageList = null; + type = "list"; + // now release our super classes + super.release(); + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java index b50d77f..f0611b5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java @@ -15,24 +15,9 @@ package com.redhat.rhn.frontend.taglibs; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.CSVWriter; -import com.redhat.rhn.common.util.DynamicComparator; -import com.redhat.rhn.common.util.ExportWriter; -import com.redhat.rhn.common.util.ServletExportHandler; -import com.redhat.rhn.frontend.dto.BaseListDto; -import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.struts.RequestContext; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; -import java.io.StringWriter; import java.util.Arrays; import java.util.Collections; -import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,7 +25,16 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspTagException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTagSupport; + +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.DynamicComparator; +import com.redhat.rhn.common.util.ExportWriter; +import com.redhat.rhn.common.util.ServletExportHandler; +import com.redhat.rhn.frontend.dto.BaseListDto; +import com.redhat.rhn.frontend.dto.UserOverview; +import com.redhat.rhn.frontend.struts.RequestContext; /** * The UnpagedListDisplayTag defines the structure of the ListView. This tag iterates @@ -96,35 +90,17 @@ import javax.servlet.jsp.tagext.BodyTagSupport; * @see com.redhat.rhn.frontend.taglibs.ColumnTag * @see com.redhat.rhn.frontend.taglibs.ListTag */ -public class UnpagedListDisplayTag extends BodyTagSupport { +public class UnpagedListDisplayTag extends ListDisplayTagBase { - /** iterates through the page list */ - private Iterator iterator; - /** list of data to show on page */ - private DataResult pageList; /** row count determines whether we're an even or odd row */ private int rowCnt = 0; - /** How many columns are there? */ - protected int numberOfColumns = 0; - /** Which column are we rendering now? */ - protected int columnCount = 0; - /** Which row are we on now? */ protected int currRow = 0; - private String filterBy; - /** type of table we are using. default is list" */ - private String type = "list"; /** determines whether or not we should show the borders * of the list and if the rows should all be white */ private boolean transparent = false; /** determines whether we should show the disabled CSS */ - private boolean renderDisabled; - /** comma separated list of columns to be exported */ - private String exportColumns; - /** optional title attribute for displaying a titled list */ - private String title; - private String hiddenvars; private String nodeIdString = null; /** Public constructor */ @@ -132,60 +108,6 @@ public class UnpagedListDisplayTag extends BodyTagSupport { } /** - * @return Returns the disabled. - */ - public boolean renderDisabled() { - return renderDisabled; - } - /** - * @param disabled The disabled to set. - */ - public void setRenderDisabled(String disabled) { - renderDisabled = disabled.equals("true"); - } - - /** - * Set the header of the filter on which to filter - * @param filterByIn The filterBy to set. - */ - public void setFilterBy(String filterByIn) { - this.filterBy = filterByIn; - } - - /** - * Returns the title message key. - * @return Returns the title. - */ - public String getTitle() { - return title; - } - - /** - * Sets the title message key. - * @param titleIn The title to set. - */ - public void setTitle(String titleIn) { - title = titleIn; - } - - - /** - * Sets the type of the list - * @param stringIn desired alignment for the list - */ - public void setType(String stringIn) { - type = stringIn; - } - - /** - * Gets the type of the list - * @return String alignment of the list - */ - public String getType() { - return type; - } - - /** * @return returns whether or not the table is transparent */ public boolean isTransparent() { @@ -198,168 +120,42 @@ public class UnpagedListDisplayTag extends BodyTagSupport { public void setTransparent(boolean booleanIn) { transparent = booleanIn; } + private void doSort(String sortedColumn) { HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); - Collections.sort(pageList, new DynamicComparator(sortedColumn, + Collections.sort(getPageList(), new DynamicComparator(sortedColumn, request.getParameter(RequestContext.SORT_ORDER))); } - /** - * @return Returns the hiddenvars. - */ - public String getHiddenvars() { - return hiddenvars; - } - - /** - * @param hv The hiddenvars to set. - */ - public void setHiddenvars(String hv) { - this.hiddenvars = hv; - } - private String getSortedColumn() { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); return request.getParameter(RequestContext.LIST_SORT); } - private void setupPageList() throws JspTagException { - ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class); - if (listTag == null) { - throw new JspTagException("Tag nesting error: " + - "listDisplay must be nested in a list tag"); - } - pageList = listTag.getPageList(); - iterator = pageList.iterator(); + protected void setupPageList() throws JspTagException { + super.setupPageList(); currRow = 0; } - /** - * Method to fetch a new ExportWriter instance. Override - * if desired to use different instance. Currently creates - * a new CSVWriter instance. - * @return new instance of an ExportWriter - */ - protected ExportWriter createExportWriter() { - return new CSVWriter(new StringWriter()); - } - - /** - * Increment the column # that is being rendered at this moment. - **/ - public void incrColumnCount() { - this.columnCount++; - } - - /** - * Increment the total number of columns - **/ - public void incrNumberOfColumns() { - this.numberOfColumns++; - } - - /** - * Get the number of the column that is being rendered at this moment. - * (0 == The first column) - * @return int the column number - **/ - public int getColumnCount() { - return this.columnCount; - } - - /** - * Get the number of columns in the list. - * @return int the number of columns - **/ - public int getNumberOfColumns() { - return this.numberOfColumns; - } - - /** - * Set the number of columns in the list. - * @param num number of columns i nthe list - **/ - public void setNumberOfColumns(int num) { - this.numberOfColumns = num; - } - - /** - * Set the column # that is being rendered at this moment - * - * Used when 'colspan' is used for an element to skip over the - * intervening columns. - * - * @param columnCountIn The column count to set. - **/ - public void setColumnCount(int columnCountIn) { - this.columnCount = columnCountIn; - } - ////////////////////////////////////////////////////////////////////////// // RENDER methods ////////////////////////////////////////////////////////////////////////// - /** - * Renders the title header if set. - * @param out JspWriter - * @throws IOException thrown if there's a problem writing to the JSP - */ - private void renderTitle(JspWriter out) throws IOException { - if (!StringUtils.isEmpty(title)) { - HtmlTag tr = new HtmlTag("tr"); - HtmlTag th = new HtmlTag("th"); - th.addBody(LocalizationService.getInstance().getMessage(title)); - tr.addBody(th); - out.println(tr.render()); - } - } - private void renderFilterBox(JspWriter out) throws IOException { + @Override + protected void renderFilterBox(JspWriter out) throws IOException { + super.renderFilterBox(out); LocalizationService ls = LocalizationService.getInstance(); - HtmlTag tagFilterInput = new HtmlTag("div"); - tagFilterInput.setAttribute("class", "filter-input"); - HtmlTag tagInputGroup = new HtmlTag("div"); - tagInputGroup.setAttribute("class", "input-group input-group-sm"); - - StringBuffer buf = new StringBuffer(); - HtmlTag input = new HtmlTag("input"); - input.setAttribute("type", "text"); - input.setAttribute("size", "12"); - input.setAttribute("name", RequestContext.FILTER_STRING); - input.setAttribute("value", pageList.getFilterData()); - buf.append(input.render()); - - input = new HtmlTag("input"); - input.setAttribute("type", "hidden"); - input.setAttribute("name", "prev_filter_value"); - input.setAttribute("value", pageList.getFilterData()); - buf.append(input.render()); - - input = new HtmlTag("input"); - input.setAttribute("type", "submit"); - input.setAttribute("name", ListDisplayTag.FILTER_DISPATCH); - input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); - buf.append(input.render()); - - /* - * TODO: This is BAD. Makes the code specific to the Chanel Tree view - * Should be fixed in future versions - */ - tagInputGroup.addBody(ls.getMessage("message.filterby", ls.getMessage(filterBy)) + - buf.toString()); - tagFilterInput.addBody(tagInputGroup); - - if (type.equals("treeview")) { - tagFilterInput.addBody("<div style=\"text-align: right;\">" + + if (getType().equals("treeview")) { + out.print("<div style=\"text-align: right;\">" + + "<a href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + ls.getMessage("channels.overview.showall") + "</a>  |  " + "<a href=\"javascript:hideAllRows();\" style=\"cursor: pointer;\">" + ls.getMessage("channels.overview.hideall") + "</a></div>"); } - - out.println(tagFilterInput.render()); } private String getTrElement(Object o, int row) { @@ -443,24 +239,9 @@ public class UnpagedListDisplayTag extends BodyTagSupport { public boolean isExport() { RequestContext ctx = new RequestContext((HttpServletRequest) pageContext.getRequest()); - return (ctx.isRequestedExport() && this.exportColumns != null); - } - - /** - * @return Returns the exportColumns. - */ - public String getExportColumns() { - return exportColumns; - } - - /** - * @param exportIn The export to set. - */ - public void setExportColumns(String exportIn) { - this.exportColumns = exportIn; + return (ctx.isRequestedExport() && getExportColumns() != null); } - ////////////////////////////////////////////////////////////////////////// // JSP Tag lifecycle methods ////////////////////////////////////////////////////////////////////////// @@ -485,24 +266,22 @@ public class UnpagedListDisplayTag extends BodyTagSupport { doSort(sortedColumn); } - if (pageList.hasFilter()) { - renderFilterBox(out); - } + out.print("<div class=\"spacewalk-list-container\">"); + out.print("<div class=\"spacewalk-list panel panel-default\">"); + + renderTitle(out); /* If the type is list, we must set the width explicitly. Otherwise, * it shouldn't matter */ - if (type.equals("list")) { - out.print("<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"0\" " + "class=\"list\""); + if (getType().equals("list")) { + out.print("<table class=\"table table-striped\""); } - else if (type.equals("treeview")) { - out.print("<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"0\" " + "class=\"list\" id=\"channel-list\""); + else if (getType().equals("treeview")) { + out.print("<table class=\"table table-striped\" id=\"channel-list\""); } else { - out.print("<table cellspacing=\"0\" " + " cellpadding=\"0\" " + - "class=\"" + type + "\""); + out.print("<table class=\"" + getType() + "\""); } /*if (isTransparent()) { @@ -513,11 +292,18 @@ public class UnpagedListDisplayTag extends BodyTagSupport { out.println(">"); out.println("<thead>"); - renderTitle(out); + + out.println("\n<tr>"); + out.println("\n<td colspan=\"" + getColumnCount() + "\">"); + if (getPageList().hasFilter()) { + renderFilterBox(out); + } + out.println("\n</td>"); + out.println("\n</tr>"); out.println("\n<tr>"); - if (iterator != null && iterator.hasNext()) { + if (getIterator() != null && getIterator().hasNext()) { // Push a new BodyContent writer onto the stack so that // we can buffer the body data. bodyContent = pageContext.pushBody(); @@ -534,13 +320,14 @@ public class UnpagedListDisplayTag extends BodyTagSupport { public int doEndTag() throws JspException { JspWriter out = null; try { - if (pageList.isEmpty()) { + if (getPageList().isEmpty()) { return EVAL_PAGE; } if (isExport()) { ExportWriter eh = createExportWriter(); - String[] columns = StringUtils.split(this.exportColumns, ','); + String[] columns = StringUtils.split(this.getExportColumns(), + ','); eh.setColumns(Arrays.asList(columns)); ServletExportHandler seh = new ServletExportHandler(eh); pageContext.getOut().clear(); @@ -548,7 +335,7 @@ public class UnpagedListDisplayTag extends BodyTagSupport { pageContext.getResponse().reset(); seh.writeExporterToOutput( (HttpServletResponse) pageContext.getResponse(), - pageList); + getPageList()); return SKIP_PAGE; } @@ -565,6 +352,8 @@ public class UnpagedListDisplayTag extends BodyTagSupport { // Rely on content to have emitted a tbody tag somewhere out.println("</tbody>"); out.println("</table>\n"); + out.println("</div>\n"); + out.println("</div>\n"); setNumberOfColumns(0); setColumnCount(0); setCurrRow(0); @@ -595,9 +384,9 @@ public class UnpagedListDisplayTag extends BodyTagSupport { out.println("</tr>"); } - if (iterator.hasNext()) { - columnCount = 0; - Object next = iterator.next(); + if (getIterator().hasNext()) { + setColumnCount(0); + Object next = getIterator().next(); out.println(getTrElement(next, currRow++)); pageContext.setAttribute("current", next); return EVAL_BODY_AGAIN; @@ -612,21 +401,12 @@ public class UnpagedListDisplayTag extends BodyTagSupport { } /** {@inheritDoc} */ + @Override public void release() { // reset the state of the tag - iterator = null; currRow = 0; - pageList = null; rowCnt = 0; - filterBy = null; - type = "list"; - renderDisabled = false; - exportColumns = null; - title = null; - hiddenvars = null; nodeIdString = null; - columnCount = 0; - numberOfColumns = 0; // now release our super classes super.release(); } commit 547d054b1880ac65fdeeac68ca0561be28729133 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 22 13:29:37 2013 +0200 port the old list tag to the new structure diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 7e602ee..a4b0bd4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -718,41 +718,13 @@ public class ListDisplayTag extends BodyTagSupport { private void renderPagination(JspWriter out, boolean top) throws IOException { - if (type.equals("list")) { - out.println("<div class=\"spacewalk-list-pagination\""); - } - else { - out.println("<div class=\"spacewalk-list-pagination\""); - } - + out.println("<div class=\"spacewalk-list-pagination\""); if (tableId != null) { out.print("id=\"" + tableId + "\" "); } - out.println(">"); - out.println("<div class=\"row\">"); - // if (!showSetButtons) { - out.println("<div class=\"col-md-10\">"); - //} - //else { - // out.println("<td valign=\"middle\">"); - //} - - if (top && pageList.hasFilter()) { - renderFilterBox(out); - } - if (!top && set != null) { - if (showSetButtons) { - out.print("<span class=\"spacewalk-list-selection-btns\">"); - renderSetButtons(out); - out.print("</span>"); - } - } - - out.println("</div>"); - - out.print("<div class=\"col-md-2\" class=\"list-infotext\">"); + out.print("<div class=\"list-infotext\">"); int finalResult = pageList.getEnd(); if (finalResult > pageList.getTotalSize()) { finalResult = pageList.getTotalSize(); @@ -789,7 +761,6 @@ public class ListDisplayTag extends BodyTagSupport { out.println("</div>"); appendButtons(out); out.println(" </div>\n"); - out.println("</div>"); } private void appendButtons(JspWriter out) throws IOException { @@ -1105,30 +1076,52 @@ public class ListDisplayTag extends BodyTagSupport { out.println("<tr>"); out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); - /* If pageList contains an index and pageList.size() (what we are - * displaying on the page) is less than pageList.getTotalSize() - * (the total number of items in the data result), render alphabar. - * This prevents the alphabar from showing up on pages that show - * all of the entries on a single page and is similar to how the - * perl code behaves. - */ + out.println("<div class=\"spacewalk-list-top\">"); + out.println("<div class=\"spacewalk-list-top-wrap\">"); + out.println("<div class=\"spacewalk-list-top-alphabar\">"); if (pageList.getIndex().size() > 0 && pageList.size() < pageList.getTotalSize()) { renderViewAllLink(out); renderAlphabar(out); } - + out.println("</div>"); + out.println("<div class=\"spacewalk-list-top-addons\">"); + if (set != null) { + if (showSetButtons) { + out.print("<span class=\"spacewalk-list-selection-btns\">"); + renderSetButtons(out); + out.print("</span>"); + } + } + out.println("</div>"); + out.println("</div>"); + out.println("<div class=\"spacewalk-list-top-wrap\">"); + out.println("<div class=\"spacewalk-list-filter\">"); + if (pageList.hasFilter()) { + renderFilterBox(out); + } + out.println("</div>"); + out.println("<div class=\"spacewalk-list-top-pagination\">"); if (isPaging()) { renderPagination(out, true); renderBoundsVariables(out); } + out.println("</div>"); + out.println("</div>"); + out.println("</div>"); + /* If pageList contains an index and pageList.size() (what we are + * displaying on the page) is less than pageList.getTotalSize() + * (the total number of items in the data result), render alphabar. + * This prevents the alphabar from showing up on pages that show + * all of the entries on a single page and is similar to how the + * perl code behaves. + */ + + out.println("</td>"); out.println("</tr>"); - // Now print the column headings - out.println("<thead>"); - out.println("\n<tr>"); if (iterator != null && iterator.hasNext()) { @@ -1195,6 +1188,11 @@ public class ListDisplayTag extends BodyTagSupport { out.println("<tr>"); out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); + out.println("<div class=\"spacewalk-list-bottom\">"); + out.println("<div class=\"spacewalk-list-bottom-wrap\">"); + out.println("<div class=\"spacewalk-list-bottom-addons\">"); + out.println("</div>"); + out.println("<div class=\"spacewalk-list-bottom-pagination\">"); /* If paging is on, we render the pagination */ if (isPaging()) { renderPagination(out, false); @@ -1222,6 +1220,13 @@ public class ListDisplayTag extends BodyTagSupport { .getMessage("message.range.withtypedescription", args)); out.println("</span>"); } + out.println("</div>"); + out.println("</div>"); + out.println("<div class=\"spacewalk-list-extra\">"); + out.println("</div>"); + + out.println("</div>"); + out.println("</tr>"); out.println("</td>"); out.println("</tfoot>\n"); commit bd511adceb2119e1ac7a74346c7e7a77ba018f8e Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 12:24:30 2013 +0200 Buttons and icons in the title fixed diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/webapp/WEB-INF/pages/channel/all.jsp index 26cd8c1..0ea8ce7 100644 --- a/java/code/webapp/WEB-INF/pages/channel/all.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(4); showFiltered();"> -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" > <bean:message key="channels.all.jsp.toolbar"/> </rhn:toolbar> @@ -28,7 +28,7 @@ function showFiltered() { <bean:message key="channels.all.jsp.header1" /> </p> -<form method="post" name="rhn_list" action="/rhn/software/channels/All.do"> +<form method="post" role="form" name="rhn_list" action="/rhn/software/channels/All.do"> <rhn:csrf /> <rhn:submitted /> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree_multiorg.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 16760eb..9e65133 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -9,7 +9,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - <rhn:toolbar base="h1" icon="icon-search" imgAlt="packagesearch.jsp.imgAlt" + <rhn:toolbar base="h1" icon="icon-search" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> <bean:message key="packagesearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf index 21866fa..cc759fa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf @@ -40,12 +40,13 @@ </rl:list> - <div align="right"> + <div class="pull-right"> <rhn:submitted/> - <hr/> - <input type="submit" + <button type="submit" name="dispatch" - value='<bean:message key="erratalist.jsp.deleteerrata"/>'/> + class="btn btn-default"> + <i class="icon-trash"></i> <bean:message key="erratalist.jsp.deleteerrata"/> + </button> </div> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp index 6363e1a..2a22f4d 100644 --- a/java/code/webapp/WEB-INF/pages/errata/published.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp#channel-mgmt-Manage_Errata-Published_Errata" creationUrl="/rhn/errata/manage/Create.do" creationType="erratum"> commit a3900a3ef65d5ff153578c97d2406512d00c6f38 Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 12:22:21 2013 +0200 P bottom-margin redused diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 0321658..728864e 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -99,7 +99,7 @@ h2 { font-size: 1.7em; } p { - margin-bottom: 2em; + margin-bottom: 1em; } .spacewalk-main-column-layout { /* override the grid row margin */ commit 7428f83480f7181964e1ae4cb608ac5e5dabaaab Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 12:10:03 2013 +0200 Panel, form and table style applied diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index cc84742..d181eeb 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -32,74 +32,81 @@ <p><bean:message key="erratasearch.jsp.summary"/></p> - <p><bean:message key="erratasearch.jsp.instructions"/></p> - - <html:form action="/errata/Search.do"> + <html:form styleClass="form-horizontal" action="/errata/Search.do"> <rhn:csrf />  - <div class="search-choices"> - - <div class="search-choices-group"> - <table class="details"> - <tr><th><bean:message key="erratasearch.jsp.searchfor"/></th> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="erratasearch.jsp.instructions"/></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td><bean:message key="erratasearch.jsp.searchfor"/></td> <td> - <html:text property="search_string" name="search_string" + <div class="row-0"> + <div class="col-md-5"> + <html:text property="search_string" styleClass="form-control input-sm" name="search_string" value="${search_string}" maxlength="36" accesskey="4"/> - <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search"></i> - <bean:message key="button.search"/> - </button> - <br /> - <span class="small-text"> - <strong><bean:message key="Examples" />: </strong> <bean:message key="erratasearch.jsp.search.tip" /> + </div> + <span class="col-md-7"> + <strong><bean:message key="Examples" />: </strong> <bean:message key="erratasearch.jsp.search.tip" /> </span> + </div> </td> </tr> - <tr><th><bean:message key="erratasearch.jsp.whatsearch"/></th> + <tr><td><bean:message key="erratasearch.jsp.whatsearch"/></td> <td> - <html:select property="view_mode"> - <html:options collection="searchOptions" - property="value" - labelProperty="display" /> - </html:select> - <br /> - <span class="small-text"> + <div class="row-0"> + <div class="col-md-5"> + <html:select property="view_mode" styleClass="form-control input-sm"> + <html:options collection="searchOptions" + property="value" + labelProperty="display" /> + </html:select> + </div> + <span class="col-md-7"> <strong><bean:message key="Tip" />:</strong> <bean:message key="erratasearch.jsp.whatsearch.tip" /> - </span> + </span> + </div> </td> </tr> - <tr><th><bean:message key="erratasearch.jsp.types_to_search"/></th> + <tr><td><bean:message key="erratasearch.jsp.types_to_search"/></td> <td> - <html:checkbox property="errata_type_bug"> + <div class="checkbox"> + <html:checkbox property="errata_type_bug"> <img src="/img/wrh-bug.gif" title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> <bean:message key="erratalist.jsp.bugadvisory"/> - </html:checkbox> - <br /> + </html:checkbox> + </div> + <div class="checkbox"> <html:checkbox property="errata_type_security"> <img src="/img/wrh-security.gif" title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> <bean:message key="erratalist.jsp.securityadvisory"/> </html:checkbox> - <br /> + </div> + <div class="checkbox"> <html:checkbox property="errata_type_enhancement"> <img src="/img/wrh-product.gif" title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> <bean:message key="erratalist.jsp.productenhancementadvisory"/> </html:checkbox> - <br /> + </div> </td> </tr> <tr> - <th><bean:message key="erratasearch.jsp.issue_date"/></th> + <td><bean:message key="erratasearch.jsp.issue_date"/></td> <td> + <div class="checkbox"> <html:checkbox styleId="issueDateOptionsCheckBox" property="optionIssueDateSearch" onclick="javascript:issueDateSearchOptions()" > <bean:message key="erratasearch.jsp.search_by_issue_dates"/> </html:checkbox> - <br /> - <div id="issueDateOptions" class="indent"> - <table> + </div> + <div id="issueDateOptions"> + <table class="table"> <tr> <td> <bean:message key="erratasearch.jsp.start_date" /> @@ -125,13 +132,24 @@ </td> </tr> <tr> - <th><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></th> + <td><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></td> <td> - <div style="text-align: left"> - <html:checkbox property="fineGrained" styleId="fineGrainedlabel"><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox> - </div> + <div class="checkbox"> + <html:checkbox property="fineGrained" styleId="fineGrainedlabel"> <label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox> + </div> </td> </tr> + <tr> + <td> +   + </td> + <td> + <button type="submit" class="btn btn-success btn-sm"> + <i class="icon-search"></i> + <bean:message key="button.search"/> + </button> + </td> + </tr> </table> </div>  </div>  commit 040189c1d9d3036621aaf504304830d0a939d81c Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 10:49:36 2013 +0200 Tables into Panels and <i> tag fixed diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index 51e52c7..5e7322a 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -23,52 +23,61 @@ <body> -<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="icon-search"> <bean:message key="scapsearch.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="scapsearch.jsp.summary"/></p> -<p><bean:message key="scapsearch.jsp.instructions"/></p> - -<html:form action="/audit/scap/Search.do"> - <rhn:csrf/> - <div class="search-choises"> - <div class="search-choices-group"> - <table class="details"> - <tr><th><bean:message key="scapsearch.jsp.searchfor"/>:</th> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="scapsearch.jsp.instructions"/></h4> + </div> + <div class="panel-body"> + <html:form styleClass="form-inline" action="/audit/scap/Search.do"> + <rhn:csrf/> + <table class="table"> + <tr> + <td><bean:message key="scapsearch.jsp.searchfor"/>:</td> <td> - <html:text property="search_string" name="search_string" + <div class="form-group"> + <html:text property="search_string" styleClass="form-control" name="search_string" value="${search_string}" maxlength="100" accesskey="4"/> - <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search" /> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default btn-sm"> + <i class="icon-search"></i> <bean:message key="button.search"/> - </button> + </button> + </div> <br/> <span class="small-text"> <bean:message key="scapsearch.jsp.whatsearch.tip"/> </span> </td> </tr> - <tr><th><bean:message key="scapsearch.jsp.withresult"/>:</th> + <tr> + <td><bean:message key="scapsearch.jsp.withresult"/>:</td> <td> - <html:select property="result_filter"> - <html:options collection="allResults" property="label" labelProperty="label"/> - </html:select> + <div class="form-group"> + <html:select styleClass="form-control" property="result_filter"> + <html:options collection="allResults" property="label" labelProperty="label"/> + </html:select> + </div> </td> </tr> - <tr><th><bean:message key="systemsearch.jsp.wheretosearch"/></th> + <tr><td><bean:message key="systemsearch.jsp.wheretosearch"/></td> <td> - <div style="text-align: left"> + <div class="text-left"> <html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/> <label for="whereToSearch-all"><bean:message key="systemsearch.jsp.searchallsystems"/></label> </div> - <div style="text-align: left"> + <div class="text-left"> <html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/> <label for="whereToSearch-system_list"><bean:message key="systemsearch.jsp.searchSSM"/></label> </div> </td> </tr> - <tr><th><bean:message key="scapsearch.jsp.scan_date"/>:</th> + <tr><td><bean:message key="scapsearch.jsp.scan_date"/>:</td> <td> <html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()"> <label for="scanDateOptionsCheckBox"> @@ -94,23 +103,26 @@ </div> </td> </tr> - <tr><th><bean:message key="scapsearch.jsp.show_as"/>:</th> + <tr><td><bean:message key="scapsearch.jsp.show_as"/>:</td> <td> - <div style="text-align: left"> + <div class="text-left"> <html:radio property="show_as" value="rr" styleId="show_as-rr"/> <label for="show_as-rr"><bean:message key="scapsearch.jsp.list_rr"/></label> </div> - <div style="text-align: left"> + <div class="text-left"> <html:radio property="show_as" value="tr" styleId="show_as-tr"/> <label for="show_as-tr"><bean:message key="scapsearch.jsp.list_tr"/></label> </div> </td> </tr> </table> - </div>  - </div>  - <input type="hidden" name="submitted" value="true"/> -</html:form> + <input type="hidden" name="submitted" value="true"/> + </html:form> + </div> +</div> + + + <c:if test="${(search_string != null && search_string != '')}"> <c:set var="pageList" value="${requestScope.pageList}"/> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 9c4efc2..cc84742 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -26,8 +26,7 @@ <body> <rhn:toolbar base="h1" icon="icon-search" - helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search" - imgAlt="search.alt.img"> + helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search"> <bean:message key="erratasearch.jsp.toolbar"/> </rhn:toolbar> @@ -48,7 +47,7 @@ <html:text property="search_string" name="search_string" value="${search_string}" maxlength="36" accesskey="4"/> <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search" /> + <i class="icon-search"></i> <bean:message key="button.search"/> </button> <br /> commit c8d6d463397461efbf6bcccbdb1b422975e8fa3f Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 10:47:47 2013 +0200 the first row of a table within a panel will not have border-top diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 9281324..0321658 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -548,4 +548,9 @@ ul.nav.nav-tabs:last-child{ margin: 0; } } +.panel-body tr:first-child{ + td, th{ + border-top: 0; + } +} commit fd2e4e65e936a8078681c9b619b95766f8135e35 Author: cyntss <csanchez(a)suse.com> Date: Wed Oct 23 10:46:45 2013 +0200 All page formated with panels and tables from Bootstrap diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 993a49a..2727ddc 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -8,14 +8,10 @@ <html> <head> <meta name="page-decorator" content="none" /> - - <style type="text/css"> - .fixedwidth { font-family: Courier, Monospace; } - </style> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="auditsearch.jsp.header"/> </rhn:toolbar> @@ -80,24 +76,28 @@ <c:out escapeXml="false" value="//]]>" /> </script> - -<html:form action="/audit/Search.do"> -<rhn:csrf /> -<rhn:submitted /> - -<div class="search-choices"> - <div class="search-choices-group"> - <table class="details"> - <tr> - <th colspan="3">Machine / Time range</th> - </tr> - <tr style="text-align: center;"> - <td style="text-align: center; vertical-align: middle;"> +<div class="panel panel-default"> + <div class="panel-body"> + <html:form action="/audit/Search.do"> + <rhn:csrf /> + <rhn:submitted /> + <div class="text-right form-group"> + <button type="submit" class="btn btn-success"> + <i class="icon-search"></i> + <bean:message key="button.search"/> + </button> + </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4>Machine / Time range</h4> + </div> + <div class="panel-body"> + <div class="col-md-4"> <html:select property="machine"> <html:options collection="machines" property="name" /> </html:select> - </td> - <td colspan="2"> + </div> + <div class="col-md-8"> <c:choose> <c:when test="${startDisp == '<<' || endDisp == '>>'}"> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> @@ -120,64 +120,66 @@ <html:hidden property="startMilli" /> <html:hidden property="endMilli" /> - </td> - </tr> - <tr> - <th colspan="3">Audit Types</th> - </tr> - <tr> - <td id="checkboxControls" colspan="3"> - <button type="button" id="check_all_button">Check all</button> - <button type="button" id="uncheck_all_button">Uncheck all</button> - </td> - </tr> - <tr> - <td> - <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> - <c:forEach var="autype" items="${types}" begin="0" step="3"> - <li> - <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> - <label for="type_${autype}"><c:out value="${autype}" /></label> - </li> - </c:forEach> - </ul> - </td> - <td> - <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> - <c:forEach var="autype" items="${types}" begin="1" step="3"> - <li> - <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> - <label for="type_${autype}"><c:out value="${autype}" /></label> - </li> - </c:forEach> - </ul> - </td> - <td> - <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> - <c:forEach var="autype" items="${types}" begin="2" step="3"> - <li> - <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> - <label for="type_${autype}"><c:out value="${autype}" /></label> - </li> - </c:forEach> - </ul> - </td> - </tr> - <tr> - <td> </td><td> </td> - <td style="text-align: right;"> - <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search" /> - <bean:message key="button.search"/> - </button> - </td> - </tr> - </table> - </div> + </div> + </div> + </div> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4>Audit Types</h4> + </div> + <div class="panel-body"> +<table class="table"> + <tr> + <td id="checkboxControls" colspan="3"> + <button type="button" class="btn btn-default" id="check_all_button">Check all</button> + <button type="button" class="btn btn-default" id="uncheck_all_button">Uncheck all</button> + </td> + </tr> + <tr> + <td> + <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> + <c:forEach var="autype" items="${types}" begin="0" step="3"> + <li> + <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> + <label for="type_${autype}"><c:out value="${autype}" /></label> + </li> + </c:forEach> + </ul> + </td> + <td> + <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> + <c:forEach var="autype" items="${types}" begin="1" step="3"> + <li> + <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> + <label for="type_${autype}"><c:out value="${autype}" /></label> + </li> + </c:forEach> + </ul> + </td> + <td> + <ul style="list-style-type: none; padding-left: 0; margin-top: 0;"> + <c:forEach var="autype" items="${types}" begin="2" step="3"> + <li> + <html:multibox property="autypes" value="${autype}" styleId="type_${autype}" /> + <label for="type_${autype}"><c:out value="${autype}" /></label> + </li> + </c:forEach> + </ul> + </td> + </tr> + </table> + </div> + </div> + <div class="text-right"> + <button type="submit" class="btn btn-success"> + <i class="icon-search"></i> + <bean:message key="button.search"/> + </button> + </div> + </html:form> + </div> </div> - -</html:form> - </body> </html> commit 5063e6fb296ce895966575b26e5a5045cddd07d3 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 23 10:01:32 2013 +0200 Rewrote spacewalk-login.js to make focus.js obsolete diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp index f850de8..be0d019 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -5,10 +5,9 @@ <html> <head> <meta name="decorator" content="layout_c" /> - <script src="/javascript/focus.js"></script> <script src="/javascript/spacewalk-login.js"></script> </head> -<body onLoad="formFocus('loginForm', 'username');"> +<body> <c:if test="${schemaUpgradeRequired == 'true'}"> <div class="site-alert"> diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp index a3d0131..742a5bd 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -4,10 +4,9 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <html> <head> - <script src="/javascript/focus.js"></script> <script src="/javascript/spacewalk-login.js"></script> </head> -<body onLoad="formFocus('loginForm', 'username');"> +<body> <c:if test="${schemaUpgradeRequired == 'true'}"> <div class="site-alert"> diff --git a/web/html/javascript/focus.js b/web/html/javascript/focus.js deleted file mode 100644 index c4c4129..0000000 --- a/web/html/javascript/focus.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Puts focus on an element in a form. - */ -function formFocus(form, name) { - var focusControl = document.forms[form].elements[name]; - - if (focusControl.type != "hidden" && !focusControl.disabled) { - focusControl.focus(); - } -} diff --git a/web/html/javascript/spacewalk-login.js b/web/html/javascript/spacewalk-login.js index 56083d5..9593d63 100644 --- a/web/html/javascript/spacewalk-login.js +++ b/web/html/javascript/spacewalk-login.js @@ -1,9 +1,17 @@ -$(document).on("ready", function(){ - $("aside").remove(); - $(document).ready(function() { - var me = $("section"); - var newMe = $("<div class='login-page'>"); - newMe.html(me.html()); - me.replaceWith(newMe); - }); -}); \ No newline at end of file +$(document).on("ready", function() { + $("aside").remove(); + var me = $("section"); + var newMe = $("<div class='login-page'>"); + newMe.html(me.html()); + me.replaceWith(newMe); + formFocus('loginForm', 'username'); +}); + +// Put focus on a form element +function formFocus(form, name) { + var focusControl = document.forms[form].elements[name]; + if (focusControl.type != "hidden" && !focusControl.disabled) { + focusControl.focus(); + } +} + commit 758feca34b1f8ee1074841b35eda79ca7d119d0a Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 17:51:11 2013 +0200 Adjust the column sizes diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index c06eb88..2a61800 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -37,7 +37,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.vcpus" /> </label> - <div class="col-lg-6"> + <div class="col-lg-1"> <html:text property="vcpus" size="15" value="1" styleClass="form-control" /> </div> </div> @@ -45,7 +45,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.memory" /> </label> - <div class="col-lg-6"> + <div class="col-lg-1"> <html:text property="mem_mb" size="15" value="512" styleClass="form-control" /> </div> </div> @@ -53,7 +53,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.bridge" /> </label> - <div class="col-lg-6"> + <div class="col-lg-1"> <html:text property="bridge" size="15" value="br0" styleClass="form-control" /> </div> </div> @@ -63,7 +63,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxyserver" /> </label> - <div class="col-lg-6"> + <div class="col-lg-3"> <html:text property="proxy_server" size="30" value="" styleClass="form-control" /> </div> </div> @@ -71,7 +71,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxyuser" /> </label> - <div class="col-lg-6"> + <div class="col-lg-3"> <html:text property="proxy_user" size="15" value="" styleClass="form-control" /> </div> </div> @@ -79,7 +79,7 @@ <label class="col-lg-3 control-label"> <bean:message key="images.jsp.proxypass" /> </label> - <div class="col-lg-6"> + <div class="col-lg-3"> <html:password property="proxy_pass" size="15" value="" styleClass="form-control" /> </div> </div> commit 42f4da19be3b1c268b4df723d6b2c40e03a74d98 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 17:29:52 2013 +0200 Add the form-control class to all text inputs diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index 936b0b0..c06eb88 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -38,7 +38,7 @@ <bean:message key="images.jsp.vcpus" /> </label> <div class="col-lg-6"> - <html:text property="vcpus" size="15" value="1" /> + <html:text property="vcpus" size="15" value="1" styleClass="form-control" /> </div> </div> <div class="form-group"> @@ -46,7 +46,7 @@ <bean:message key="images.jsp.memory" /> </label> <div class="col-lg-6"> - <html:text property="mem_mb" size="15" value="512" /> + <html:text property="mem_mb" size="15" value="512" styleClass="form-control" /> </div> </div> <div class="form-group"> @@ -54,7 +54,7 @@ <bean:message key="images.jsp.bridge" /> </label> <div class="col-lg-6"> - <html:text property="bridge" size="15" value="br0" /> + <html:text property="bridge" size="15" value="br0" styleClass="form-control" /> </div> </div> @@ -64,7 +64,7 @@ <bean:message key="images.jsp.proxyserver" /> </label> <div class="col-lg-6"> - <html:text property="proxy_server" size="30" value="" /> + <html:text property="proxy_server" size="30" value="" styleClass="form-control" /> </div> </div> <div class="form-group"> @@ -72,7 +72,7 @@ <bean:message key="images.jsp.proxyuser" /> </label> <div class="col-lg-6"> - <html:text property="proxy_user" size="15" value="" /> + <html:text property="proxy_user" size="15" value="" styleClass="form-control" /> </div> </div> <div class="form-group"> @@ -80,7 +80,7 @@ <bean:message key="images.jsp.proxypass" /> </label> <div class="col-lg-6"> - <html:password property="proxy_pass" size="15" value="" /> + <html:password property="proxy_pass" size="15" value="" styleClass="form-control" /> </div> </div> <div class="form-group"> commit d197a9972b2d1ba2faa15bbc5fa55201aa1f8231 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 17:28:55 2013 +0200 Add missing <div id="images-table"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index 5cc3eb1..936b0b0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -4,26 +4,29 @@ <rl:listset name="groupSet"> <rhn:csrf /> <html:hidden property="sid" value="${param.sid}" /> - <h2><bean:message key="images.jsp.select.title" /></h2> - <p><bean:message key="images.jsp.select.summary" /></p> - <rl:list dataset="imagesList" emptykey="images.jsp.noimages"> - <rl:column headerkey="images.jsp.name" filterattr="name"> - <c:set var="nameJS" value="${fn:escapeXml(rhn:escapeJS(current.name))}" /> - <a href="javascript:void(0);" - onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');"> - <c:out value="${current.name}" /> - </a> - </rl:column> - <rl:column headerkey="images.jsp.version"> - <c:out value="${current.version}" /> - </rl:column> - <rl:column headerkey="images.jsp.arch"> - <c:out value="${current.arch}" /> - </rl:column> - <rl:column headerkey="images.jsp.type"> - <c:out value="${current.imageType}" /> - </rl:column> - </rl:list> + + <div id="images-table"> + <h2><bean:message key="images.jsp.select.title" /></h2> + <p><bean:message key="images.jsp.select.summary" /></p> + <rl:list dataset="imagesList" emptykey="images.jsp.noimages"> + <rl:column headerkey="images.jsp.name" filterattr="name"> + <c:set var="nameJS" value="${fn:escapeXml(rhn:escapeJS(current.name))}" /> + <a href="javascript:void(0);" + onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');"> + <c:out value="${current.name}" /> + </a> + </rl:column> + <rl:column headerkey="images.jsp.version"> + <c:out value="${current.version}" /> + </rl:column> + <rl:column headerkey="images.jsp.arch"> + <c:out value="${current.arch}" /> + </rl:column> + <rl:column headerkey="images.jsp.type"> + <c:out value="${current.imageType}" /> + </rl:column> + </rl:list> + </div> <div id="deployment-form" style="display:none" class="form-horizontal"> <h2><bean:message key="images.jsp.deploy.title" /><a id="edit-link" href="" target="_blank"></a></h2> commit 07e18ef460907b6f9937b27f2130e8af60d9b566 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 17:25:13 2013 +0200 Table replaced to Panel. Form classes applied diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp index 01fbdeb..2608214 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp @@ -10,28 +10,44 @@ </head> <body> -<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="icon-search"> <bean:message key="scapdiff.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="scapdiff.jsp.summary"/></p> -<p><bean:message key="scapdiff.jsp.instructions"/></p> <html:form method="get" action="/audit/scap/DiffSubmit.do"> <rhn:csrf/> - - <table class="details"> - <tr> - <th><bean:message key="xccdfdiff.firstscan"/>:</th> - <td><html:text property="first"/></td> - </tr> - <tr> - <th><bean:message key="xccdfdiff.secondscan"/>:</th> - <td><html:text property="second"/> - <html:submit><bean:message key="xccdfdiff.schedulescan"/></html:submit> - </td> - </table> + <div class="panel panel-default"> + <div class="panel-heading"> + <bean:message key="scapdiff.jsp.instructions"/> + </div> + <div class="panel-body"> + <div class="form-group row"> + <div class="col-md-2 text-right"> + <bean:message key="xccdfdiff.firstscan"/>: + </div> + <div class="col-md-4"> + <html:text styleClass="form-control" property="first"/> + </div> + </div> + <div class="form-group row"> + <div class="col-md-2 text-right"> + <bean:message key="xccdfdiff.secondscan"/>: + </div> + <div class="col-md-4"> + <html:text property="second" styleClass="form-control"/> + </div> + </div> + <div class="form-group row"> + <div class="col-md-offset-2 col-md-4"> + <html:submit styleClass="btn btn-success"><bean:message key="xccdfdiff.schedulescan"/></html:submit> + </div> + </div> + </div> + </div> </html:form> + </body> </html> commit 17f21437c4d1ecbd68354f3396274a82c00a9f29 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 22 17:01:49 2013 +0200 TB3: Virtualization images form diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index e8888ca..5cc3eb1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -2,93 +2,97 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <rl:listset name="groupSet"> - <rhn:csrf /> - <html:hidden property="sid" value="${param.sid}" /> - - <div id="images-table"> + <rhn:csrf /> + <html:hidden property="sid" value="${param.sid}" /> <h2><bean:message key="images.jsp.select.title" /></h2> - <div class="page-summary"> - <p> - <bean:message key="images.jsp.select.summary" /> - </p> - </div> + <p><bean:message key="images.jsp.select.summary" /></p> <rl:list dataset="imagesList" emptykey="images.jsp.noimages"> - <rl:column headerkey="images.jsp.name" filterattr="name"> - <c:set var="nameJS" value="${fn:escapeXml(rhn:escapeJS(current.name))}" /> - <a href="javascript:void(0);" onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');"> - <c:out value="${current.name}" /> - </a> - </rl:column> - <rl:column headerkey="images.jsp.version"> - <c:out value="${current.version}" /> - </rl:column> - <rl:column headerkey="images.jsp.arch"> - <c:out value="${current.arch}" /> - </rl:column> - <rl:column headerkey="images.jsp.type"> - <c:out value="${current.imageType}" /> - </rl:column> + <rl:column headerkey="images.jsp.name" filterattr="name"> + <c:set var="nameJS" value="${fn:escapeXml(rhn:escapeJS(current.name))}" /> + <a href="javascript:void(0);" + onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');"> + <c:out value="${current.name}" /> + </a> + </rl:column> + <rl:column headerkey="images.jsp.version"> + <c:out value="${current.version}" /> + </rl:column> + <rl:column headerkey="images.jsp.arch"> + <c:out value="${current.arch}" /> + </rl:column> + <rl:column headerkey="images.jsp.type"> + <c:out value="${current.imageType}" /> + </rl:column> </rl:list> - </div> - <div id="deployment-form" style="display:none"> - <h2><bean:message key="images.jsp.deploy.title" /><a id="edit-link" href="" target="_blank"></a></h2> - <div class="page-summary"> - <p><bean:message key="images.jsp.deploy.summary" /></p> - </div> + <div id="deployment-form" style="display:none" class="form-horizontal"> + <h2><bean:message key="images.jsp.deploy.title" /><a id="edit-link" href="" target="_blank"></a></h2> + <p><bean:message key="images.jsp.deploy.summary" /></p> - <table class="details-2-columns" width="100%"> - <tbody> - <tr> - <td width="50%"> - <h2><bean:message key="images.jsp.vmsetup" /></h2> - <table class="details"> - <tr> - <th><bean:message key="images.jsp.vcpus" /></th> - <td><html:text property="vcpus" size="15" value="1" /></td> - </tr> - <tr> - <th><bean:message key="images.jsp.memory" /></th> - <td><html:text property="mem_mb" size="15" value="512" /></td> - </tr> - <tr> - <th><bean:message key="images.jsp.bridge" /></th> - <td><html:text property="bridge" size="15" value="br0" /></td> - </tr> - </table> - </td> - <td width="50%"> - <h2><bean:message key="images.jsp.proxyconfig" /></h2> - <table class="details"> - <tr> - <th><bean:message key="images.jsp.proxyserver" /></th> - <td><html:text property="proxy_server" size="30" value="" /></td> - </tr> - <tr> - <th><bean:message key="images.jsp.proxyuser" /></th> - <td><html:text property="proxy_user" size="15" value="" /></td> - </tr> - <tr> - <th><bean:message key="images.jsp.proxypass" /></th> - <td><html:password property="proxy_pass" size="15" value="" /></td> - </tr> - </table> - </td> - </tr> - </tbody> - </table> + <h3><bean:message key="images.jsp.vmsetup" /></h3> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.vcpus" /> + </label> + <div class="col-lg-6"> + <html:text property="vcpus" size="15" value="1" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.memory" /> + </label> + <div class="col-lg-6"> + <html:text property="mem_mb" size="15" value="512" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.bridge" /> + </label> + <div class="col-lg-6"> + <html:text property="bridge" size="15" value="br0" /> + </div> + </div> - <div align="right"> - <rhn:submitted /> - <html:hidden styleId="image-id" property="image_id" value="" /> - <hr /> - <input type="button" - onclick="showImages();" - value="${rhn:localize('images.jsp.cancel')}" /> - <html:submit property="dispatch" - disabled="${empty sessionScope.imagesList}"> - <bean:message key="images.jsp.dispatch" /> - </html:submit> + <h3><bean:message key="images.jsp.proxyconfig" /></h3> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.proxyserver" /> + </label> + <div class="col-lg-6"> + <html:text property="proxy_server" size="30" value="" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.proxyuser" /> + </label> + <div class="col-lg-6"> + <html:text property="proxy_user" size="15" value="" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="images.jsp.proxypass" /> + </label> + <div class="col-lg-6"> + <html:password property="proxy_pass" size="15" value="" /> + </div> + </div> + <div class="form-group"> + <rhn:submitted /> + <div class="col-lg-offset-3 col-lg-6"> + <html:hidden styleId="image-id" property="image_id" value="" /> + <input type="button" class="btn btn-default" + onclick="showImages();" + value="${rhn:localize('images.jsp.cancel')}" /> + <html:submit property="dispatch" + styleClass="btn btn-success" + disabled="${empty sessionScope.imagesList}"> + <bean:message key="images.jsp.dispatch" /> + </html:submit> + </div> + </div> </div> - </div> </rl:listset> commit a46162040026da8cda7afd0a569cba244fd4df78 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 16:49:00 2013 +0200 Panels included. empty div tags deleted. Icons included. obsolete classes removed diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf index 85c5c09..516cecc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf @@ -5,8 +5,7 @@ <rhn:column header="system.common.systemName" url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <img alt="<bean:message key='system.common.systemAlt' />" - src="/img/rhn-listicon-system.gif" /> + <i class="icon-desktop"></i> ${fn:escapeXml(current.name)} </rhn:column> @@ -22,7 +21,7 @@ <rhn:column header="targetsystems.jsp.action"> <rhn:require acl="not user_role(org_admin)"> <c:if test="${not current.provisioning}"> - <font color="red"><strong><bean:message key="targetsystems.jsp.orgadmin"/></strong></font><br /> + <p class="text-danger"><strong><bean:message key="targetsystems.jsp.orgadmin"/></strong></p><br /> </c:if> </rhn:require> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf index 6de4dbe..0be135d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf @@ -1,23 +1,31 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<table cellspacing="0" cellpadding="0" class="half-table"> - <thead><th><bean:message key="configoverview.jsp.configlinks"/></th></thead> - <tr class="list-row-odd"><td class="last-column first-column"><a href="/rhn/configuration/system/ManagedSystems.do"> +<div class="panel-heading"> + <h4><bean:message key="configoverview.jsp.configlinks"/></h4> +</div> +<ul class="list-group"> + <li class="list-group-item"> + <a href="/rhn/configuration/system/ManagedSystems.do"> <bean:message key="configoverview.jsp.viewsystems"/> - </a></td></tr> - - <tr class="list-row-even"><td class="last-column first-column"><a href="/rhn/configuration/file/GlobalConfigFileList.do"> + </a> + </li> + <li class="list-group-item"> + <a href="/rhn/configuration/file/GlobalConfigFileList.do"> <bean:message key="configoverview.jsp.viewfiles"/> - </a></td></tr> - - <tr class="list-row-odd"><td class="last-column first-column"><a href="/rhn/configuration/GlobalConfigChannelList.do"> + </a> + </li> + <li class="list-group-item"> + <a href="/rhn/configuration/GlobalConfigChannelList.do"> <bean:message key="configoverview.jsp.viewchannels"/> - </a></td></tr> - - <tr class="list-row-even"><td class="last-column first-column"><a href="/rhn/configuration/ChannelCreate.do?editing=true"> + </a> + </li> + <li class="list-group-item"> + <a href="/rhn/configuration/ChannelCreate.do?editing=true"> <bean:message key="configoverview.jsp.createchannel"/> - </a></td></tr> - - <tr class="list-row-odd"><td class="last-column first-column"><a href="/rhn/configuration/system/TargetSystems.do"> + </a> + </li> + <li class="list-group-item"> + <a href="/rhn/configuration/system/TargetSystems.do"> <bean:message key="configoverview.jsp.enableconfig"/> - </a></td></tr> -</table> \ No newline at end of file + </a> + </li> +</ul> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf index 2514349..e7df79d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf @@ -1,49 +1,51 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<table cellspacing="0" cellpadding="0" class="half-table"> - <thead><th><bean:message key="configoverview.jsp.configsummary"/></th> <th></th></thead> - <tr class="list-row-odd"> - <td><bean:message key="configoverview.jsp.systemsmanaged"/></td> - <td><a href="/rhn/configuration/system/ManagedSystems.do"> - <c:if test="${summary.systems == 1}"> - <bean:message key="system.common.onesystem" /> - </c:if> - <c:if test="${summary.systems != 1}"> - <bean:message key="system.common.numsystems" arg0="${summary.systems}"/> - </c:if> - </a></td> - </tr> - <tr class="list-row-even"> - <td><bean:message key="configoverview.jsp.configchannels"/></td> - <td><a href="/rhn/configuration/GlobalConfigChannelList.do"> - <c:if test="${summary.channels == 1}"> - <bean:message key="configoverview.jsp.onechannel" /> - </c:if> - <c:if test="${summary.channels != 1}"> - <bean:message key="configoverview.jsp.numchannels" arg0="${summary.channels}"/> - </c:if> - </a></td> - </tr> - <tr class="list-row-odd"> - <td><bean:message key="configoverview.jsp.centralfiles"/></td> - <td><a href="/rhn/configuration/file/GlobalConfigFileList.do"> - <c:if test="${summary.global_files == 1}"> - <bean:message key="config.common.onefile" /> - </c:if> - <c:if test="${summary.global_files != 1}"> - <bean:message key="config.common.numfiles" arg0="${summary.global_files}"/> - </c:if> - </a></td> - </tr> - <tr class="list-row-even"> - <td><bean:message key="configoverview.jsp.localfiles"/></td> - <td><a href="/rhn/configuration/file/LocalConfigFileList.do"> - <c:if test="${summary.local_files == 1}"> - <bean:message key="config.common.onefile" /> - </c:if> - <c:if test="${summary.local_files != 1}"> - <bean:message key="config.common.numfiles" arg0="${summary.local_files}"/> - </c:if> - </a></td> - </tr> -</table> +<div class="panel-heading"> + <h4><bean:message key="configoverview.jsp.configsummary"/></h4> +</div> +<ul class="list-group"> + <li class="list-group-item"> + <bean:message key="configoverview.jsp.systemsmanaged"/> + <a href="/rhn/configuration/system/ManagedSystems.do"> + <c:if test="${summary.systems == 1}"> + <bean:message key="system.common.onesystem" /> + </c:if> + <c:if test="${summary.systems != 1}"> + <bean:message key="system.common.numsystems" arg0="${summary.systems}"/> + </c:if> + </a> + </li> + <li class="list-group-item"> + <bean:message key="configoverview.jsp.configchannels"/> + <a href="/rhn/configuration/GlobalConfigChannelList.do"> + <c:if test="${summary.channels == 1}"> + <bean:message key="configoverview.jsp.onechannel" /> + </c:if> + <c:if test="${summary.channels != 1}"> + <bean:message key="configoverview.jsp.numchannels" arg0="${summary.channels}"/> + </c:if> + </a> + </li> + <li class="list-group-item"> + <bean:message key="configoverview.jsp.centralfiles"/> + <a href="/rhn/configuration/file/GlobalConfigFileList.do"> + <c:if test="${summary.global_files == 1}"> + <bean:message key="config.common.onefile" /> + </c:if> + <c:if test="${summary.global_files != 1}"> + <bean:message key="config.common.numfiles" arg0="${summary.global_files}"/> + </c:if> + </a> + </li> + <li class="list-group-item"> + <bean:message key="configoverview.jsp.localfiles"/> + <a href="/rhn/configuration/file/LocalConfigFileList.do"> + <c:if test="${summary.local_files == 1}"> + <bean:message key="config.common.onefile" /> + </c:if> + <c:if test="${summary.local_files != 1}"> + <bean:message key="config.common.numfiles" arg0="${summary.local_files}"/> + </c:if> + </a> + </li> +</ul> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp index 7b07e22..4d9b7c3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-Software-Channel-Management" imgAlt="config.jsp.imgAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-Software-Channel-Management" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central" creationUrl="/rhn/configuration/ChannelCreate.do?editing=true" creationType="configchannel" @@ -17,13 +17,11 @@ <bean:message key="globalconfiglist.jsp.toolbar"/> </rhn:toolbar> - <div class="page-summary"> <p> <bean:message key="globalconfiglist.jsp.summary"/> </p> - </div> -<form method="post" name="rhn_list" action="/rhn/configuration/GlobalConfigChannelList.do"> +<form method="post" role="form" name="rhn_list" action="/rhn/configuration/GlobalConfigChannelList.do"> <rhn:csrf /> <rhn:submitted /> @@ -31,8 +29,7 @@ <rhn:listdisplay filterBy="globalconfiglist.jsp.name"> <rhn:column header="globalconfiglist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif" /> + <i class="spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp index c5701b0..db1b2b8 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp @@ -8,16 +8,16 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_files.gif" imgAlt="config.common.filesAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"> <bean:message key="globalfilelist.jsp.toolbar"/> </rhn:toolbar> -<div class="page-summary"> +<p> <bean:message key="globalfilelist.jsp.summary"/> -</div> <br /> +</p> -<form method="post" name="rhn_list" action="/rhn/configuration/file/GlobalConfigFileList.do"> +<form method="post" role="form" name="rhn_list" action="/rhn/configuration/file/GlobalConfigFileList.do"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index 9f4db16..bed42c8 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -7,16 +7,14 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_files.gif" imgAlt="config.common.filesAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local"> <bean:message key="localfilelist.jsp.toolbar"/> </rhn:toolbar> -<div class="page-summary"> - <bean:message key="localfilelist.jsp.summary"/> -</div> <br /> + <p><bean:message key="localfilelist.jsp.summary"/></p> -<form method="post" name="rhn_list" action="/rhn/configuration/file/LocalConfigFileList.do"> +<form method="post" role="form" name="rhn_list" action="/rhn/configuration/file/LocalConfigFileList.do"> <rhn:csrf /> <rhn:submitted /> @@ -30,8 +28,7 @@ <rhn:column header="localfilelist.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="icon-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.serverName} </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index b0dc83a..811576b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -9,19 +9,17 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems" > <bean:message key="managedsystems.jsp.toolbar"/> </rhn:toolbar>  - <div class="page-summary"> <p> <bean:message key="managedsystems.jsp.summary"/> </p> - </div> -<form method="post" name="rhn_list" action="/rhn/configuration/system/ManagedSystems.do"> +<form method="post" role="form" name="rhn_list" action="/rhn/configuration/system/ManagedSystems.do"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index 222fa73..e7264bb 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -16,120 +16,126 @@ <bean:message key="configoverview.jsp.toolbar"/> </rhn:toolbar> - <div class="page-summary"> <p> <bean:message key="configoverview.jsp.summary"/> </p> - </div>   - <div class="half-table half-table-left"> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf" %> + <div class="row-0"> + <div class="col-md-6"> + <div class="panel panel-default"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf" %> + </div> + </div> + +  + <div class="col-md-6"> + <div class="panel panel-default"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/overview/links.jspf" %> + </div> + </div> </div> -  - <div class="half-table half-table-right"> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/overview/links.jspf" %> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="configoverview.jsp.modconfig"/></h4> + </div> + <div class="panel-body"> + + <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles"> + <rhn:listdisplay> + <rhn:column header="configoverview.jsp.filename" + url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> + <c:choose> + <c:when test="${current.type == 'file'}"> + <i class="icon-file-text-alt"></i> + ${fn:escapeXml(current.path)} + </c:when> + <c:when test="${current.type == 'directory'}"> + <i class="icon-folder-close"></i> + ${fn:escapeXml(current.path)} + </c:when> + <c:otherwise> + <i class="icon-list-alt"></i> + ${fn:escapeXml(current.path)} + </c:otherwise> + </c:choose> + </rhn:column> + + <rhn:column header="config.common.configChannel" + url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> + + <c:if test="${current.configChannelType == 'normal'}"> + <i class="spacewalk-icon-software-channels"></i> + ${current.channelNameDisplay} + </c:if> + + <c:if test="${current.configChannelType == 'local_override'}"> + <i class="icon-desktop"></i> + ${current.channelNameDisplay} + </c:if> + + <c:if test="${current.configChannelType == 'server_import'}"> + <i class="icon-beaker"></i> + ${current.channelNameDisplay} + </c:if> + + </rhn:column> + + <rhn:column header="configoverview.jsp.modified"> + ${current.modifiedDisplay} + </rhn:column> + + </rhn:listdisplay> + </rhn:list> + </div> + </div> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="configoverview.jsp.schedconfig"/></h4> + </div> + <div class="panel-body"> + <rhn:list pageList="${requestScope.recentActions}" noDataText="configoverview.jsp.noActions"> + <rhn:listdisplay> + <rhn:column header="configoverview.jsp.system" + url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> + <i class="icon-desktop"></i> + ${fn:escapeXml(current.serverName)} + </rhn:column> + + <rhn:column header="configoverview.jsp.files"> + <c:if test="${current.fileCount == 1}"> + <bean:message key="config.common.onefile" /> + </c:if> + <c:if test="${current.fileCount != 1}"> + <bean:message key="config.common.numfiles" arg0="${current.fileCount}"/> + </c:if> + </rhn:column> + + <rhn:column header="configoverview.jsp.scheduledBy" + url="/rhn/users/UserDetails.do?uid=${current.scheduledById}" + renderUrl="${requestScope.is_admin}"> + <img alt='<bean:message key="user.common.userAlt" />' + src="/img/rhn-listicon-user.gif" /> + ${fn:escapeXml(current.scheduledByName)} + </rhn:column> + + <rhn:column header="configoverview.jsp.scheduledFor"> + ${current.earliestDisplay} + </rhn:column> + + <rhn:column header="configoverview.jsp.status" + url="/rhn/schedule/ActionDetails.do?aid=${current.id}"> + ${current.status} + </rhn:column> + + </rhn:listdisplay> + </rhn:list> + </div> </div> - <div style="clear: both; padding-top: 10px;" /> - - <h2><bean:message key="configoverview.jsp.modconfig"/></h2> - - <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles"> - <rhn:listdisplay> - <rhn:column header="configoverview.jsp.filename" - url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> - <c:choose> - <c:when test="${current.type == 'file'}"> - <img alt='<bean:message key="config.common.fileAlt" />' - src="/img/rhn-listicon-cfg_file.gif" /> - ${fn:escapeXml(current.path)} - </c:when> - <c:when test="${current.type == 'directory'}"> - <img alt='<bean:message key="config.common.dirAlt" />' - src="/img/rhn-listicon-cfg_folder.gif" /> - ${fn:escapeXml(current.path)} - </c:when> - <c:otherwise> - <img alt='<bean:message key="config.common.symlinkAlt" />' - src="/img/rhn-listicon-cfg_symlink.gif" /> - ${fn:escapeXml(current.path)} - </c:otherwise> - </c:choose> - </rhn:column> - - <rhn:column header="config.common.configChannel" - url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> - - <c:if test="${current.configChannelType == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif" /> - ${current.channelNameDisplay} - </c:if> - - <c:if test="${current.configChannelType == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' - src="/img/rhn-listicon-system.gif" /> - ${current.channelNameDisplay} - </c:if> - - <c:if test="${current.configChannelType == 'server_import'}"> - <img alt='<bean:message key="config.common.sandboxAlt" />' - src="/img/rhn-listicon-sandbox.gif" /> - ${current.channelNameDisplay} - </c:if> - - </rhn:column> - - <rhn:column header="configoverview.jsp.modified"> - ${current.modifiedDisplay} - </rhn:column> - - </rhn:listdisplay> - </rhn:list> - - <h2><bean:message key="configoverview.jsp.schedconfig"/></h2> - - <rhn:list pageList="${requestScope.recentActions}" noDataText="configoverview.jsp.noActions"> - <rhn:listdisplay> - <rhn:column header="configoverview.jsp.system" - url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <img alt='<bean:message key="system.common.systemAlt" />' - src="/img/rhn-listicon-system.gif" /> - ${fn:escapeXml(current.serverName)} - </rhn:column> - - <rhn:column header="configoverview.jsp.files"> - <c:if test="${current.fileCount == 1}"> - <bean:message key="config.common.onefile" /> - </c:if> - <c:if test="${current.fileCount != 1}"> - <bean:message key="config.common.numfiles" arg0="${current.fileCount}"/> - </c:if> - </rhn:column> - - <rhn:column header="configoverview.jsp.scheduledBy" - url="/rhn/users/UserDetails.do?uid=${current.scheduledById}" - renderUrl="${requestScope.is_admin}"> - <img alt='<bean:message key="user.common.userAlt" />' - src="/img/rhn-listicon-user.gif" /> - ${fn:escapeXml(current.scheduledByName)} - </rhn:column> - - <rhn:column header="configoverview.jsp.scheduledFor"> - ${current.earliestDisplay} - </rhn:column> - - <rhn:column header="configoverview.jsp.status" - url="/rhn/schedule/ActionDetails.do?aid=${current.id}"> - ${current.status} - </rhn:column> - - </rhn:listdisplay> - </rhn:list> - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp index 4efe5cc..9bafb8a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp @@ -8,21 +8,18 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"> <bean:message key="targetsystems.jsp.toolbar" /> </rhn:toolbar> -<div class="page-summary"> <p> <bean:message key="targetsystems.jsp.summary" arg0="${channel.displayName}" arg1="/rhn/configuration/ChannelOverview.do?ccid=${ccid}" arg2="/img/folder-config-sm.png" /> </p> -</div> -<div> <html:form method="POST" action="/configuration/system/TargetSystemsSubmit"> <rhn:csrf /> <rhn:list pageList="${requestScope.pageList}" @@ -37,7 +34,6 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf" %> <html:hidden property="submitted" value="true"/> </html:form> -</div> </body> </html> commit 3f1b701eee0042c6efe1f26f0b90774dc09c2eb6 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 16:46:59 2013 +0200 th sintax error fixed. Icon added. Font tag changed to P diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp index d2506a4..34adc36 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp @@ -6,11 +6,10 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_system.gif"> +<rhn:toolbar base="h1" icon="icon-cogs"> <bean:message key="summary.jsp.toolbar"/> </rhn:toolbar> -<div class="page-summary"> <p> <bean:message key="summary.jsp.summary" /> <ol> @@ -18,16 +17,13 @@ <li><bean:message key="summary.jsp.steptwo" /> </ol> </p> -</div> -<div> -<form method="post" name="rhn_list" +<form method="post" role="form" name="rhn_list" action="/rhn/configuration/system/Summary.do"> <rhn:csrf /> <rhn:submitted /> <%@ include file="/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf" %> </form> -</div> </body> </html> commit a1a758d3bdcd06e1f24bdbffc1f27a508020a936 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 16:39:01 2013 +0200 th sintax error fixed. Icon added. Font tag changed to P diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf index e9c6177..476e67a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf @@ -5,19 +5,19 @@ <c:if test="${not empty requestScope.pageList}"> <p><bean:message key="targetsystems.jsp.widgetsummary" /></p> -<table class="schedule-action-interface" align="center"> +<table class="table"> <tr> <td><html:radio property="use_date" value="false" /></td> - <th><bean:message key="targetsystems.jsp.now"/></th> + <td><bean:message key="targetsystems.jsp.now"/></td> </tr> <tr> <td><html:radio property="use_date" value="true" /></td> - <th><bean:message key="targetsystems.jsp.usedate"/></th> + <td><bean:message key="targetsystems.jsp.usedate"/></td> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> - </th> + <td> + <i class="icon-desktop"></i> + </td> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> <jsp:param name="widget" value="date"/> @@ -26,8 +26,7 @@ </tr> </table> -<div align="right"> - <hr /> +<div class="pull-right"> <html:submit property="dispatch"> <bean:message key="targetsystems.jsp.enable" /> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 6147c49..064b881 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -27,12 +27,14 @@ <div class="search-choices-group panel-body"> <div class="form-group row"> <div class="col-md-2 text-right"> - <label><bean:message key="docsearch.jsp.searchfor"/></label> + <label for="searchform"><bean:message key="docsearch.jsp.searchfor"/></label> </div> - <div class="col-md-10"> + <div class="col-md-4"> <html:text property="search_string" name="search_string" + styleId="searchform" value="${search_string}" + styleClass="form-control" accesskey="4"/> </div> </div> @@ -40,8 +42,8 @@ <div class="col-md-2 text-right"> <label><bean:message key="docsearch.jsp.whatsearch"/></label> </div> - <div class="col-md-10"> - <html:select property="view_mode" value="${view_mode}" > + <div class="col-md-4"> + <html:select property="view_mode" styleClass="form-control" value="${view_mode}" > <html:options collection="searchOptions" property="value" labelProperty="display" /> commit 8d57358e876eccc5bca0b79a5736adcac972d4f1 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 16:20:14 2013 +0200 Make display.js obsolete by calling jquery directly No need for a separate js file just to toggle visibility of asterisks. diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp index ae17a41..d5db766 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp @@ -5,7 +5,6 @@ <html> <body> - <script language="javascript" src="/javascript/display.js"></script> <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="orgcreate.jsp.title"/> </rhn:toolbar> @@ -82,7 +81,7 @@ <c:choose> <c:when test="${displaypamcheckbox == 'true'}"> <label for="pam"> - <html:checkbox property="usepam" onclick="toggleVisibilityByName('password-asterisk')" styleId="pam"/> + <html:checkbox property="usepam" onclick="$(\"[name='password-asterisk']\").toggle()" styleId="pam"/> <bean:message key="usercreate.jsp.pam.instructions"/> </label> <span class="help-block"> diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp index 31d1a84..ea17341 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -5,8 +5,6 @@ <html:xhtml/> <html> <body> -<script language="javascript" src="/javascript/display.js"></script> - <%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>  @@ -63,7 +61,7 @@ <td> <c:choose> <c:when test="${displaypamcheckbox == 'true'}"> - <html:checkbox property="usepam" onclick="toggleVisibilityByName('password-asterisk')" styleId="pam"/> + <html:checkbox property="usepam" onclick="$(\"[name='password-asterisk']\").toggle()" styleId="pam"/> <label for="pam"><bean:message key="usercreate.jsp.pam.instructions"/></label> <br/> <strong><span style="font-size: 10px"> <bean:message key="usercreate.jsp.pam.instructions.note"/> diff --git a/web/html/javascript/display.js b/web/html/javascript/display.js deleted file mode 100644 index 90c7d81..0000000 --- a/web/html/javascript/display.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Toggles display attribute between '' and 'none' for all - * elements on a page matching the name passed in. - */ -function toggleVisibilityByName(name) { - var items = document.getElementsByName(name); - for (var i = 0; i < items.length; i++) { - items[i].style.display = items[i].style.display? "":"none"; - } -} commit 4b680d7c282ee3b0f3ba4e9bd94417428a240b55 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 13:57:28 2013 +0200 Refactor images.js to spacewalk-images.js diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp index ca0377e..a7c593e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp @@ -8,7 +8,7 @@ <head> <script type="text/javascript" src="/rhn/dwr/interface/ImagesRenderer.js"></script> <script type="text/javascript" src="/rhn/dwr/engine.js"></script> - <script type="text/javascript" src="/javascript/images.js"></script> + <script src="/javascript/spacewalk-images.js"></script> </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> diff --git a/web/html/javascript/images.js b/web/html/javascript/images.js deleted file mode 100644 index 5e94b7a..0000000 --- a/web/html/javascript/images.js +++ /dev/null @@ -1,24 +0,0 @@ -// Show form and hide the images table -function showForm(id, name, version, arch, type, editUrl) { - // Setup link for editing image - $('#edit-link').text(name); - $('#edit-link').prop('href', editUrl); - // Create string representation - var imgString = "\"" + name + "\", Version " + version + " (" + arch + ", " + type + ")"; - $('#image-string').text(imgString); - $('#image-id').val(id); - // Show form fields and hide table - $('#deployment-form').show(); - $('#images-table').hide(); -} -// Show table and hide form fields -function showImages() { - $('#images-table').show(); - $('#deployment-form').hide(); - // Reset elements - $('#image-id').val(''); - $('#image-string').empty(); - $('#edit-link').prop('href', ''); - $('#edit-link').empty(); -} - diff --git a/web/html/javascript/spacewalk-images.js b/web/html/javascript/spacewalk-images.js new file mode 100644 index 0000000..5e94b7a --- /dev/null +++ b/web/html/javascript/spacewalk-images.js @@ -0,0 +1,24 @@ +// Show form and hide the images table +function showForm(id, name, version, arch, type, editUrl) { + // Setup link for editing image + $('#edit-link').text(name); + $('#edit-link').prop('href', editUrl); + // Create string representation + var imgString = "\"" + name + "\", Version " + version + " (" + arch + ", " + type + ")"; + $('#image-string').text(imgString); + $('#image-id').val(id); + // Show form fields and hide table + $('#deployment-form').show(); + $('#images-table').hide(); +} +// Show table and hide form fields +function showImages() { + $('#images-table').show(); + $('#deployment-form').hide(); + // Reset elements + $('#image-id').val(''); + $('#image-string').empty(); + $('#edit-link').prop('href', ''); + $('#edit-link').empty(); +} + commit 2ffad5d3bb5f67f07bf6160db082c0343f9be206 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 16:36:35 2013 +0200 tables inside panels have no bottom margin. thead bg colour changed diff --git a/branding/css/tables.less b/branding/css/tables.less index 6d6134a..ff9cde5 100644 --- a/branding/css/tables.less +++ b/branding/css/tables.less @@ -12,8 +12,7 @@ } .table-rounded thead th{ padding: .7em 0 .7em 1em; - color: #fff; - background: #ccc; + background: #e7e7e7; border-bottom: 0px solid @gray-light; border-right: 0px solid @gray-light; } @@ -83,3 +82,6 @@ thead tr{ tfoot{ background: #f3f3f3 } +.panel .table{ + margin-bottom: 0; +} \ No newline at end of file commit eeac129a2517c15d97afb29fa525786ac6d53103 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 16:35:43 2013 +0200 class .row-0 makes the first and last child have no paddings in the left and right side. P now has 2em margin-bottom diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index d3277a8..9281324 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -14,7 +14,15 @@ /* Import of the Theme */ @import url(theme.less); /* basic layout */ - +.row-0 { + .make-row(); + &:first-child { + padding-left:0; + } + &:last-child { + padding-right: 0 + } +} .spacewalk-header-container { .make-row(0); .spacewalk-logo { @@ -90,7 +98,9 @@ h1 { h2 { font-size: 1.7em; } - +p { + margin-bottom: 2em; +} .spacewalk-main-column-layout { /* override the grid row margin */ margin-right: 0; @@ -154,7 +164,7 @@ i[class^="spacewalk-icon"] { margin-right: .5em; } /* if the icon is inside a H tag we wont use a margin*/ -h1, h2, h3, h4, h5, h6{ +h1, h2, h3, h4, h5, h6 { i[class^="icon-"], i[class*=" icon-"], i[class*="spacewalk-icon"], @@ -177,30 +187,24 @@ h1, h2, h3, h4, h5, h6{ } header { - .spacewalk-header-container { margin: 0 1em; } - /* undo the padding the grid columns give */ &#spacewalk-header { padding-right: 0; padding-left: 0 } - .spacewalk-logo { padding-top: 1.4em; } - .spacewalk-logo { padding-top: 1.4em; } - .nav-pills { display: inline-block; border-radius: 0 0 4px 4px } - .nav-pills li > a { padding: .3em 1em; font-size: .85em; @@ -208,12 +212,10 @@ header { font-weight: normal; letter-spacing: normal; } - .nav-pills li > a:hover { background: none; text-decoration: underline; } - ul.nav-pills:nth-child(1) { background: #000; } @@ -464,7 +466,7 @@ h1 .icon-stack { } /* spacewalk toolbar */ -.spacewalk-toolbar-h1{ +.spacewalk-toolbar-h1 { margin-bottom: 1.5em; .spacewalk-toolbar { .pull-right; commit 77464c3290186371fe54ecb612b0ff3f5490865f Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 22 16:13:22 2013 +0200 TB3: Create new erratum form diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/webapp/WEB-INF/pages/errata/create.jsp index 5071e86..2dd440c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/create.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp @@ -3,169 +3,160 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> <html> -<head> - <meta name="page-decorator" content="none" /> -</head> -<body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" - helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp"> - <bean:message key="erratalist.jsp.erratamgmt"/> - </rhn:toolbar> - - <h2><bean:message key="errata.create.jsp.createerrata" /></h2> - - <div class="page-summary"> - <p><bean:message key="errata.create.jsp.instructions" /></p> - </div> -<html:form action="/errata/manage/CreateSubmit"> - <rhn:csrf /> - - <table class="details"> - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.synopsis"/> - </th> - <td class="small-form"> - <html:text property="synopsis" size="60" maxlength="4000" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisory"/> - </th> - <td class="small-form"> - <html:text property="advisoryName" size="25" maxlength="32" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisoryrelease"/> - </th> - <td class="small-form"> - <html:text property="advisoryRelease" size="4" maxlength="4"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.advisorytype"/> - </th> - <td class="small-form"> - <html:select property="advisoryType"> - <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/> - </html:select> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.product"/> - </th> - <td class="small-form"> - <html:text property="product" size="30" maxlength="64" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.from"/> - </th> - <td class="small-form"> - <html:text property="errataFrom" size="30" maxlength="127" /> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.topic"/> - </th> - <td class="small-form"> - <html:textarea property="topic" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.description"/> - </th> - <td class="small-form"> - <html:textarea property="description" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.solution"/> - </th> - <td class="small-form"> - <html:textarea property="solution" cols="80" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.bugs"/> - </th> - <td class="small-form"> - <table cellpadding="3"> - <tr> - <td><bean:message key="errata.create.jsp.id"/></td> - <td><html:text property="buglistId" size="6" /></td> - </tr><tr> - <td><bean:message key="errata.create.jsp.summary"/></td> - <td><html:text property="buglistSummary" size="60" /></td> - </tr><tr> - <td><bean:message key="errata.create.jsp.bugurl"/></td> - <td><html:text property="buglistUrl" size="60" /></td> - </tr> - </table> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.keywords"/> <br /> - <bean:message key="errata.edit.commadelimited"/> - </th> - <td class="small-form"> - <html:text property="keywords" size="40"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.references"/> - </th> - <td class="small-form"> - <html:textarea property="refersTo" cols="40" rows="6"/> - </td> - </tr> - - <tr> - <th nowrap="nowrap"> - <bean:message key="errata.create.jsp.notes"/> - </th> - <td class="small-form"> - <html:textarea property="notes" cols="40" rows="6"/> - </td> - </tr> - - </table> - - - <input type="hidden" name="eid" value="0" /> - <div align="right"> - <hr /> - <html:submit> - <bean:message key="errata.create.jsp.createerrata"/> - </html:submit> - </div> - - </html:form> - -</body> + <head> + <meta name="page-decorator" content="none" /> + </head> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" + helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp"> + <bean:message key="erratalist.jsp.erratamgmt"/> + </rhn:toolbar> + + <h2><bean:message key="errata.create.jsp.createerrata" /></h2> + <p><bean:message key="errata.create.jsp.instructions" /></p> + <html:form action="/errata/manage/CreateSubmit" + styleClass="form-horizontal"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.synopsis"/> + </label> + <div class="col-lg-6"> + <html:text property="synopsis" size="60" + styleClass="form-control" maxlength="4000" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisory"/> + </label> + <div class="col-lg-6"> + <html:text property="advisoryName" styleClass="form-control" + size="25" maxlength="32" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisoryrelease"/> + </label> + <div class="col-lg-6"> + <html:text property="advisoryRelease" styleClass="form-control" size="4" maxlength="4"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.advisorytype"/> + </label> + <div class="col-lg-6"> + <html:select property="advisoryType" styleClass="form-control"> + <html:options name="advisoryTypes" labelProperty="advisoryTypeLabels"/> + </html:select> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.product"/> + </label> + <div class="col-lg-6"> + <html:text property="product" size="30" maxlength="64" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.from"/> + </label> + <div class="col-lg-6"> + <html:text property="errataFrom" size="30" maxlength="127" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.topic"/> + </label> + <div class="col-lg-6"> + <html:textarea property="topic" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.description"/> + </label> + <div class="col-lg-6"> + <html:textarea property="description" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.solution"/> + </label> + <div class="col-lg-6"> + <html:textarea property="solution" cols="80" rows="6" styleClass="form-control"/> + </div> + </div> + + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <h3><bean:message key="errata.create.jsp.bugs"/></h3> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.id"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistId" size="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.summary"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistSummary" size="60" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.bugurl"/> + </label> + <div class="col-lg-6"> + <html:text property="buglistUrl" size="60" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.keywords"/> + </label> + <div class="col-lg-6"> + <html:text property="keywords" size="40" styleClass="form-control"/> + <span class="help-block"><bean:message key="errata.edit.commadelimited"/></span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.references"/> + </label> + <div class="col-lg-6"> + <html:textarea property="refersTo" cols="40" rows="6" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="errata.create.jsp.notes"/> + </label> + <div class="col-lg-6"> + <html:textarea property="notes" cols="40" rows="6" styleClass="form-control"/> + </div> + </div> + <input type="hidden" name="eid" value="0" /> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="errata.create.jsp.createerrata"/> + </html:submit> + </div> + </div> + </html:form> + </body> </html> commit 4c14a5304dd453dbeaa79094da65b13f1a3ef09a Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 22 15:49:54 2013 +0200 TB3: Delete software channel form diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index ac6c85f..002eb5d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -4,197 +4,175 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> -<body> -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"> - <bean:message key="channel.delete.jsp.toolbar" arg0="${channel.name}"/> -</rhn:toolbar> - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/manage_channel.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - -<div> - <html:form action="/channels/manage/Delete"> - <rhn:csrf /> - -  - - <h2><bean:message key="channel.delete.jsp.channelheader"/></h2> - - <div class="page-summary"> - <p><bean:message key="channel.delete.jsp.introparagraph"/></p> - </div> - - <table class="details"> -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.name"/>: - </th> - <td class="small-form"> - <strong><c:out value="${channel.name}"/></strong> (<c:out value="${channel.label}"/>) - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.parent"/>: - </th> - <td class="small-form"> - <c:choose> - <c:when test="${channel.parentChannel eq null}"> - <span class="no-details"><bean:message key="none.message"/></span> - </c:when> - <c:otherwise> - <c:out value="${channel.parentChannel.name}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.arch"/> - </th> - <td class="small-form"> - <c:out value="${channel.channelArch.name}"/> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.totalpackages"/> - </th> - <td class="small-form"> - <c:out value="${channel.packageCount}"/> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.systemssubscribed"/> - </th> - <td class="small-form"> - <c:out value="${subscribedSystemsCount}"/> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.summary"/>: - </th> - <td class="small-form"> - <c:out value="${channel.summary}"/> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.description"/>: - </th> - <td class="small-form"> - <c:choose> - <c:when test="${channel.description eq null}"> - <span class="no-details"><bean:message key="none.message"/></span> - </c:when> - <c:otherwise> - <c:out value="${channel.description}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - - </table> - -  - - <h2><bean:message key="channel.delete.jsp.orgsheader"/></h2> - - <div class="page-summary"> - <p><bean:message key="channel.delete.jsp.orgsparagraph" arg0="<strong>${channel.name}</strong>"/></p> - </div> - - <table class="details"> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.orgsaffected"/> - </th> - <td class="small-form"> - <c:out value="${channel.trustedOrgsCount}"/> - </td> - </tr> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.systemssubscribed"/> - </th> - <td class="small-form"> - <c:out value="${trustedSystemsCount}"/> - </td> - </tr> - - </table> - -  - - <h2><bean:message key="channel.delete.jsp.unsubheader"/></h2> - - <div class="page-summary"> - <p><bean:message key="channel.delete.jsp.unsubparagraph" arg0="<strong>${channel.name}</strong>"/></p> - </div> - - <table class="details"> - -  - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.delete.jsp.unsubheader"/>: - </th> - <td class="small-form"> - <input type="checkbox" name="unsubscribeSystems"/> - </td> - </tr> - - </table> - - <div align="right"> - <hr/> - <c:choose> - <c:when test="${empty requestScope.disableDelete}"> - <html:submit property="delete_button"> - <bean:message key="channel.delete.jsp.channelheader"/> - </html:submit> - </c:when> - <c:otherwise> - <html:submit property="delete_button" disabled="true"> - <bean:message key="channel.delete.jsp.channelheader"/> - </html:submit> - </c:otherwise> - </c:choose> - - </div> - <html:hidden property="submitted" value="true"/> - <c:if test='${not empty param.cid}'> - <html:hidden property="cid" value="${param.cid}"/> - </c:if> - </html:form> -</div> - -</body> + <body> + <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"> + <bean:message key="channel.delete.jsp.toolbar" arg0="${channel.name}"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/manage_channel.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> + <html:form action="/channels/manage/Delete" styleClass="form-horizontal"> + <rhn:csrf /> + <h2><bean:message key="channel.delete.jsp.channelheader"/></h2> + <p><bean:message key="channel.delete.jsp.introparagraph"/></p> + + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.name"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <strong><c:out value="${channel.name}"/></strong> (<c:out value="${channel.label}"/>) + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.parent"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${channel.parentChannel eq null}"> + <span class="no-details"><bean:message key="none.message"/></span> + </c:when> + <c:otherwise> + <c:out value="${channel.parentChannel.name}"/> + </c:otherwise> + </c:choose> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.delete.jsp.arch"/> + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${channel.channelArch.name}"/> + </div> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.delete.jsp.totalpackages"/> + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${channel.packageCount}"/> + </div> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.delete.jsp.systemssubscribed"/> + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${subscribedSystemsCount}"/> + </div> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.summary"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${channel.summary}"/> + </div> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.description"/>: + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:choose> + <c:when test="${channel.description eq null}"> + <span class="no-details"><bean:message key="none.message"/></span> + </c:when> + <c:otherwise> + <c:out value="${channel.description}"/> + </c:otherwise> + </c:choose> + </div> + </div> + </div> + +  + <h2><bean:message key="channel.delete.jsp.orgsheader"/></h2> + <p><bean:message key="channel.delete.jsp.orgsparagraph" arg0="<strong>${channel.name}</strong>"/></p> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.delete.jsp.orgsaffected"/> + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${channel.trustedOrgsCount}"/> + </div> + </div> + </div> + +  + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.delete.jsp.systemssubscribed"/> + </label> + <div class="col-lg-6"> + <div class="well well-sm"> + <c:out value="${trustedSystemsCount}"/> + </div> + </div> + </div> + +  + <h2><bean:message key="channel.delete.jsp.unsubheader"/></h2> + <p><bean:message key="channel.delete.jsp.unsubparagraph" arg0="<strong>${channel.name}</strong>"/></p> + +  + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="checkbox" name="unsubscribeSystems"/> + <bean:message key="channel.delete.jsp.unsubheader"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test="${empty requestScope.disableDelete}"> + <html:submit property="delete_button" styleClass="btn btn-success"> + <bean:message key="channel.delete.jsp.channelheader"/> + </html:submit> + </c:when> + <c:otherwise> + <html:submit property="delete_button" disabled="true" styleClass="btn btn-success"> + <bean:message key="channel.delete.jsp.channelheader"/> + </html:submit> + </c:otherwise> + </c:choose> + </div> + </div> + <html:hidden property="submitted" value="true"/> + <c:if test='${not empty param.cid}'> + <html:hidden property="cid" value="${param.cid}"/> + </c:if> + </html:form> + </body> </html> commit 5bbaa332a884c98e8a70781084e9dbabb8a12524 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 22 14:34:23 2013 +0200 TB3: Systems/Kickstart/Profiles/ new or upload forms diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index a3bf1e4..59afaad 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -3,162 +3,200 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> - <c:choose> - <c:when test="${empty requestScope.invalid}"> - <html:form method="post" - action="${param.url}?csrf_token=${csrfToken}" - enctype="multipart/form-data"> -<div class="page-summary"> - <rhn:csrf /> - <h2><bean:message key="${param.title_key}"/></h2> - <p><bean:message key="${param.summary_key}"/></p> - <table class="details"> - <tr> - <th><rhn:required-field key="kickstart.jsp.create.wizard.kickstart.profile.label"/>:</th> - <td><html:text property="kickstartLabel" size="40" maxlength="80" /></td> - </tr> - <tr> - <th><rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:</th> - <td> - <c:choose> - <c:when test="${notrees == null}"> - <html:select property="kstreeId"> - <html:optionsCollection property="kstrees" label="label" value="id" /> - </html:select> - <br /> - <input type="checkbox" name="updateRedHat" id="updateRedHat" value="0" - onclick="clickNewestRHTree(this)" - <c:if test="${param.usingUpdateRedHat == true}">checked=1</c:if> /> - <bean:message key="kickstart.jsp.create.wizard.kstree.always_new_RH"/> - <br /> - <input type="checkbox" name="updateAll" id="updateAll" value="0" - onclick="clickNewestTree(this)" - <c:if test="${param.usingUpdateAll == true}">checked=1</c:if> /> - <bean:message key="kickstart.jsp.create.wizard.kstree.always_new"/> +<c:choose> + <c:when test="${empty requestScope.invalid}"> + <html:form method="post" + styleClass="form-horizontal" + action="${param.url}?csrf_token=${csrfToken}" + enctype="multipart/form-data"> + <rhn:csrf /> + <h2><bean:message key="${param.title_key}"/></h2> + <p><bean:message key="${param.summary_key}"/></p> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="kickstart.jsp.create.wizard.kickstart.profile.label"/>: + </label> + <div class="col-lg-6"> + <html:text property="kickstartLabel" styleClass="form-control" size="40" maxlength="80" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${notrees == null}"> + <html:select property="kstreeId" styleClass="form-control"> + <html:optionsCollection property="kstrees" label="label" value="id" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="checkbox" name="updateRedHat" id="updateRedHat" value="0" + onclick="clickNewestRHTree(this)" + <c:if test="${param.usingUpdateRedHat == true}">checked=1</c:if> /> + <bean:message key="kickstart.jsp.create.wizard.kstree.always_new_RH"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="checkbox" name="updateAll" id="updateAll" value="0" + onclick="clickNewestTree(this)" + <c:if test="${param.usingUpdateAll == true}">checked=1</c:if> /> + <bean:message key="kickstart.jsp.create.wizard.kstree.always_new"/> + </label> + </div> + </div> + </div> + </c:when> + <c:otherwise> + <div class="alert alert-warning"> + <strong><bean:message key="kickstart.edit.software.notrees.jsp" /></strong> + </div> + </div> + </div> + </c:otherwise> + </c:choose> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - </c:when> - <c:otherwise> - <b><bean:message key="kickstart.edit.software.notrees.jsp" /></b> - </c:otherwise> - </c:choose> - - </td> - </tr> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - - - - <c:if test="${empty requestScope.create}"> - <tr> - <th><bean:message key="kickstartdetails.jsp.active"/></th> - <td> - <table> - <tr> - <td> - <html:checkbox property="active" /> - </td> - <td> - <span class="small-text"><bean:message key="kickstartdetails.jsp.activeDescription"/></span> - </td> - </tr> - </table> - </td> - </tr> - - <tr> - <th><bean:message key="kickstartdetails.jsp.kernel_options"/></th> - <td><html:text property="kernel_options" maxlength="1024" size="32" /></td> - </tr> - - <tr> - <th><bean:message key="kickstartdetails.jsp.post_kernel_options"/></th> - <td><html:text property="post_kernel_options" maxlength="1024" size="32" /></td> - </tr> - - <tr> - <th><bean:message key="kickstartdetails.jsp.org_default" /></th> - <td><table><tr><td><html:checkbox property="org_default" /></td><td><bean:message key="kickstartdetails.jsp.summary2" arg0="${param.ksurl}" /></td></tr></table></td> - </tr> - </c:if> - <tr> - <th><bean:message key="addfiles.create.jspf.content-name" /></th> - <td> - <html:textarea property="contents" rows="20" cols="80" styleId="contents" /><br/> - <rhn:tooltip><bean:message key="kickstart.advanced.filedetails.jsp.tip.edit" - arg0 = "${rhn:localize('kickstart.advanced.jsp.uploadtab')}" - arg1 = "${rhn:localize(requestScope.uploadKey)}" - /></rhn:tooltip> - <rhn:tooltip><bean:message key="kickstart.advanced.filedetails.jsp.tip.copypaste"/></rhn:tooltip> - </td> - </tr> - </table> - <div align="right"> - <hr /> - <html:submit property="dispatch"> - <bean:message key="${param.action_key}"/> - </html:submit> - </div> - - <table class="details"> - <tr> - <th><bean:message key="kickstart.advanced.jsp.uploadtab"/></th> - <td> - <html:file property="fileUpload" size="30"/><br /> - </td> - </tr> - </table> - <div align="right"> - <hr /> - <html:submit property="dispatch"> - <bean:message key="${requestScope.uploadKey}"/> - </html:submit> - </div> - <rhn:submitted/> - <c:if test="${not empty param.ksid}"> - <input type="hidden" name="ksid" value="${param.ksid}"/> - </c:if> - </div> - </html:form> - </c:when> - <c:when test="${empty requestScope.create}"> - <p><bean:message key="kickstartdetails.invalid.jsp.summary"/> - <bean:message key="kickstartdetails.invalid.jsp.summary-option1" - arg0="${ksdata.tree.label}" - arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p> - <p><bean:message key="kickstartdetails.advanced.invalid.jsp.summary-option2" - arg0="${rhn:localize(param.action_key)}"/></p> - - <html:form method="post" action="${param.url}"> - <rhn:csrf /> - <table class="details"> - <tr> - <th><rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:</th> - <td> - <c:choose> - <c:when test="${empty notrees}"> - <html:select property="kstreeId"> - <html:optionsCollection property="kstrees" label="label" value="id" /> - </html:select> - </c:when> - <c:otherwise> - <b><bean:message key="kickstart.edit.software.notrees.jsp" /></b> - </c:otherwise> - </c:choose> - </td> - </tr> - </table> + <c:if test="${empty requestScope.create}"> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="active" /> + <bean:message key="kickstartdetails.jsp.active"/> + </label> + </div> + <span class="help-block"><bean:message key="kickstartdetails.jsp.activeDescription"/></span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.kernel_options"/> + </label> + <div class="col-lg-6"> + <html:text property="kernel_options" styleClass="form-control" maxlength="1024" size="32" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.post_kernel_options"/> + </label> + <div class="col-lg-6"> + <html:text property="post_kernel_options" styleClass="form-control" maxlength="1024" size="32" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="org_default" /> + <bean:message key="kickstartdetails.jsp.org_default" /> + </label> + </div> + <span class="help-block"> + <bean:message key="kickstartdetails.jsp.summary2" arg0="${param.ksurl}" /> + </span> + </div> + </div> + </c:if> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="addfiles.create.jspf.content-name" /> + </label> + <div class="col-lg-6"> + <html:textarea property="contents" styleClass="form-control" rows="20" cols="80" styleId="contents" /><br/> + <span class="help-block"> + <bean:message key="kickstart.advanced.filedetails.jsp.tip.edit" + arg0 = "${rhn:localize('kickstart.advanced.jsp.uploadtab')}" + arg1 = "${rhn:localize(requestScope.uploadKey)}"/> + </span> + <span class="help-block"> + <bean:message key="kickstart.advanced.filedetails.jsp.tip.copypaste"/> + </span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstart.advanced.jsp.uploadtab"/> + </label> + <div class="col-lg-6"> + <div class="input-group"> + <html:file property="fileUpload" size="30" styleClass="form-control"/> + <span class="input-group-btn"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="${requestScope.uploadKey}"/> + </html:submit> + </span> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="${param.action_key}"/> + </html:submit> + </div> + </div> + <rhn:submitted/> + <c:if test="${not empty param.ksid}"> + <input type="hidden" name="ksid" value="${param.ksid}"/> + </c:if> +</html:form> +</c:when> +<c:when test="${empty requestScope.create}"> + <p> + <bean:message key="kickstartdetails.invalid.jsp.summary"/> + <bean:message key="kickstartdetails.invalid.jsp.summary-option1" + arg0="${ksdata.tree.label}" + arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/> + </p> + <p> + <bean:message key="kickstartdetails.advanced.invalid.jsp.summary-option2" + arg0="${rhn:localize(param.action_key)}"/> + </p> + <html:form method="post" action="${param.url}" + styleClass="form-horizontal"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${empty notrees}"> + <html:select property="kstreeId" styleClass="form-control"> + <html:optionsCollection property="kstrees" label="label" value="id" /> + </html:select> + </c:when> + <c:otherwise> + <div class="alert alert-warning"> + <strong><bean:message key="kickstart.edit.software.notrees.jsp" /></strong> + </div> + </c:otherwise> + </c:choose> + </div> + </div> <c:if test="${empty notrees}"> - <div align="right"> - <hr /> - - <html:submit property="dispatch"> - <bean:message key="${param.action_key}"/> - </html:submit> - - </div> - <rhn:submitted/> - <input type="hidden" name="ksid" value="${param.ksid}"/> - </c:if> - </html:form> - </c:when> - </c:choose> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="${param.action_key}"/> + </html:submit> + </div> + </div> + <rhn:submitted/> + <input type="hidden" name="ksid" value="${param.ksid}"/> + </c:if> + </html:form> +</c:when> +</c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf index 67373d0..2557986 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf @@ -1,32 +1,49 @@ - <tr> - <th><bean:message key="kickstartdetails.jsp.virtualization_type" /></th> - <td colspan="2" align="left"> - <html:select property="virtualizationTypeLabel" onchange="this.form.submit();return true;"> - <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label"/> - </html:select><br/> - <c:if test="${not ksdata.rawData and not empty ksdata.id}"> - <span class="small-text"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> - </c:if> - </td> - </tr> +<div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.virtualization_type" /> + </label> + <div class="col-lg-6"> + <html:select property="virtualizationTypeLabel" + styleClass="form-control" + onchange="this.form.submit();return true;"> + <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label"/> + </html:select> + <c:if test="${not ksdata.rawData and not empty ksdata.id}"> + <span class="help-block"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> + </c:if> + </div> +</div> <c:if test="${not empty requestScope.is_virt}"> - <tr> - <th><bean:message key="kickstartdetails.jsp.virt_mem_mb"/>:</th> - <td><html:text property="virt_mem_mb" size="10" /></td> - </tr> - - <tr> - <th><bean:message key="kickstartdetails.jsp.virt_cpus"/>:</th> - <td><html:text property="virt_cpus" size="10" /></td> - </tr> - <tr> - <th><bean:message key="kickstartdetails.jsp.virt_disk_size"/>:</th> - <td><html:text property="virt_disk_size" size="10" /></td> - </tr> - - <tr> - <th><bean:message key="kickstartdetails.jsp.virt_bridge"/>:</th> - <td><html:text property="virt_bridge" size="10" /></td> - </tr> - + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.virt_mem_mb"/>: + </label> + <div class="col-lg-6"> + <html:text property="virt_mem_mb" size="10" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.virt_cpus"/>: + </label> + <div class="col-lg-6"> + <html:text property="virt_cpus" size="10" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.virt_disk_size"/>: + </label> + <div class="col-lg-6"> + <html:text property="virt_disk_size" size="10" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstartdetails.jsp.virt_bridge"/>: + </label> + <div class="col-lg-6"> + <html:text property="virt_bridge" size="10" styleClass="form-control" /> + </div> + </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp index 2125033..51175ef 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp @@ -2,10 +2,10 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<head> -<meta http-equiv="Pragma" content="no-cache" /> -<script language="javascript" type="text/javascript"> +<html:html> + <head> + <meta http-equiv="Pragma" content="no-cache" /> + <script language="javascript" type="text/javascript"> function clickNewestRHTree(obj) { if (obj.checked == true) { document.getElementById("updateAll").checked = false; @@ -17,18 +17,18 @@ function clickNewestTree(obj) { document.getElementById("updateRedHat").checked = false; } } -</script> -</head> -<body> -<rhn:toolbar base="h1" icon="icon-rocket" - imgAlt="system.common.kickstartAlt"> - <bean:message key ="kickstart.advanced.jsp.create"/> -</rhn:toolbar> -<c:import url="/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf"> - <c:param name = "title_key" value="Kickstart Details"/> - <c:param name = "summary_key" value="kickstart.advanced.jsp.para1"/> - <c:param name = "action_key" value="message.Create"/> - <c:param name = "url" value="/kickstart/AdvancedModeCreate.do"/> -</c:import> -</body> + </script> + </head> + <body> + <rhn:toolbar base="h1" icon="icon-rocket" + imgAlt="system.common.kickstartAlt"> + <bean:message key ="kickstart.advanced.jsp.create"/> + </rhn:toolbar> + <c:import url="/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf"> + <c:param name = "title_key" value="Kickstart Details"/> + <c:param name = "summary_key" value="kickstart.advanced.jsp.para1"/> + <c:param name = "action_key" value="message.Create"/> + <c:param name = "url" value="/kickstart/AdvancedModeCreate.do"/> + </c:import> + </body> </html:html> commit dc68f5ef37281d9f683f6f3d0f062fd72a663174 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 14:02:12 2013 +0200 Schedule section (all pages) have been correctly formated. Divs have been deleted, tables well formated and buttons classes applied diff --git a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp index 4029a86..fd5d778 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp @@ -10,23 +10,25 @@ <h2><bean:message key="actiondetails.jsp.heading2"/></h2> - <table class="details"> - <tr> - <th><bean:message key="actiondetails.jsp.actiontype"/>:</th> - <td>${requestScope.actiontype}</td> - </tr> - <tr> - <th><bean:message key="actiondetails.jsp.scheduler"/>:</th> - <td>${requestScope.scheduler}</td> - </tr> - <tr> - <th><bean:message key="actiondetails.jsp.earliestexecution"/>:</th> - <td>${requestScope.earliestaction}</td> - </tr> - <tr> - <th><bean:message key="actiondetails.jsp.notes"/>:</th> - <td>${requestScope.actionnotes}</td> - </tr> + <table class="table"> + <tbody> + <tr> + <td><bean:message key="actiondetails.jsp.actiontype"/>:</td> + <td>${requestScope.actiontype}</td> + </tr> + <tr> + <td><bean:message key="actiondetails.jsp.scheduler"/>:</td> + <td>${requestScope.scheduler}</td> + </tr> + <tr> + <td><bean:message key="actiondetails.jsp.earliestexecution"/>:</td> + <td>${requestScope.earliestaction}</td> + </tr> + <tr> + <td><bean:message key="actiondetails.jsp.notes"/>:</td> + <td>${requestScope.actionnotes}</td> + </tr> + </tbody> </table> </body> diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp index f68d583..23788f4 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp @@ -9,38 +9,31 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" + <rhn:toolbar base="h1" icon="icon-time" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-arch"> <bean:message key="archivedactions.jsp.archived_actions"/> </rhn:toolbar> - <div class="page-summary"> <p> <bean:message key="archivedactions.jsp.summary"/> </p> - </div> - - <br/> <rl:listset name="failedList"> <rhn:csrf /> <rl:list emptykey="archivedactions.jsp.nogroups" styleclass="list"> - <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %> - </rl:list> <rhn:submitted/> <div align="right"> <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="actions.jsp.deleteactions"/>'/> </div> </rl:listset> - - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp index ee5e037..64c310c 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp @@ -8,33 +8,28 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" +<rhn:toolbar base="h1" icon="icon-time" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-comp"> <bean:message key="completedactions.jsp.completed_actions"/> </rhn:toolbar> - <div class="page-summary"> <p> <bean:message key="completedactions.jsp.summary"/> </p> - </div> - - <br/> <rl:listset name="failedList"> <rhn:csrf /> <rl:list emptykey="completedactions.jsp.nogroups" styleclass="list"> - <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %> - </rl:list> <rhn:submitted/> <div align="right"> <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="actions.jsp.archiveactions"/>'/> </div> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp index 0935475..ec629ea 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp @@ -11,7 +11,7 @@ <h2><bean:message key="completedsystems.jsp.completedsystems"/></h2> -<form method="POST" name="rhn_list" action="/rhn/schedule/CompletedSystemsSubmit.do"> +<form method="POST" role="form" name="rhn_list" action="/rhn/schedule/CompletedSystemsSubmit.do"> <rhn:csrf /> <rhn:list pageList="${requestScope.pageList}" diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp index 599667f..7377f33 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp @@ -4,43 +4,31 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> - <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" +<rhn:toolbar base="h1" icon="icon-time" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-fail"> <bean:message key="failedactions.jsp.failed_actions"/> </rhn:toolbar> - - <div class="page-summary"> <p> <bean:message key="failedactions.jsp.summary"/> </p> - </div> - - <br/> - - <rl:listset name="failedList"> <rhn:csrf /> <rl:list emptykey="failedactions.jsp.nogroups" styleclass="list"> - <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %> - </rl:list> <rhn:submitted/> <div align="right"> <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="actions.jsp.archiveactions"/>'/> </div> </rl:listset> - - - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp index 3ef5efa..2f27024 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp @@ -7,41 +7,38 @@ <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> -<h2><bean:message key="failedsystems.jsp.failedsystems"/></h2> + <h2><bean:message key="failedsystems.jsp.failedsystems"/></h2> - <div class="page-summary"> - <p><bean:message key="failedsystems.jsp.summary"/></p> - </div> + <p><bean:message key="failedsystems.jsp.summary"/></p> + <form method="POST" role="form" name="rhn_list" action="/rhn/schedule/FailedSystemsSubmit.do"> + <rhn:csrf /> -<form method="POST" name="rhn_list" action="/rhn/schedule/FailedSystemsSubmit.do"> -<rhn:csrf /> + <rhn:list pageList="${requestScope.pageList}" + noDataText="failedsystems.jsp.nosystems"> + <rhn:listdisplay button="failedsystems.jsp.rescheduleactions" + buttonsAttr="canEdit:true"> + <rhn:column header="actions.jsp.system" + url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}"> + <c:out value="${current.serverName}" escapeXml="true" /> + </rhn:column> -<rhn:list pageList="${requestScope.pageList}" - noDataText="failedsystems.jsp.nosystems"> - <rhn:listdisplay button="failedsystems.jsp.rescheduleactions" - buttonsAttr="canEdit:true"> - <rhn:column header="actions.jsp.system" - url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}"> - <c:out value="${current.serverName}" escapeXml="true" /> - </rhn:column> + <rhn:column header="failedsystems.jsp.failed"> + ${current.displayDate} + </rhn:column> - <rhn:column header="failedsystems.jsp.failed"> - ${current.displayDate} - </rhn:column> + <rhn:column header="failedsystems.jsp.message"> + ${current.message} + </rhn:column> + </rhn:listdisplay> - <rhn:column header="failedsystems.jsp.message"> - ${current.message} - </rhn:column> - </rhn:listdisplay> + <input type="hidden" name="aid" value="${action.id}" /> + <input type="hidden" name="formvars" value="aid" /> - <input type="hidden" name="aid" value="${action.id}" /> - <input type="hidden" name="formvars" value="aid" /> - -</rhn:list> - -</form> + </rhn:list> + + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp index 7f53d3a..7bc29de 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp @@ -6,39 +6,39 @@ <html:xhtml/> <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> -<h2><bean:message key="inprogresssystems.jsp.inprogresssystems"/></h2> + <h2><bean:message key="inprogresssystems.jsp.inprogresssystems"/></h2> -<form method="POST" name="rhn_list" action="/rhn/schedule/InProgressSystemsSubmit.do"> -<rhn:csrf /> + <form method="POST" role="form" name="rhn_list" action="/rhn/schedule/InProgressSystemsSubmit.do"> + <rhn:csrf /> -<rhn:list pageList="${requestScope.pageList}" - noDataText="inprogresssystems.jsp.nogroups"> + <rhn:list pageList="${requestScope.pageList}" + noDataText="inprogresssystems.jsp.nogroups"> - <rhn:listdisplay set="${requestScope.set}" hiddenvars="${requestScope.newset}" - button="actions.jsp.unscheduleaction" - buttonsAttr="canEdit:true"> - <rhn:set value="${current.id}" /> - <rhn:column header="actions.jsp.system" - url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}"> - <c:out value="${current.serverName}" escapeXml="true" /> - </rhn:column> + <rhn:listdisplay set="${requestScope.set}" hiddenvars="${requestScope.newset}" + button="actions.jsp.unscheduleaction" + buttonsAttr="canEdit:true"> + <rhn:set value="${current.id}" /> + <rhn:column header="actions.jsp.system" + url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}"> + <c:out value="${current.serverName}" escapeXml="true" /> + </rhn:column> - <rhn:column header="actiondetails.jsp.earliestexecution"> - ${current.displayDate} - </rhn:column> + <rhn:column header="actiondetails.jsp.earliestexecution"> + ${current.displayDate} + </rhn:column> - <rhn:column header="actions.jsp.basechannel"> - ${current.channelLabels} - </rhn:column> - </rhn:listdisplay> + <rhn:column header="actions.jsp.basechannel"> + ${current.channelLabels} + </rhn:column> + </rhn:listdisplay> - <input type="hidden" name="aid" value="${action.id}" /> - <input type="hidden" name="formvars" value="aid" /> + <input type="hidden" name="aid" value="${action.id}" /> + <input type="hidden" name="formvars" value="aid" /> -</rhn:list> -</form> + </rhn:list> + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp index a68a537..7f247f3 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp @@ -9,40 +9,34 @@ <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf" %> - <h2><bean:message key="packagelist.jsp.header.${type}"/></h2> + <h2><bean:message key="packagelist.jsp.header.${type}"/></h2> - <div class="page-summary"> - <p> - <bean:message key="packagelist.jsp.summary.${type}"/> - </p> - </div> + <p> + <bean:message key="packagelist.jsp.summary.${type}"/> + </p> + <rl:listset name="packset"> + <rhn:csrf /> + <rl:list emptykey="packagelist.jsp.nopackages"> -<rl:listset name="packset"> + <rl:decorator name="ElaborationDecorator"/> -<rhn:csrf /> -<rl:list emptykey="packagelist.jsp.nopackages"> + <rl:column sortable="true" + bound="false" + headerkey="packagelist.jsp.name.${type}" + sortattr="nvre" + defaultsort="asc" > + ${current.nvre} + </rl:column> - <rl:decorator name="ElaborationDecorator"/> + </rl:list> + <input type="hidden" name="aid" value="${aid}"> - <rl:column sortable="true" - bound="false" - headerkey="packagelist.jsp.name.${type}" - sortattr="nvre" - defaultsort="asc" > - ${current.nvre} - </rl:column> - -</rl:list> - -<input type="hidden" name="aid" value="${aid}"> - -</rl:listset> - + </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp index 2f85388..8ada4e0 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp @@ -7,39 +7,29 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" +<rhn:toolbar base="h1" icon="icon-time" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend"> <bean:message key="pendingactions.jsp.pending_actions"/> </rhn:toolbar> - <div class="page-summary"> - <p> + <p> <bean:message key="pendingactions.jsp.summary"/> - </p> - </div> - -<br/> + </p> <rl:listset name="pendingList"> - <rhn:csrf /> - - <rl:list emptykey="pendingactions.jsp.nogroups" styleclass="list"> - - - <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %> + <rhn:csrf /> - - </rl:list> + <rl:list emptykey="pendingactions.jsp.nogroups" styleclass="list"> + <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %> + </rl:list> <rhn:submitted/> - <div align="right"> - <input type="submit" + <div class="pull-right"> + <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="actions.jsp.cancelactions"/>'/> - </div> + </div> </rl:listset> - - - </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp index 0b3681b..6742106 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp @@ -4,53 +4,44 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> - <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" +<rhn:toolbar base="h1" icon="icon-time" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend"> <bean:message key="pendingactions.jsp.confirm_cancel_actions"/> </rhn:toolbar> - <div class="page-summary"> <p> <bean:message key="pendingactions.jsp.confirm_cancel_actions_summary"/> </p> - </div> - - <br> - <rl:listset name="pendingList"> - <rhn:csrf /> + <rhn:csrf /> <rl:list emptykey="pendingactions.jsp.nogroups" styleclass="list"> - <rl:decorator name="ElaborationDecorator"/> - + <rl:decorator name="ElaborationDecorator"/> <rl:column sortable="true" - bound="false" - headerkey="actions.jsp.action" - sortattr="actionName" - defaultsort="asc" - filterattr="actionName"> + bound="false" + headerkey="actions.jsp.action" + sortattr="actionName" + defaultsort="asc" + filterattr="actionName"> <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> </rl:column> - <rl:column sortable="true" - bound="false" + bound="false" headerkey="actions.jsp.earliest" sortattr="earliest" > <c:out value="${current.earliest}" /> </rl:column> - <rl:column sortable="false" - bound="false" + bound="false" headerkey="actions.jsp.succeeded" > <c:if test="${current.completed != 0}"> @@ -61,9 +52,8 @@ </c:if> </rl:column> - <rl:column sortable="false" - bound="false" + bound="false" headerkey="actions.jsp.failed" > <c:if test="${current.failed != 0}"> @@ -74,10 +64,8 @@ </c:if> </rl:column> - - <rl:column sortable="false" - bound="false" + bound="false" headerkey="actions.jsp.inprogress" > <c:if test="${current.inProgress != 0}"> @@ -95,20 +83,16 @@ ${current.tally} </rl:column> - </rl:list> <rhn:submitted/> - <div align="right"> + <div class="pull-right"> <input type="submit" name="dispatch" + class="btn btn-default" value='<bean:message key="actions.jsp.confirmcancelactions"/>'/> </div> </rl:listset> - - - - </body> </html> commit bde94d5bdcdc4071b571fae3c9c8517c568869e1 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 22 12:53:28 2013 +0200 copy files matched by glob to /%{_var}/www/html/css instead of /%{_var}/www/html cp -pR css %{buildroot}/%{_var}/www/html/ copied whole css directory to /%{_var}/www/html efectively making it /%{_var}/www/html/css cp -p css/*.css %{buildroot}/%{_var}/www/html/ takes matched files and copies them into /%{_var}/www/html/ throwing away the fact they were placed in css directory Signed-off-by: Johannes Renner <jrenner(a)suse.de> diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index f666818..e35f77e 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -42,6 +42,7 @@ lessc css/spacewalk.less > css/spacewalk.css %install rm -rf %{buildroot} install -d -m 755 %{buildroot}%{_var}/www/html +install -d -m 755 %{buildroot}%{_var}/www/html/css install -d -m 755 %{buildroot}%{_datadir}/spacewalk install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav @@ -49,7 +50,7 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/ install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/ install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults -cp -p css/*.css %{buildroot}/%{_var}/www/html/ +cp -p css/*.css %{buildroot}/%{_var}/www/html/css cp -pR img %{buildroot}/%{_var}/www/html/ # Appplication expects two favicon's for some reason, copy it so there's just # one in source: commit f85fa0bebeca05ddab7f78f351eeddb844c09d77 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 13:31:34 2013 +0200 nav-tabs style added by me now is removed, we dont need it and we will use the original from Bootstrap diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index bd4e69f..d3277a8 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -496,10 +496,6 @@ h1 .icon-stack { border-radius: 0 0 4px 4px; } -/* tab nav */ -.spacewalk-content-nav .nav.nav-tabs li.active a { - background: #dddddd; -} /* btn with margin top and bottom */ .btn.spacewalk-btn-margin-vertical{ margin: 1em 0 commit ba16ef1c2925131a316aaed91bc8557200a8c988 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 22 13:29:39 2013 +0200 buttons and panels added. Tables correctly formated diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp index a1cfede..f8b3475 100644 --- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp @@ -22,22 +22,18 @@ editAreaLoader.init({ <body> <rhn:require acl="user_role(satellite_admin)"/> - - <div> - <form action="/rhn/admin/Catalina.do"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <bean:message key="catalina.jsp.show"/> - </th> - <td> - <textarea name="contents" rows="24" cols="80" id="contents">${contents}</textarea> - </td> - </tr> - </table> - <rhn:submitted/> - </form> - </div> + <h1><i class="icon-list"></i> Tomcat</h1> + <form action="/rhn/admin/Catalina.do"> + <rhn:csrf /> + <div class="panel panel-default"> + <div class="panel-heading"> + <bean:message key="catalina.jsp.show"/> + </div> + <div class="panel-body"> + <textarea name="contents" rows="24" class="form-control" id="contents">${contents}</textarea> + </div> + </div> + <rhn:submitted/> + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index 836d0f5..9239b59 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -25,19 +25,16 @@ </div> <div class="panel-body"> <form action="/rhn/admin/config/Cobbler.do" method="POST"> - <rhn:csrf /> - <table class="table"> - <tr> - <th> + <div class="row"> + <div class="col-md-2 text-right"> <bean:message key="cobbler.jsp.sync"/> - </th> - <td> - <input type="submit" class="btn btn-success" name="cobbler_sync" value="${rhn:localize('update')}" /> - </td> - </tr> - </table> - <hr/> - <rhn:submitted/> + </div> + <div class="col-md-10"> + <input type="submit" class="btn btn-default" name="cobbler_sync" value="${rhn:localize('update')}" /> + <rhn:csrf /> + <rhn:submitted/> + </div> + </div> </form> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index 716b8c3..8ecfc7c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -26,19 +26,20 @@ <div class="panel-body"> <html:form action="/admin/config/Restart"> <rhn:csrf /> - <table class="table"> - <tr> - <th> + <div class="row"> + <div class="col-md-2 text-right"> <label for="restart"><bean:message key="restart.jsp.restart_satellite"/></label> - </th> - <td> + </div> + <div class="col-md-10"> <html:checkbox property="restart" styleId="restart" /> - </td> - </tr> - - </table> - <hr/> - <div class="pull-right"><html:submit styleClass="btn btn-success"><bean:message key="restart.jsp.restart"/></html:submit></div> + </div> + </div> + <hr /> + <div class="row"> + <div class="col-md-offset-2 col-md-10"> + <html:submit styleClass="btn btn-success"><bean:message key="restart.jsp.restart"/></html:submit> + </div> + </div> <rhn:submitted/> </html:form> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp index 488710f..348788b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp @@ -11,42 +11,38 @@ <bean:message key="task.status.title"/> </rhn:toolbar> -<div> <p> <bean:message key="task.status.message"/> </p> -</div> - - <rhn:require acl="user_role(satellite_admin)"/> - - <table class="details"> - <tr> - <th> - <bean:message key="task.status.taskomatic.on"/>: - </th> - <td> - <c:out value="${taskomatic_on}"/> - </td> - </tr> - <tr> - <td colspan="3" style="font-weight: bold;text-align: center"><bean:message key="task.status.last.execution"/></td> - </tr> - + <rhn:require acl="user_role(satellite_admin)"/> + <div class="panel panel-default"> + <div class="panel-body"> + <bean:message key="task.status.taskomatic.on"/>: <c:out value="${taskomatic_on}"/> + </div> + </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <bean:message key="task.status.last.execution"/> + </div> + <div class="panel-body"> + <table class="table table-striped"> + <tbody> <c:forEach items="${list}" var="item"> - <tr> - <th> - <bean:message key="${item.name}"/>: - </th> - <td> - <c:out value="${item.start_time}"/> - </td> - <td> - <c:out value="${item.status}"/> - </td> - </tr> - </c:forEach> - + <tr> + <td> + <bean:message key="${item.name}"/>: + </td> + <td> + <c:out value="${item.start_time}"/> + </td> + <td> + <c:out value="${item.status}"/> + </td> + </tr> + </c:forEach> + </tbody> </table> - + </div> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index d870e07..65bda1f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -58,14 +58,16 @@ sortattr="changeDate"/> </rl:list> - <rl:csv dataset="pageList" - name="disabledUserList" - exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/> - - <div align="right"> - <hr /> - <input type="submit" name="dispatch" value="<bean:message key="disabledlist.jsp.reactivate"/>" /> - </div> + <div class="row"> + <div class="col-md-6 text-left"> + <input type="submit" class="btn btn-success" name="dispatch" value="<bean:message key="disabledlist.jsp.reactivate"/>" /> + </div> + <div class="col-md-6 text-right"> + <rl:csv dataset="pageList" + name="disabledUserList" + exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/> + </div> + </div> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp index f74437c..2edceeb 100644 --- a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp +++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp @@ -9,16 +9,8 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - - <h1><img src="/img/rhn-icon-help-h1.gif" alt="help" /><bean:message key="help.jsp.chat"/></h1> - - <ul> - - <div><bean:message key="help.jsp.chatinfo"/></div> - <br/><br/> - <div><bean:message key="help.jsp.chatlink"/></div> - - </ul> - + <h1><i class="icon-question-sign" title="Help"></i><bean:message key="help.jsp.chat"/></h1> + <p><bean:message key="help.jsp.chatinfo"/></p> + <p><bean:message key="help.jsp.chatlink"/></p> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index b924ffd..6147c49 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -23,34 +23,42 @@ <rhn:csrf />  - <div class="search-choices"> - - <div class="search-choices-group"> - <table class="details"> - <tr><th><bean:message key="docsearch.jsp.searchfor"/></th> - <td> - <html:text property="search_string" name="search_string" value="${search_string}" accesskey="4"/> - <button type="submit" class="btn btn-default btn-sm"> - <i class="icon-search" /> - <bean:message key="button.search"/> - </button> - </td> - </tr> - <tr><th><bean:message key="docsearch.jsp.whatsearch"/></th> - <td> - <div style="text-align: left"> - <html:select property="view_mode" value="${view_mode}" > - <html:options collection="searchOptions" - property="value" - labelProperty="display" /> - </html:select> - </div> - </td> - </tr> - </table> - </div> - + <div class="search-choices panel panel-default"> + <div class="search-choices-group panel-body"> + <div class="form-group row"> + <div class="col-md-2 text-right"> + <label><bean:message key="docsearch.jsp.searchfor"/></label> + </div> + <div class="col-md-10"> + <html:text property="search_string" + name="search_string" + value="${search_string}" + accesskey="4"/> + </div> + </div> + <div class="form-group row"> + <div class="col-md-2 text-right"> + <label><bean:message key="docsearch.jsp.whatsearch"/></label> + </div> + <div class="col-md-10"> + <html:select property="view_mode" value="${view_mode}" > + <html:options collection="searchOptions" + property="value" + labelProperty="display" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-md-offset-2 col-md-10"> + <button type="submit" class="btn btn-success btn-sm"> + <i class="icon-search"></i> + <bean:message key="button.search"/> + </button> + </div> + </div> + </div> </div> + <input type="hidden" name="submitted" value="true" /> </html:form> commit d99c4b24eccc7a9edc021c137cbde9fb9ac67d2b Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 22 12:03:20 2013 +0200 Call create_checkall_checkbox() when document is ready diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index bf7a7ed..8a130ac 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -19,10 +19,3 @@ <div> <img src="/img/logo_vendor.png" /> </div> - -<%-- - Render Javascript here so we can be sure that all of - the form elements we may need have been rendered. ---%> - -<script src="/javascript/check_all.js"></script> diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js index c40c74e..319fb3d 100644 --- a/web/html/javascript/check_all.js +++ b/web/html/javascript/check_all.js @@ -1,5 +1,3 @@ -create_checkall_checkbox(); - function blockEnter(evt) { evt = (evt) ? evt : event; var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which : evt.keyCode); diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 61d61f8..edf2a5a 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -24,7 +24,11 @@ $(document).on("ready", function(){ } // See if there is a system already selected as soon as the page loads updateSsmToolbarOpacity(); + + // This is in check_all.js + create_checkall_checkbox(); }); + /* Getting the screen size to create a fixed padding-bottom in the Section tag to make both columns the same size */ // On window load $(window).load(function () { commit 486c9d3e611369ccafa94696e77bb6978aee3580 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 22 00:21:45 2013 +0200 put the decorators in the right hooks diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 6ddd90f..1a99031 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -947,17 +947,27 @@ public class ListTag extends BodyTagSupport { return; } - ListTagUtil.write(pageContext, "<div class=\"pull-left\">"); - // Here were the afterList decorators + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom\">"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-bottom-wrap\">"); + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-addons\">"); + if (!manip.isListEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.onBottomAddons(); + dec.setCurrentList(null); + } + } ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "<div class=\"pull-right\">"); + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-pagination\">"); if (!isEmpty() && !hidePageNums) { ListTagUtil.write(pageContext, manip.getPaginationMessage()); } if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); dec.afterBottomPagination(); dec.setCurrentList(null); } @@ -966,6 +976,18 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, "  "); ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES, manip.getPaginationLinks()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list-bottom-extra\">"); + if (!manip.isListEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onBottomExtraContent(); + dec.setCurrentList(null); + } + } + ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, "</div>"); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java index f62ad76..71f985e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators; -import com.redhat.rhn.frontend.taglibs.list.ListSetTag; -import com.redhat.rhn.frontend.taglibs.list.ListTag; - import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; +import com.redhat.rhn.frontend.taglibs.list.ListSetTag; +import com.redhat.rhn.frontend.taglibs.list.ListTag; + /** * General-use base class for writing decorators * @@ -118,4 +118,11 @@ public abstract class BaseListDecorator implements ListDecorator { public void onTopAddons() throws JspException { } + + /** + * {@inheritDoc} + */ + public void onBottomAddons() throws JspException { + + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java index 7b94e17..9a6b0fd 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java @@ -98,4 +98,10 @@ public interface ListDecorator { * @throws JspException something bad happened */ void onTopAddons() throws JspException; + + /** + * Notifies the decorator that the list is in the addons section + * @throws JspException something bad happened + */ + void onBottomAddons() throws JspException; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java index 24276b4..ad29244 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java @@ -14,6 +14,10 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators; +import javax.servlet.jsp.JspException; + +import org.apache.commons.lang.StringUtils; + import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; @@ -22,10 +26,6 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; import com.redhat.rhn.frontend.taglibs.list.SelectableColumnTag; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import org.apache.commons.lang.StringUtils; - -import javax.servlet.jsp.JspException; - /** * Handles selectable lists, such as lists backed by RhnSet * @@ -65,12 +65,16 @@ public class SelectableDecorator extends BaseListDecorator { renderSelectedCaption(false); } + @Override + public void onBottomAddons() throws JspException { + renderSelectButtons(); + } + /** * {@inheritDoc} */ @Override public void afterList() throws JspException { - renderSelectButtons(); String script = SelectableColumnTag. getPostScript(listName, pageContext.getRequest()); if (!StringUtils.isBlank(script)) { commit 904b605b83027c777dd4016219390e49ffca463b Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 21 16:59:34 2013 +0200 buttons with class success diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index fcd3fa0..836d0f5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -32,7 +32,7 @@ <bean:message key="cobbler.jsp.sync"/> </th> <td> - <input type="submit" name="cobbler_sync" value="${rhn:localize('update')}" /> + <input type="submit" class="btn btn-success" name="cobbler_sync" value="${rhn:localize('update')}" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index 518468b..716b8c3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -38,7 +38,7 @@ </table> <hr/> - <div align="right"><html:submit><bean:message key="restart.jsp.restart"/></html:submit></div> + <div class="pull-right"><html:submit styleClass="btn btn-success"><bean:message key="restart.jsp.restart"/></html:submit></div> <rhn:submitted/> </html:form> </div> commit 571968b47527b69fd78beda777e32bfe1969d47f Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 21 16:54:56 2013 +0200 less error fixed diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 05b0905..bd4e69f 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -509,7 +509,6 @@ h1 .icon-stack { ul.nav.nav-tabs:last-child{ margin-bottom: 1.5em } -<<<<<<< Updated upstream // data lists @@ -544,11 +543,11 @@ ul.nav.nav-tabs:last-child{ } } -======= + .panel .panel-heading{ h1, h2, h3, h4, h5, h6{ padding: 0; margin: 0; } } ->>>>>>> Stashed changes + commit fd3c1be80fc9da743b46101f4ba63918595ee0a3 Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 21 16:52:12 2013 +0200 Panels added in Admin Configuration. Less: removed margin in h tags in panel-heading diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 8ccf9b6..05b0905 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -509,6 +509,7 @@ h1 .icon-stack { ul.nav.nav-tabs:last-child{ margin-bottom: 1.5em } +<<<<<<< Updated upstream // data lists @@ -543,3 +544,11 @@ ul.nav.nav-tabs:last-child{ } } +======= +.panel .panel-heading{ + h1, h2, h3, h4, h5, h6{ + padding: 0; + margin: 0; + } +} +>>>>>>> Stashed changes diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp index 4ed8222..3bc27e7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp @@ -8,105 +8,109 @@ <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="bootstrap.jsp.toolbar"/> </rhn:toolbar> - <div class="page-summary"> - <p><bean:message key="bootstrap.jsp.summary"/></p> - </div> + <p><bean:message key="bootstrap.jsp.summary"/></p> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="bootstrap.jsp.header2"/></h2> - <html:form action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}" - styleClass="form-horizontal" - enctype="multipart/form-data"> - <rhn:csrf /> - <div class="form-group"> - <label for="hostname" class="col-lg-3 control-label"> - <rhn:required-field key="bootstrap.jsp.hostname"/>: - </label> - <div class="col-lg-6"> - <html:text size="32" property="hostname" styleId="hostname" styleClass="form-control" /> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="ssl-cert"> - <rhn:required-field key="bootstrap.jsp.ssl-cert"/>: - </label> - <div class="col-lg-6"> - <html:text size="32" property="ssl-cert" styleId="ssl-cert" styleClass="form-control" /> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="bootstrap.jsp.header2"/></h4> </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <div class="checkbox"> - <label> - <html:checkbox property="ssl" styleId="ssl" /> - <bean:message key="bootstrap.jsp.ssl"/> + <div class="panel-body"> + <html:form action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}" + styleClass="form-horizontal" + enctype="multipart/form-data"> + <rhn:csrf /> + <div class="form-group"> + <label for="hostname" class="col-lg-3 control-label"> + <rhn:required-field key="bootstrap.jsp.hostname"/>: </label> + <div class="col-lg-6"> + <html:text size="32" property="hostname" styleId="hostname" styleClass="form-control" /> + </div> </div> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <div class="checkbox"> - <label> - <html:checkbox property="gpg" styleId="gpg" /> - <bean:message key="bootstrap.jsp.gpg"/> + <div class="form-group"> + <label class="col-lg-3 control-label" for="ssl-cert"> + <rhn:required-field key="bootstrap.jsp.ssl-cert"/>: </label> + <div class="col-lg-6"> + <html:text size="32" property="ssl-cert" styleId="ssl-cert" styleClass="form-control" /> + </div> </div> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <div class="checkbox"> - <label> - <html:checkbox property="allow-config-actions" styleId="allow-config-actions"/> - <bean:message key="bootstrap.jsp.allow-config-actions"/> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="ssl" styleId="ssl" /> + <bean:message key="bootstrap.jsp.ssl"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="gpg" styleId="gpg" /> + <bean:message key="bootstrap.jsp.gpg"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="allow-config-actions" styleId="allow-config-actions"/> + <bean:message key="bootstrap.jsp.allow-config-actions"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="allow-remote-commands" styleId="allow-remote-commands" /> + <bean:message key="bootstrap.jsp.allow-remote-commands"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="http-proxy"> + <bean:message key="bootstrap.jsp.http-proxy"/> </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy" styleId="http-proxy" styleClass="form-control" /> + </div> </div> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <div class="checkbox"> - <label> - <html:checkbox property="allow-remote-commands" styleId="allow-remote-commands" /> - <bean:message key="bootstrap.jsp.allow-remote-commands"/> + <div class="form-group"> + <label for="http-proxy-username" class="col-lg-3 control-label"> + <bean:message key="bootstrap.jsp.http-proxy-username"/> </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy-username" styleClass="form-control" styleId="http-proxy-username" /> + </div> </div> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="http-proxy"> - <bean:message key="bootstrap.jsp.http-proxy"/> - </label> - <div class="col-lg-6"> - <html:text size="32" property="http-proxy" styleId="http-proxy" styleClass="form-control" /> - </div> - </div> - <div class="form-group"> - <label for="http-proxy-username" class="col-lg-3 control-label"> - <bean:message key="bootstrap.jsp.http-proxy-username"/> - </label> - <div class="col-lg-6"> - <html:text size="32" property="http-proxy-username" styleClass="form-control" styleId="http-proxy-username" /> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="http-proxy-password"> - <bean:message key="bootstrap.jsp.http-proxy-password"/> - </label> - <div class="col-lg-6"> - <html:text size="32" property="http-proxy-password" styleId="http-proxy-password" styleClass="form-control" /> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <html:submit styleClass="btn btn-success"> - <bean:message key="config.update"/> - </html:submit> - </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="http-proxy-password"> + <bean:message key="bootstrap.jsp.http-proxy-password"/> + </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy-password" styleId="http-proxy-password" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="config.update"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> </div> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> - </html:form> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp index 9d66555..c022893 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp @@ -8,42 +8,45 @@ <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="certificate.jsp.toolbar"/> </rhn:toolbar> - - <div class="page-summary"> - <p><bean:message key="certificate.jsp.summary"/></p> - </div> + <p><bean:message key="certificate.jsp.summary"/></p> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="certificate.jsp.header2"/></h2> - <html:form action="/admin/config/CertificateConfig?csrf_token=${csrfToken}" - styleClass="form-horizontal" - enctype="multipart/form-data"> - <rhn:csrf /> - <div class="form-group"> - <label class="col-lg-3 control-label" for="certfile"> - <rhn:required-field key="certificate.jsp.cert_file"/> - </label> - <div class="col-lg-6"> - <html:file property="cert_file" styleId="certfile" styleClass="form-control"/> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="certtext"> - <rhn:required-field key="certificate.jsp.cert_text"/> - </label> - <div class="col-lg-6"> - <html:textarea cols="80" rows="24" property="cert_text" styleClass="form-control"/> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="certificate.jsp.header2"/></h4> </div> + <div class="panel-body"> + <html:form action="/admin/config/CertificateConfig?csrf_token=${csrfToken}" + styleClass="form-horizontal" + enctype="multipart/form-data"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label" for="certfile"> + <rhn:required-field key="certificate.jsp.cert_file"/> + </label> + <div class="col-lg-6"> + <html:file property="cert_file" styleId="certfile" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="certtext"> + <rhn:required-field key="certificate.jsp.cert_text"/> + </label> + <div class="col-lg-6"> + <html:textarea cols="80" rows="24" property="cert_text" styleClass="form-control"/> + </div> + </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <html:submit styleClass="btn btn-success"> - <bean:message key="config.update"/> - </html:submit> - </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="config.update"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> </div> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> - </html:form> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index 21f7b26..fcd3fa0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -6,11 +6,9 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> - <bean:message key="cobbler.jsp.toolbar"/> -</rhn:toolbar> - -<div class="page-summary"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <bean:message key="cobbler.jsp.toolbar"/> + </rhn:toolbar> <p> <bean:message key="cobbler.jsp.summary1"/> </p> @@ -20,29 +18,29 @@ <p> <bean:message key="cobbler.jsp.summary3"/> </p> -</div> -<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="cobbler.jsp.header2"/></h2> - -<div> -<form action="/rhn/admin/config/Cobbler.do" method="POST"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <bean:message key="cobbler.jsp.sync"/> - </th> - <td> - <input type="submit" name="cobbler_sync" value="${rhn:localize('update')}" /> - </td> - </tr> - </table> - <hr/> -<rhn:submitted/> -</form> -</div> - + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="cobbler.jsp.header2"/></h4> + </div> + <div class="panel-body"> + <form action="/rhn/admin/config/Cobbler.do" method="POST"> + <rhn:csrf /> + <table class="table"> + <tr> + <th> + <bean:message key="cobbler.jsp.sync"/> + </th> + <td> + <input type="submit" name="cobbler_sync" value="${rhn:localize('update')}" /> + </td> + </tr> + </table> + <hr/> + <rhn:submitted/> + </form> + </div> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp index fc57501..ecc9212 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp @@ -10,123 +10,129 @@ </rhn:toolbar> <p><bean:message key="general.jsp.summary"/></p> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="general.jsp.header2"/></h2> - <html:form action="/admin/config/GeneralConfig" - styleClass="form-horizontal" - method="post"> - <rhn:csrf /> - <div class="form-group"> - <label for="admin_email" class="col-lg-3 control-label"> - <rhn:required-field key="general.jsp.admin_email"/>: - </label> - <div class="col-lg-6"> - <html:text property="traceback_mail" - styleClass="form-control" - size="32" styleId="admin_email" /> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="general.jsp.header2"/></h4> </div> - <div class="form-group"> - <label for="hostname" class="col-lg-3 control-label"> - <rhn:required-field key="general.jsp.hostname"/>: - </label> - <div class="col-lg-6"> - <html:text property="server|jabber_server" - styleClass="form-control" - size="32" styleId="hostname" /> - </div> - </div> - <div class="form-group"> - <label for="proxy" class="col-lg-3 control-label"> - <bean:message key="general.jsp.proxy"/>: - </label> - <div class="col-lg-6"> - <html:text property="server|satellite|http_proxy" - styleClass="form-control" - size="32" styleId="proxy" /> - </div> - </div> - <div class="form-group"> - <label for="proxy_user" class="col-lg-3 control-label"> - <bean:message key="general.jsp.proxy_username"/>: - </label> - <div class="col-lg-6"> - <html:text property="server|satellite|http_proxy_username" - styleClass="form-control" - size="32" styleId="proxy_user" /> - </div> - </div> - <div class="form-group"> - <label for="proxy_password" class="col-lg-3 control-label"> - <bean:message key="general.jsp.proxy_password"/>: - </label> - <div class="col-lg-6"> - <html:password property="server|satellite|http_proxy_password" - styleClass="form-control" - size="32" styleId="proxy_password" /> - </div> - </div> - <div class="form-group"> - <label for="proxy_password_confirm" class="col-lg-3 control-label"> - <bean:message key="general.jsp.proxy_password_confirm"/>: - </label> - <div class="col-lg-6"> - <html:password property="server|satellite|http_proxy_password_confirm" + <div class="panel-body"> + <html:form action="/admin/config/GeneralConfig" + styleClass="form-horizontal" + method="post"> + <rhn:csrf /> + <div class="form-group"> + <label for="admin_email" class="col-lg-3 control-label"> + <rhn:required-field key="general.jsp.admin_email"/>: + </label> + <div class="col-lg-6"> + <html:text property="traceback_mail" + styleClass="form-control" + size="32" styleId="admin_email" /> + </div> + </div> + <div class="form-group"> + <label for="hostname" class="col-lg-3 control-label"> + <rhn:required-field key="general.jsp.hostname"/>: + </label> + <div class="col-lg-6"> + <html:text property="server|jabber_server" + styleClass="form-control" + size="32" styleId="hostname" /> + </div> + </div> + <div class="form-group"> + <label for="proxy" class="col-lg-3 control-label"> + <bean:message key="general.jsp.proxy"/>: + </label> + <div class="col-lg-6"> + <html:text property="server|satellite|http_proxy" + styleClass="form-control" + size="32" styleId="proxy" /> + </div> + </div> + <div class="form-group"> + <label for="proxy_user" class="col-lg-3 control-label"> + <bean:message key="general.jsp.proxy_username"/>: + </label> + <div class="col-lg-6"> + <html:text property="server|satellite|http_proxy_username" + styleClass="form-control" + size="32" styleId="proxy_user" /> + </div> + </div> + <div class="form-group"> + <label for="proxy_password" class="col-lg-3 control-label"> + <bean:message key="general.jsp.proxy_password"/>: + </label> + <div class="col-lg-6"> + <html:password property="server|satellite|http_proxy_password" styleClass="form-control" - size="32" styleId="proxy_password_confirm" /> - </div> - </div> - <div class="form-group"> - <label for="mount_point" class="col-lg-3 control-label"> - <bean:message key="general.jsp.mount_point"/>: - </label> - <div class="col-lg-6"> - <html:text property="mount_point" size="32" - styleClass="form-control" - styleId="mount_point" /> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label for="ssl_available"> - <html:checkbox property="web|ssl_available" styleId="ssl_available" /> - <bean:message key="general.jsp.defaultTo_ssl"/> - </label> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label for="solaris"> - <html:checkbox property="web|enable_solaris_support" styleId="solaris" /> - <bean:message key="general.jsp.solaris"/> - </label> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label for="disconnected"> - <html:checkbox property="disconnected" styleId="disconnected" /> - <bean:message key="general.jsp.disconnected"/> - </label> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label for="is_monitoring_backend"> - <html:checkbox property="web|is_monitoring_backend" styleId="is_monitoring_backend" /> - <bean:message key="general.jsp.monitoring_backend"/> - </label> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <html:submit styleClass="btn btn-success"> - <bean:message key="config.update"/> - </html:submit> - </div> + size="32" styleId="proxy_password" /> + </div> + </div> + <div class="form-group"> + <label for="proxy_password_confirm" class="col-lg-3 control-label"> + <bean:message key="general.jsp.proxy_password_confirm"/>: + </label> + <div class="col-lg-6"> + <html:password property="server|satellite|http_proxy_password_confirm" + styleClass="form-control" + size="32" styleId="proxy_password_confirm" /> + </div> + </div> + <div class="form-group"> + <label for="mount_point" class="col-lg-3 control-label"> + <bean:message key="general.jsp.mount_point"/>: + </label> + <div class="col-lg-6"> + <html:text property="mount_point" size="32" + styleClass="form-control" + styleId="mount_point" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label for="ssl_available"> + <html:checkbox property="web|ssl_available" styleId="ssl_available" /> + <bean:message key="general.jsp.defaultTo_ssl"/> + </label> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label for="solaris"> + <html:checkbox property="web|enable_solaris_support" styleId="solaris" /> + <bean:message key="general.jsp.solaris"/> + </label> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label for="disconnected"> + <html:checkbox property="disconnected" styleId="disconnected" /> + <bean:message key="general.jsp.disconnected"/> + </label> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label for="is_monitoring_backend"> + <html:checkbox property="web|is_monitoring_backend" styleId="is_monitoring_backend" /> + <bean:message key="general.jsp.monitoring_backend"/> + </label> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="config.update"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> </div> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> - </html:form> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index 80d643c..ed06f73 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -9,57 +9,61 @@ <bean:message key="general.jsp.org.toolbar"/> </rhn:toolbar> -<div class="page-summary"> <p><bean:message key="general.jsp.org.summary1"/></p> <p><bean:message key="general.jsp.org.summary2"/></p> -</div> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="general.jsp.org.header"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="general.jsp.org.summary3"/></p> + <table class="table"> + <tr> + <td><img src="/img/rhn-icon-org.gif"/></td> + <td><bean:message key="general.jsp.org.tbl.header1"/>:</td> + <td> + <p> + <bean:message key="general.jsp.org.tbl.description1"/> + </p> + <p> + <a href="/rhn/admin/multiorg/Organizations.do"><bean:message key="general.jsp.org.tbl.link1"/></a>. + </p> + </td> + </tr> + <tr> + <td><img src="/img/rhn-icon-channels.gif"/></td> + <td><bean:message key="general.jsp.org.tbl.header2"/>:</td> + <td> + <p> + <bean:message key="general.jsp.org.tbl.description2"/> + </p> + <p> + <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message key="general.jsp.org.tbl.link2"/></a>. + </p> + </td> + </tr> + <tr> + <td><img src="/img/rhn-icon-users.gif"/></td> + <td><bean:message key="general.jsp.org.tbl.header3"/>:</td> + <td> + <p> + <bean:message key="general.jsp.org.tbl.description3"/> + </p> + <p> + <a href="/rhn/admin/multiorg/Users.do"><bean:message key="general.jsp.org.tbl.link3"/></a>. + </p> + </td> + </tr> + </table> + <hr> + <p> + <bean:message key="general.jsp.org.summary4"/><a href="/rhn/help/reference/index.jsp"> + <bean:message key="general.jsp.org.tbl.link4"/></a>. + </p> -<h2><bean:message key="general.jsp.org.header"/></h2> -<div> -<p><bean:message key="general.jsp.org.summary3"/></p> - -<table class="ssm-overview"> - <tr> - <td><img src="/img/rhn-icon-org.gif"/></td> - <th><bean:message key="general.jsp.org.tbl.header1"/>:</th> - <td> - <p> - <bean:message key="general.jsp.org.tbl.description1"/> - <br> - <a href="/rhn/admin/multiorg/Organizations.do"><bean:message key="general.jsp.org.tbl.link1"/></a>. - </p> - </td> - </tr> - <tr> - <td><img src="/img/rhn-icon-channels.gif"/></td> - <th><bean:message key="general.jsp.org.tbl.header2"/>:</th> - <td> - <p> - <bean:message key="general.jsp.org.tbl.description2"/> - <br> - <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message key="general.jsp.org.tbl.link2"/></a>. - </p> - </td> - </tr> - <tr> - <td><img src="/img/rhn-icon-users.gif"/></td> - <th><bean:message key="general.jsp.org.tbl.header3"/>:</th> - <td> - <p> - <bean:message key="general.jsp.org.tbl.description3"/> - <br> - <a href="/rhn/admin/multiorg/Users.do"><bean:message key="general.jsp.org.tbl.link3"/></a>. - </p> - </td> - </tr> -</table> - -<p><bean:message key="general.jsp.org.summary4"/><a href="/rhn/help/reference/index.jsp"> - <bean:message key="general.jsp.org.tbl.link4"/></a>. -</p> - + </div> </div> </body> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index f4023aa..518468b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -11,39 +11,38 @@ </c:if> </head> <body <c:if test="${requestScope.restart == 'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if> > -<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> - <bean:message key="restart.jsp.toolbar"/> -</rhn:toolbar> - -<div class="page-summary"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <bean:message key="restart.jsp.toolbar"/> + </rhn:toolbar> <p> <bean:message key="restart.jsp.summary"/> </p> -</div> -<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="restart.jsp.header2"/></h2> - -<div> -<html:form action="/admin/config/Restart"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <label for="restart"><bean:message key="restart.jsp.restart_satellite"/></label> - </th> - <td> - <html:checkbox property="restart" styleId="restart" /> - </td> - </tr> - - </table> - <hr/> - <div align="right"><html:submit><bean:message key="restart.jsp.restart"/></html:submit></div> -<rhn:submitted/> -</html:form> -</div> - + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="restart.jsp.header2"/></h4> + </div> + + <div class="panel-body"> + <html:form action="/admin/config/Restart"> + <rhn:csrf /> + <table class="table"> + <tr> + <th> + <label for="restart"><bean:message key="restart.jsp.restart_satellite"/></label> + </th> + <td> + <html:checkbox property="restart" styleId="restart" /> + </td> + </tr> + + </table> + <hr/> + <div align="right"><html:submit><bean:message key="restart.jsp.restart"/></html:submit></div> + <rhn:submitted/> + </html:form> + </div> + </div> </body> </html:html> commit 6e3f6d63530640e1ec0858fc000ff102f7b25fca Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 21 15:50:17 2013 +0200 - Use pushBody() to avoid creating tags without content. - define the areas for the components of the list: .spacewalk-list-top .spacewalk-list-top-wrap .spacewalk-list-top-alphabar .spacewalk-alphabar .spacewalk-list-top-addons .spacewalk-list-top-wrap .spacewalk-filter .spacewalk-list-top-pagination .spacewalk-list-top-extra diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index c739c2a..8ccf9b6 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -509,3 +509,37 @@ h1 .icon-stack { ul.nav.nav-tabs:last-child{ margin-bottom: 1.5em } + +// data lists + +.spacewalk-list { + .spacewalk-list-top { + padding: 0.7em; + .spacewalk-list-top-wrap { + .make-row(); + + .spacewalk-list-top-alphabar { + .make-md-column(9); + .text-left; + } + .spacewalk-list-top-addons { + .make-md-column(3); + .text-right; + } + + .spacewalk-list-filter { + .make-md-column(4); + .text-left; + } + .spacewalk-list-top-pagination { + .make-md-column(8); + .text-right; + } + } + + .spacewalk-list-top-extra { + .make-row(); + } + } +} + diff --git a/branding/css/theme.less b/branding/css/theme.less index 1890e5c..181c1ef 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -2,32 +2,32 @@ .spacewalk-alphabar{ border-bottom: 1px solid #dddddd; - padding: .7em; - .pagination{ + //padding: .7em; + &.pagination{ margin: 0 } - .pagination > li > a, .pagination > li > span{ + &.pagination > li > a, .pagination > li > span{ border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; border-left: 0; border-right: 0; } - .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ + &.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ border-left: 1px solid #dddddd; padding-left: 8px; } - .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{ + &.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{ border-right: 1px solid #dddddd; padding-right: 8px; } - .pagination-sm > li > a, .pagination-sm > li > span{ + &.pagination-sm > li > a, .pagination-sm > li > span{ padding: 4px 6px; } - .pagination-sm > li:nth-child(11) > a{ + &.pagination-sm > li:nth-child(11) > a{ border-left: 1px solid #dddddd; padding-left: 10px; } - .pagination-sm > li:nth-child(10) > a{ + &.pagination-sm > li:nth-child(10) > a{ padding-right: 10px; } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java index 6606059..cb5099c 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java @@ -83,11 +83,9 @@ public class AlphaBarHelper { */ public void writeAlphaBar(PageContext pageContext, Set<Character> activeChars, String listName) throws JspException { - - ListTagUtil.write(pageContext, - "<div class=\"spacewalk-alphabar\">"); + ListTagUtil.write(pageContext, - "<ul class=\"pagination pagination-sm\">"); + "<ul class=\"spacewalk-alphabar pagination pagination-sm\">"); List<String> alphabet = LocalizationService.getInstance().getAlphabet(); List<String> numbers = LocalizationService.getInstance().getDigits(); @@ -115,7 +113,6 @@ public class AlphaBarHelper { } ListTagUtil.write(pageContext, "</ul>"); - ListTagUtil.write(pageContext, "</div>"); } private String renderEnabledAlpha(char alpha, diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index be4a0c5..6ddd90f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -16,19 +16,7 @@ package com.redhat.rhn.frontend.taglibs.list; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.context.Context; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.taglibs.RhnListTagFunctions; -import com.redhat.rhn.frontend.taglibs.list.decorators.ListDecorator; -import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; -import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.frontend.taglibs.list.row.RowRenderer; - -import org.apache.commons.lang.StringUtils; - +import java.io.StringWriter; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -40,6 +28,19 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; +import org.apache.commons.lang.StringUtils; + +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.context.Context; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.RhnListTagFunctions; +import com.redhat.rhn.frontend.taglibs.list.decorators.ListDecorator; +import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.row.RowRenderer; + /** * Renders a list of data bean in a page * @@ -66,6 +67,7 @@ public class ListTag extends BodyTagSupport { private boolean haveTblAddonsRendered = false; private boolean haveTblFootersRendered = false; private boolean haveColHeadersRendered = false; + private int columnCount; private int pageSize = -1; private String dataSetName = ListHelper.DATA_SET; @@ -405,6 +407,26 @@ public class ListTag extends BodyTagSupport { @Override public int doEndTag() throws JspException { ListTagUtil.write(pageContext, "</div>"); + + // print the hidden fields after the list widget is printed + // but before the form of the listset is closed. + ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, + ListTagUtil.makeFilterSearchParentLabel(uniqueName), + searchParent)); + ListTagUtil.write(pageContext, + String.format(HIDDEN_TEXT, + ListTagUtil.makeFilterSearchChildLabel(uniqueName), + searchChild)); + ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, + ListTagUtil.makeParentIsAnElementLabel(uniqueName), + parentIsElement)); + + // here decorators should insert other e.g hidden input fields + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.afterList(); + } + ListTagUtil.write(pageContext, ""); release(); return BodyTagSupport.EVAL_PAGE; @@ -419,18 +441,6 @@ public class ListTag extends BodyTagSupport { ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext); - // close the panel-heading div - if (cmd.equals(ListCommand.TBL_HEADING)) { - //ListTagUtil.write(pageContext, ""); - //ListTagUtil.write(pageContext, "</div>"); - } - - // close the panel-body div - if (cmd.equals(ListCommand.TBL_ADDONS)) { - //ListTagUtil.write(pageContext, ""); - //ListTagUtil.write(pageContext, "</div>"); - } - if (cmd.equals(ListCommand.COL_HEADER)) { ListTagUtil.write(pageContext, "</tr>"); } @@ -455,55 +465,114 @@ public class ListTag extends BodyTagSupport { startTable(); - ListTagUtil.write(pageContext, "<thead>"); - - // render the navigation and filters as a row of the header - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); + // as the header addons is populated with decorators, we don't + // know if there will be content or not, but we want to avoid + // writing the head tag at all if there is none, so we push a + // buffer into the stack, and empty it later. + StringWriter theadAlphaBarContent = new StringWriter(); + StringWriter theadAddons = new StringWriter(); + StringWriter theadBeforeTopPagDecContent = new StringWriter(); + StringWriter theadFilterContent = new StringWriter(); + StringWriter theadExtraContent = new StringWriter(); setupManipulator(); manip.sort(); pageData = manip.getPage(); + pageContext.pushBody(theadAlphaBarContent); if (!manip.isListEmpty() && !StringUtils.isBlank(alphaBarColumn)) { AlphaBarHelper.getInstance().writeAlphaBar(pageContext, manip.getAlphaBarIndex(), getUniqueName()); } + pageContext.popBody(); - for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); - dec.beforeList(); + pageContext.pushBody(theadAddons); + if (!isEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onTopAddons(); + } } - ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeFilterSearchParentLabel(uniqueName), searchParent)); - ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeFilterSearchChildLabel(uniqueName), searchChild)); - ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeParentIsAnElementLabel(uniqueName), parentIsElement)); - - ListTagUtil.write(pageContext, "<div class=\"filter-input row\">"); - // column with the filter - ListTagUtil.write(pageContext, "<div class=\"col-md-3 text-left\">"); + pageContext.popBody(); + + pageContext.pushBody(theadFilterContent); if (filter != null && manip.getUnfilteredDataSize() != 0) { ListTagUtil.renderFilterUI(pageContext, filter, getUniqueName(), width, columnCount, searchParent, searchChild); } - ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "<div class=\"col-md-9 text-right\">"); + pageContext.popBody(); + + pageContext.pushBody(theadBeforeTopPagDecContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); dec.beforeTopPagination(); } } + pageContext.popBody(); - // column with the pagination controls - renderTopPaginationControls(); - ListTagUtil.write(pageContext, "</div>"); + pageContext.pushBody(theadExtraContent); + if (!isEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.onTopExtraContent(); + } + } + pageContext.popBody(); - ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "<thead>"); + + // this avoid render the row is there is no content at all + if ((theadAlphaBarContent.getBuffer().length() + + theadFilterContent.getBuffer().length() + + theadBeforeTopPagDecContent.getBuffer().length() + + theadAddons.getBuffer().length()) > 0) { + // render the navigation and filters as a row of the header + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td colspan=\"" + + getColumnCount() + "\">"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top\">"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-wrap\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-alphabar\">"); + ListTagUtil.write(pageContext, theadAlphaBarContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-addons\">"); + ListTagUtil.write(pageContext, theadAddons.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-wrap\">"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-filter\">"); + ListTagUtil.write(pageContext, theadFilterContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-pagination\">"); + ListTagUtil.write(pageContext, + theadBeforeTopPagDecContent.toString()); + // column with the pagination controls + renderTopPaginationControls(); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, + "<div class=\"spacewalk-list-top-extra\">"); + ListTagUtil.write(pageContext, theadExtraContent.toString()); + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, "</td>"); + ListTagUtil.write(pageContext, "</tr>"); + } HttpServletRequest request = (HttpServletRequest) pageContext .getRequest(); @@ -529,7 +598,6 @@ public class ListTag extends BodyTagSupport { } if (haveColHeadersRendered && !haveTblFootersRendered) { - ListTagUtil.write(pageContext, "</tr>"); ListTagUtil.write(pageContext, "</thead>"); @@ -566,14 +634,26 @@ public class ListTag extends BodyTagSupport { else if (haveTblFootersRendered) { retval = BodyTagSupport.SKIP_BODY; - // render the pagination controls as the footer of the table - ListTagUtil.write(pageContext, "<tfoot>"); - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); + // as the footer addons are populated with decorators, we don't + // know if there will be content or not, but we want to avoid + // writing the tfoot tag at all if there is none, so we push a + // buffer into the stack, and empty it later. + StringWriter tfootAddonsContent = new StringWriter(); + pageContext.pushBody(tfootAddonsContent); renderFooterPaginationControls(); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); - ListTagUtil.write(pageContext, "</tfoot>"); + pageContext.popBody(); + + if (tfootAddonsContent.getBuffer().length() > 0) { + // render the pagination controls as the footer of the table + ListTagUtil.write(pageContext, "<tfoot>"); + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); + ListTagUtil.write(pageContext, tfootAddonsContent.toString()); + ListTagUtil.write(pageContext, "</td>"); + ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "</tfoot>"); + } + ListTagUtil.write(pageContext, "</table>"); // if there is reference links, put them as a panel footer @@ -672,6 +752,12 @@ public class ListTag extends BodyTagSupport { getUniqueName(), isParentAnElement(), searchParent, searchChild); ListTagUtil.write(pageContext, ""); + + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.beforeList(); + } + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list panel panel-default\" id=\"" + getUniqueName() + "\">"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), @@ -862,10 +948,7 @@ public class ListTag extends BodyTagSupport { } ListTagUtil.write(pageContext, "<div class=\"pull-left\">"); - for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); - dec.afterList(); - } + // Here were the afterList decorators ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, "<div class=\"pull-right\">"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java index a48cbc2..f62ad76 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java @@ -92,11 +92,30 @@ public abstract class BaseListDecorator implements ListDecorator { } /** - * * {@inheritDoc} */ public void beforeTopPagination() throws JspException { } + /** + * {@inheritDoc} + */ + public void onTopExtraContent() throws JspException { + + } + + /** + * {@inheritDoc} + */ + public void onBottomExtraContent() throws JspException { + + } + + /** + * {@inheritDoc} + */ + public void onTopAddons() throws JspException { + + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java index d56de56..7b94e17 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java @@ -80,4 +80,22 @@ public interface ListDecorator { * @throws JspException exception */ void beforeTopPagination() throws JspException; + + /** + * Notifies the decorator that the list is on the top extra content section + * @throws JspException exception + */ + void onTopExtraContent() throws JspException; + + /** + * Notifies the decorator that the list is on the bottom extra content section + * @throws JspException exception + */ + void onBottomExtraContent() throws JspException; + + /** + * Notifies the decorator that the list is in the addons section + * @throws JspException something bad happened + */ + void onTopAddons() throws JspException; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index 0bf6ee2..c19bcf0 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -107,7 +107,7 @@ public class PageSizeDecorator extends BaseListDecorator { * {@inheritDoc} */ @Override - public void beforeTopPagination() throws JspException { + public void onTopAddons() throws JspException { if (!getCurrentList().isEmpty()) { StringBuilder stringBuild = new StringBuilder(); commit 459ea630c3b3d1de7253e31911b4be29fa5c9758 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 21 08:02:23 2013 +0200 convert the tasks section of the overview in a panel diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 7a7ca38..99a01ac 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -1,102 +1,126 @@ -<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <form method="post" name="rhn_list" action="/YourRhn.do"> -<table cellspacing="0" cellpadding="0" class="half-table"> - -<thead> -<tr> - <th style="text-align: left;"><bean:message key="yourrhn.jsp.task.title" /></th></tr> -</thead> - -<rhn:require acl="not user_role(satellite_admin)"> -<rhn:require acl="user_role(org_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/systems/SystemEntitlements.do"> - <bean:message key="yourrhn.jsp.tasks.subscriptions" /> - </a></td></tr> -</rhn:require> -</rhn:require> - -<rhn:require acl="user_role(satellite_admin)"> -<rhn:require acl="user_role(org_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <bean:message key="yourrhn.jsp.task.manage_subscriptions" /> - <br> &ensp; &ensp;<a href="/rhn/systems/SystemEntitlements.do"> - <bean:message key="header.jsp.my_organization" /></a> <strong>|</strong> <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message key="header.jsp.satellite_wide" /> - </a></td></tr> -</rhn:require> -</rhn:require> - -<rhn:require acl="user_role(satellite_admin)"> -<rhn:require acl="not user_role(org_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"> - <bean:message key="yourrhn.jsp.tasks.subscriptions" /> - </a></td></tr> -</rhn:require> -</rhn:require> - -<c:if test="${documentation == 'true'}"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/help/client-config/en-US/index.jsp"> - <bean:message key="yourrhn.jsp.tasks.registersystem" /> - </a></td></tr> -</c:if> - -<rhn:require acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/activationkeys/List.do"> - <bean:message key="yourrhn.jsp.tasks.activationkeys" /> - </a></td></tr> - -</rhn:require> - -<rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/kickstart/KickstartOverview.do"> - <bean:message key="yourrhn.jsp.tasks.kickstart" /> - </a></td></tr> - -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/configuration/file/GlobalConfigFileList.do"> - <bean:message key="yourrhn.jsp.tasks.configuration" /> - </a></td></tr> - -<rhn:require acl="show_monitoring();" - mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/monitoring/ProbeList.do"> - <bean:message key="yourrhn.jsp.tasks.monitoring" /> - </a></td></tr> -</rhn:require> - -<rhn:require acl="user_role(satellite_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/admin/multiorg/Organizations.do"> - <bean:message key="yourrhn.jsp.tasks.manage_sat_orgs" /> - </a></td></tr> -</rhn:require> - -</rhn:require> - -<rhn:require acl="user_role(satellite_admin)"> -<tr class="list-row-odd"> -<td style="text-align: left;"><img style="margin-left: 4px;" src="/img/parent_node.gif" - alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/admin/config/GeneralConfig.do"> - <bean:message key="yourrhn.jsp.tasks.config_sat" /> - </a></td></tr> -</rhn:require> - -</table> + + + <div class="panel panel-default"> + + <div class="panel-heading"> + <h3 class="panel-title"> + <bean:message key="yourrhn.jsp.task.title" /> + </h3> + </div> + + <ul class="list-group"> + + <rhn:require acl="not user_role(satellite_admin)"> + <rhn:require acl="user_role(org_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/systems/SystemEntitlements.do"> <bean:message + key="yourrhn.jsp.tasks.subscriptions" /> + </a> + </li> + </rhn:require> + </rhn:require> + + <rhn:require acl="user_role(satellite_admin)"> + <rhn:require acl="user_role(org_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <bean:message + key="yourrhn.jsp.task.manage_subscriptions" /> <br> + &ensp; &ensp;<a href="/rhn/systems/SystemEntitlements.do"> + <bean:message key="header.jsp.my_organization" /> + </a> <strong>|</strong> <a + href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message + key="header.jsp.satellite_wide" /> </a> + </li> + </rhn:require> + </rhn:require> + + <rhn:require acl="user_role(satellite_admin)"> + <rhn:require acl="not user_role(org_admin)"> + <li class="list-group-item"><i class="icon-caret-right"></i> <a + href="/rhn/admin/multiorg/SoftwareEntitlements.do"> <bean:message + key="yourrhn.jsp.tasks.subscriptions" /> + </a> + </li> + </rhn:require> + </rhn:require> + + <c:if test="${documentation == 'true'}"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/help/client-config/en-US/index.jsp"> <bean:message + key="yourrhn.jsp.tasks.registersystem" /> + </a> + </li> + </c:if> + + <rhn:require + acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/activationkeys/List.do"> <bean:message + key="yourrhn.jsp.tasks.activationkeys" /> + </a> + </li> + + </rhn:require> + + <rhn:require + acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/kickstart/KickstartOverview.do"> <bean:message + key="yourrhn.jsp.tasks.kickstart" /> + </a> + </li> + + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/configuration/file/GlobalConfigFileList.do"> + <bean:message key="yourrhn.jsp.tasks.configuration" /> + </a> + </li> + + <rhn:require acl="show_monitoring();" + mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/monitoring/ProbeList.do"> <bean:message + key="yourrhn.jsp.tasks.monitoring" /> + </a> + </li> + </rhn:require> + + <rhn:require acl="user_role(satellite_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/admin/multiorg/Organizations.do"> <bean:message + key="yourrhn.jsp.tasks.manage_sat_orgs" /> + </a> + </li> + </rhn:require> + + </rhn:require> + + <rhn:require acl="user_role(satellite_admin)"> + <li class="list-group-item"> + <i class="icon-caret-right"></i> <a + href="/rhn/admin/config/GeneralConfig.do"> <bean:message + key="yourrhn.jsp.tasks.config_sat" /> + </a> + </li> + </rhn:require> + + + </ul> + + + <div class="panel-footer"></div> + </div> + </form> commit a9517e732f735a8197a4f5e9e53a2c8071e0d405 Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 21 15:53:42 2013 +0200 panels added for forms diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp index 7401e8f..0a5d80d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -15,14 +15,16 @@ <bean:message key="Addresses" /> </rhn:toolbar> -<div class="page-summary"> -<p> - <bean:message key="addresses.summary" /> -</p> -</div> - - <table class="details"> - <rhn:address type="M" action="my" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> - </table> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4> + <bean:message key="addresses.summary" /> + </h4> + </div> + <div class="panel-body"> + <table class="table"> + <rhn:address type="M" action="my" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> + </table> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index fd37766..88282b0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -7,79 +7,85 @@ <html:html xhtml="true"> <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> - <html:form action="/users/UserDetailsSubmit?uid=${user.id}" styleClass="form-horizontal"> - <rhn:csrf /> - <h2><bean:message key="userdetails.jsp.header"/></h2> - <p class="lead"><bean:message key="userdetails.jsp.summary"/></p> - <%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="userdetails.jsp.adminRoles"/>:</label> - <div class="col-lg-6"> - <c:forEach items="${adminRoles}" var="role"> - <label> - <input type="checkbox" name="role_${role.value}" - <c:if test="${role.selected}">checked="true"</c:if> - <c:if test="${role.disabled}">disabled="true"</c:if>/> - ${role.name} - </label> - </c:forEach> + <div class="panel panel-default"> + <html:form action="/users/UserDetailsSubmit?uid=${user.id}" styleClass="form-horizontal"> + <rhn:csrf /> + <div class="panel-heading"> + <h4><bean:message key="userdetails.jsp.header"/></h4> + <p><bean:message key="userdetails.jsp.summary"/></p> </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="userdetails.jsp.roles"/>: - </label> - <div class="col-lg-6"> - <c:forEach items="${regularRoles}" var="role"> - <label> - <input type="checkbox" name="role_${role.value}" - <c:if test="${role.selected}">checked="true"</c:if> - <c:if test="${role.disabled}">disabled="true"</c:if>/> - ${role.name} + <div class="panel-body"> + <%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="userdetails.jsp.adminRoles"/>:</label> + <div class="col-lg-6"> + <c:forEach items="${adminRoles}" var="role"> + <label> + <input type="checkbox" name="role_${role.value}" + <c:if test="${role.selected}">checked="true"</c:if> + <c:if test="${role.disabled}">disabled="true"</c:if>/> + ${role.name} + </label> + </c:forEach> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="userdetails.jsp.roles"/>: </label> - </c:forEach> - <c:if test="${orgAdmin}"> - <p/> - <bean:message key="userdetails.jsp.grantedByOrgAdmin"/> - </c:if> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="created.displayname"/> - </label> - <label class="col-lg-6"> - ${created} - </label> - </div> + <div class="col-lg-6"> + <c:forEach items="${regularRoles}" var="role"> + <label> + <input type="checkbox" name="role_${role.value}" + <c:if test="${role.selected}">checked="true"</c:if> + <c:if test="${role.disabled}">disabled="true"</c:if>/> + ${role.name} + </label> + </c:forEach> + <c:if test="${orgAdmin}"> + <p/> + <bean:message key="userdetails.jsp.grantedByOrgAdmin"/> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="created.displayname"/> + </label> + <label class="col-lg-6"> + ${created} + </label> + </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="last_sign_in.displayname"/> - </label> - <label class="col-lg-6"> - ${lastLoggedIn} - </label> - </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="last_sign_in.displayname"/> + </label> + <label class="col-lg-6"> + ${lastLoggedIn} + </label> + </div> - <input type="hidden" name="disabledRoles" value="${disabledRoles}"/> + <input type="hidden" name="disabledRoles" value="${disabledRoles}"/> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <c:choose> - <c:when test="${!empty mailableAddress}"> - <button type="submit" class="btn btn-success"> - <bean:message key="button.update"/> - </button> - </c:when> - <c:otherwise> - <button type="button" class="btn btn-success" disabled="disabled"> - <bean:message key="button.update"/> - </button> - </c:otherwise> - </c:choose> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test="${!empty mailableAddress}"> + <button type="submit" class="btn btn-success"> + <bean:message key="button.update"/> + </button> + </c:when> + <c:otherwise> + <button type="button" class="btn btn-success" disabled="disabled"> + <bean:message key="button.update"/> + </button> + </c:otherwise> + </c:choose> + </div> + </div> </div> - </div> - </html:form> + </html:form> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 0164c09..69d3713 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -12,46 +12,51 @@ deletionType="credentials"> <bean:message key="Credentials"/> </rhn:toolbar> - <p class="lead"> + <p> <bean:message key="credentials.jsp.edit.summary" /> </p> - <h2><bean:message key="credentials.jsp.susestudio" /></h2> - - <form method="post" action="/rhn/account/Credentials.do" - class="form-horizontal" role="form"> - <rhn:csrf /> - <rhn:submitted /> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="credentials.jsp.username" /> - </label> - <div class="col-lg-6"> - <html:text property="studio_user" styleClass="form-control" value="${creds.username}" /> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="credentials.jsp.apikey" /> - </label> - <div class="col-lg-6"> - <html:text property="studio_key" styleClass="form-control" value="${creds.password}" /> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="credentials.jsp.url" /> - </label> - <div class="col-lg-6"> - <html:text property="studio_url" styleClass="form-control" value="${creds.url}" /> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="credentials.jsp.susestudio" /></h4> </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" class="btn btn-success"> - <bean:message key="credentials.jsp.edit.dispatch" /> - </button> - </div> + <div class="panel-body"> + <form method="post" action="/rhn/account/Credentials.do" + class="form-horizontal" role="form"> + <rhn:csrf /> + <rhn:submitted /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="credentials.jsp.username" /> + </label> + <div class="col-lg-6"> + <html:text property="studio_user" styleClass="form-control" value="${creds.username}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="credentials.jsp.apikey" /> + </label> + <div class="col-lg-6"> + <html:text property="studio_key" styleClass="form-control" value="${creds.password}" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="credentials.jsp.url" /> + </label> + <div class="col-lg-6"> + <html:text property="studio_url" styleClass="form-control" value="${creds.url}" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" class="btn btn-success"> + <bean:message key="credentials.jsp.edit.dispatch" /> + </button> + </div> + </div> + </form> </div> - </form> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index b764a3d..9a0f118 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -10,27 +10,34 @@ <rhn:toolbar base="h1" icon="icon-user" imgAlt="user.common.userAlt"> <bean:message key="Addresses"/> </rhn:toolbar> - <h2> - ${editAddressForm.map.typedisplay} - <bean:message key="your_edit_address_record.displayname"/> - </h2> - <p class="lead"> - <bean:message key="your_edit_address.jsp.summary" /> - </p> - <html:form action="/account/EditAddressSubmit" styleClass="form-horizontal"> - <rhn:csrf /> - <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" - class="btn btn-success" - value="<bean:message key="button.update"/>"> - <bean:message key="button.update"/> - </button> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4> + ${editAddressForm.map.typedisplay} + <bean:message key="your_edit_address_record.displayname"/> + </h4> </div> - <html:hidden property="uid" value="${param.uid}"/> - <html:hidden property="type"/> - </html:form> + <div class="panel-body"> + <p> + <bean:message key="your_edit_address.jsp.summary" /> + </p> + <hr> + <html:form action="/account/EditAddressSubmit" styleClass="form-horizontal"> + <rhn:csrf /> + <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" + class="btn btn-success" + value="<bean:message key="button.update"/>"> + <bean:message key="button.update"/> + </button> + </div> + </div> + <html:hidden property="uid" value="${param.uid}"/> + <html:hidden property="type"/> + </html:form> + </div> + </div> </body> </html>

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.24-1'
by Milan Zazrivec 24 Oct '13

24 Oct '13

Tag 'spacewalk-schema-2.1.24-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-10-24 09:57 +0000 Tagging package [spacewalk-schema] version [2.1.24-1] in directory [schema/spacewalk/]. Changes since spacewalk-schema-2.1.23-1: Milan Zazrivec (2): fix space check for Oracle schema upgrades Automatic commit of package [spacewalk-schema] release [2.1.24-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema-upgrade | 8 ++++---- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Milan Zazrivec 24 Oct '13

24 Oct '13

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit bdbc438c70aabd752e183d332f043d4336517d63 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Oct 24 11:57:47 2013 +0200 Automatic commit of package [spacewalk-schema] release [2.1.24-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index dfcfd01..2cb0b6e 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.23-1 schema/spacewalk/ +2.1.24-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 55ba61c..8753490 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.23 +Version: 2.1.24 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Thu Oct 24 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.24-1 +- fix space check for Oracle schema upgrades + * Thu Oct 24 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.23-1 - schema upgrade fix: explicit cast for bit-wise operand

1 0

schema/spacewalk
by Milan Zazrivec 24 Oct '13

24 Oct '13

schema/spacewalk/spacewalk-schema-upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit d5ab39faf8ee6c7d6f17b9b0aaa07de8a2c87110 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Oct 24 11:51:49 2013 +0200 fix space check for Oracle schema upgrades This fix is to make sure the bytes will not get converted to scientific notation (for large values). diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade index 930a10d..91e8910 100755 --- a/schema/spacewalk/spacewalk-schema-upgrade +++ b/schema/spacewalk/spacewalk-schema-upgrade @@ -82,12 +82,12 @@ if (-f $schema_banner and -s $schema_banner) { if ($options{db_backend} eq 'oracle') { my $default_tablespace = get_default_oracle_tablespace(); my $used_space = run_query(<<EOF); - select sum(bytes) + select sum(bytes / 1048576) from user_segments where tablespace_name = '$default_tablespace'; EOF my $free_space = run_query(<<EOF); - select sum(bytes) + select sum(bytes / 1048576) from user_free_space where tablespace_name = '$default_tablespace'; EOF @@ -98,8 +98,8 @@ EOF for (1 .. 72) { $usage .= '-'; } $usage .= "\n"; $usage .= sprintf("%+15s %15.2f %15.2f %15.2f", $default_tablespace, - $used_space/1024/1024, - $free_space/1024/1024, + $used_space, + $free_space, $used_space * 100 / ($used_space + $free_space)); print <<EOF;

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.23-1'
by Milan Zazrivec 24 Oct '13

24 Oct '13

Tag 'spacewalk-schema-2.1.23-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-10-24 08:34 +0000 Tagging package [spacewalk-schema] version [2.1.23-1] in directory [schema/spacewalk/]. Changes since spacewalk-web-2.1.28-1: Milan Zazrivec (2): schema upgrade fix: explicit cast for bit-wise operand Automatic commit of package [spacewalk-schema] release [2.1.23-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Milan Zazrivec 24 Oct '13

24 Oct '13

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 28958bafb15dbe90ca0dd36f9a10ac41fffc471a Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Oct 24 10:34:51 2013 +0200 Automatic commit of package [spacewalk-schema] release [2.1.23-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index dab0968..dfcfd01 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.22-1 schema/spacewalk/ +2.1.23-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index bdb33a5..55ba61c 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.22 +Version: 2.1.23 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Thu Oct 24 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.23-1 +- schema upgrade fix: explicit cast for bit-wise operand + * Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1 - Regenerate the metadata for rpm enhances dependency (bnc#846436) - add support for enhances rpm weak dependency (schema) (bnc#846436)

1 0

schema/spacewalk
by Milan Zazrivec 24 Oct '13

24 Oct '13

schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8dadb6de15cbf6e2cf6bbeabe7a77de2b05da110 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Oct 24 10:32:47 2013 +0200 schema upgrade fix: explicit cast for bit-wise operand This is to fix the following error: psql:/var/log/spacewalk/schema-upgrade/20131022-181452-script.sql:4949: ERROR: operator does not exist: numeric & integer LINE 4: where (s.sense & 134217728) != 134217728; ^ HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts. diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql index d563b23..d441545 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql @@ -3,7 +3,7 @@ insert into rhnPackageEnhances (package_id, capability_id, sense) select s.package_id, s.capability_id, s.sense from rhnPackageSupplements s - where (s.sense & 134217728) != 134217728; + where (s.sense::bigint & 134217728) != 134217728; -- 134217728 == (1 << 27) STRONG FLAG in RPM delete from rhnPackageSupplements

1 0

Changes to 'refs/tags/spacewalk-web-2.1.28-1'
by Jan Dobes 24 Oct '13

24 Oct '13

Tag 'spacewalk-web-2.1.28-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-10-24 07:33 +0000 Tagging package [spacewalk-web] version [2.1.28-1] in directory [web/]. Changes since spacewalk-java-2.1.61-1: Jan Dobes (1): Automatic commit of package [spacewalk-web] release [2.1.28-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Jan Dobes 24 Oct '13

24 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit bc849b13298f2baf50df9c9b629af30a60f287f0 Author: Jan Dobes <jdobes(a)redhat.com> Date: Thu Oct 24 09:33:48 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.28-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 7d05402..73b3f82 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.27-1 web/ +2.1.28-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index d485008..061eb60 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.27 +Version: 2.1.28 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Thu Oct 24 2013 Jan Dobes 2.1.28-1 +- 1015747 - cleanup +- 1015747 - new jsp page + nav stuff + * Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1 - report package arch in Event History

1 0

Changes to 'refs/tags/spacewalk-java-2.1.61-1'
by Jan Dobes 24 Oct '13

24 Oct '13

Tag 'spacewalk-java-2.1.61-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-10-24 07:32 +0000 Tagging package [spacewalk-java] version [2.1.61-1] in directory [java/]. Changes since spacewalk-java-2.1.60-1: Jan Dobes (5): 1015747 - new jsp page + nav stuff 1015747 - page handling 1015747 - resources 1015747 - cleanup Automatic commit of package [spacewalk-java] release [2.1.61-1]. --- java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 13 java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml | 4 java/code/src/com/redhat/rhn/frontend/action/help/ForgotCredentialsAction.java | 258 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 18 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 29 + java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 57 ++ java/code/webapp/WEB-INF/nav/sitenav.xml | 2 java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp | 70 ++ java/code/webapp/WEB-INF/struts-config.xml | 19 java/spacewalk-java.spec | 7 rel-eng/packages/spacewalk-java | 2 web/conf/rhn_web.conf | 3 web/html/help/forgot_password.pxt | 63 -- web/include/formletters/forgot_accounts.xml | 20 web/include/formletters/forgot_password.xml | 20 web/include/nav/sitenav.xml | 2 web/modules/rhn/RHN/DB/TemplateString.pm | 196 ------- web/modules/rhn/RHN/Postal.pm | 275 ---------- web/modules/rhn/RHN/TemplateString.pm | 24 web/modules/sniglets/Sniglets/Users.pm | 79 -- web/spacewalk-web.spec | 2 21 files changed, 477 insertions(+), 686 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Dobes 24 Oct '13

24 Oct '13

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 95e371e86ba6316f8ee87f5b0734f0275de8d2c8 Author: Jan Dobes <jdobes(a)redhat.com> Date: Thu Oct 24 09:32:28 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.61-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 27eedf4..16fc52c 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.60 +Version: 2.1.61 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 24 2013 Jan Dobes 2.1.61-1 +- 1015747 - resources +- 1015747 - page handling +- 1015747 - new jsp page + nav stuff + * Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.60-1 - added messages for SystemRemoteCommandAction.java - reformated xliff file using xmllint diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 42bfe71..79447bb 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.60-1 java/ +2.1.61-1 java/

1 0

4 commits - java/code web/conf web/html web/include web/modules web/spacewalk-web.spec
by Jan Dobes 24 Oct '13

24 Oct '13

java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 13 java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml | 4 java/code/src/com/redhat/rhn/frontend/action/help/ForgotCredentialsAction.java | 258 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 18 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 29 + java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 57 ++ java/code/webapp/WEB-INF/nav/sitenav.xml | 2 java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp | 70 ++ java/code/webapp/WEB-INF/struts-config.xml | 19 web/conf/rhn_web.conf | 3 web/html/help/forgot_password.pxt | 63 -- web/include/formletters/forgot_accounts.xml | 20 web/include/formletters/forgot_password.xml | 20 web/include/nav/sitenav.xml | 2 web/modules/rhn/RHN/DB/TemplateString.pm | 196 ------- web/modules/rhn/RHN/Postal.pm | 275 ---------- web/modules/rhn/RHN/TemplateString.pm | 24 web/modules/sniglets/Sniglets/Users.pm | 79 -- web/spacewalk-web.spec | 2 19 files changed, 470 insertions(+), 684 deletions(-) New commits: commit 751a09283e75b432490ad0ed721838d2639ff83c Author: Jan Dobes <jdobes(a)redhat.com> Date: Wed Oct 23 21:37:50 2013 +0200 1015747 - cleanup diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf index b5392e8..80ef860 100644 --- a/web/conf/rhn_web.conf +++ b/web/conf/rhn_web.conf @@ -39,9 +39,6 @@ web.enable_oai_sync = 0 # use crypt(3) for passwords in database web.encrypted_passwords = 1 -# Directory where RHN::Postal searches for formletters. -web.formletter_dir = /var/www/html/formletters - # Hour of the day, in EST24, that the throttling of freeloaders ends web.freeloader_throttle_end = 17 diff --git a/web/html/help/forgot_password.pxt b/web/html/help/forgot_password.pxt deleted file mode 100644 index 3b9c076..0000000 --- a/web/html/help/forgot_password.pxt +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - -<h1>Login Information</h1> - -<pxt-include-late file="/network/components/message_queues/local.pxi" /> - <h2>Password Unknown</h2> - <p>If you do not know your password, please enter your <pxt-config var="product_name" /> login and email address below and your password will be reset and sent to you.</p> - <pxt-use class="Sniglets::Users" /> - <pxt-form method="post"> - <table class="details"> - <rhn-login-form> - <tr> - <th><pxt-config var="product_name" /> Login:</th> - - <td> - <input type="text" name="username" size="20" maxlength="120" value="" /> - </td> - </tr> - - <tr> - <th>Email Address:</th> - - <td> - <input type="text" name="email" size="20" maxlength="120" value="" /> - </td> - </tr> - </rhn-login-form> - </table> - -<div align="right"> -<hr /> -<input type="submit" value="Send Password" /> -</div> -<input type="hidden" name="pxt:trap" value="rhn:forgot_password_cb" /> - </pxt-form> - - <h2><pxt-config var="product_name" /> Login Unknown</h2> - - <p>If you do not know your <pxt-config var="product_name" /> login, please enter your email address below and your <pxt-config var="product_name" /> login will be sent to you.</p> - <pxt-form method="post"> - <table class="details"> - <tr> - <th>Email Address:</th> - - <td> - <input type="text" name="email" size="20" maxlength="120" value="" /> - </td> - </tr> - </table> - -<div align="right"> -<hr /> -<input type="submit" value="Send Login" /> -</div> -<input type="hidden" name="pxt:trap" value="rhn:forgot_accounts_cb" /> - </pxt-form> - </grail-canvas-template> -</pxt-passthrough> - diff --git a/web/include/formletters/forgot_accounts.xml b/web/include/formletters/forgot_accounts.xml deleted file mode 100644 index 175a5da..0000000 --- a/web/include/formletters/forgot_accounts.xml +++ /dev/null @@ -1,20 +0,0 @@ -<postal-letter subject="&product_name; Login Information"> -[ This is an automated email sent to <email-address /> at your request. ] - -You have requested a list of all <product-name /> logins associated -with the email address <email-address />. - -Existing login(s): -<account-list /> - -You may reset the passwords for any of the above Red Hat logins at: - - https://<postal-template-replace label="hostname" default=" unknown hostname " />/help/forgot_password.pxt - -If you continue to have difficulties logging in, please contact -your <product-name /> administrator for further assistance. -If you did not request this email be sent, please disregard this message. - -Thank you for using <product-name />. -<postal-template-replace label="email_footer"/> -</postal-letter> diff --git a/web/include/formletters/forgot_password.xml b/web/include/formletters/forgot_password.xml deleted file mode 100644 index 51a22b4..0000000 --- a/web/include/formletters/forgot_password.xml +++ /dev/null @@ -1,20 +0,0 @@ -<postal-letter subject="&product_name; Password Reset"> -[ This is an automated email sent to <email-address /> at your request. ] - -Your <product-name /> password has been reset. To sign in, go to: - -https://<postal-template-replace label="hostname" default=" unknown hostname " />/ - -And use the following username and password: - -Username: <username /> -Password: <password /> - -Once you have logged in, you may then change your password. - -If you continue to have difficulties logging in, please contact -your <product-name /> administrator for further assistance. - -Thank you for using <product-name />. -<postal-template-replace label="email_footer"/> -</postal-letter> diff --git a/web/modules/rhn/RHN/DB/TemplateString.pm b/web/modules/rhn/RHN/DB/TemplateString.pm deleted file mode 100644 index 97cbb4c..0000000 --- a/web/modules/rhn/RHN/DB/TemplateString.pm +++ /dev/null @@ -1,196 +0,0 @@ -# -# Copyright (c) 2008--2012 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; - -package RHN::DB::TemplateString; - -use RHN::DB; -use RHN::DB::TableClass; - -use RHN::Exception qw/throw/; -use Params::Validate; -Params::Validate::validation_options(strip_leading => "-"); - -my @ts_fields = qw/ID CATEGORY_ID LABEL VALUE DESCRIPTION CREATED:longdate MODIFIED:longdate/; -my @tc_fields = qw/LABEL DESCRIPTION/; - -my $ts_table = new RHN::DB::TableClass("rhnTemplateString", "TS", "", @ts_fields); -my $tc_table = new RHN::DB::TableClass("rhnTemplateCategory", "TC", "category", @tc_fields); - -my $j = $ts_table->create_join([$tc_table], - { rhnTemplateString => - { rhnTemplateString => [ "ID", "ID" ], - rhnTemplateCategory => [ "CATEGORY_ID", "ID" ], - } } ); - -# build some accessors -foreach my $field ($j->method_names) { - - my $sub = q{ - sub [[field]] { - my $self = shift; - if (@_ and "[[field]]" ne "id") { - $self->{":modified:"}->{[[field]]} = 1; - $self->{__[[field]]__} = shift; - } - return $self->{__[[field]]__}; - } - }; - - $sub =~ s/\[\[field\]\]/$field/g; - eval $sub; - - if ($@) { - die $@; - } -} - -sub lookup { - my $class = shift; - my %params = validate(@_, {id => 1}); - my $id = $params{id}; - - my @columns; - - my $dbh = RHN::DB->connect; - my $query = $j->select_query("TS.ID = ?"); - - my $sth = $dbh->prepare($query); - $sth->execute($id); - @columns = $sth->fetchrow; - $sth->finish; - - my $ret; - if ($columns[0]) { - $ret = $class->_blank_templatestring(); - foreach ($j->method_names) { - $ret->{"__${_}__"} = shift @columns; - } - - delete $ret->{":modified:"}; - } - else { - throw "No string with id '$id' found\n"; - } - - return $ret; -} - - -sub _blank_templatestring { - my $class = shift; - - my $self = bless { }, $class; - return $self; -} - -#just get a string by id or label - don't bother with loading the object -sub get_string { - my $class = shift; - my %params = validate(@_, {id => 0, label => 0}); - - my $query; - my %q_params; - - if (my $id = $params{id}) { - $query = 'SELECT value FROM rhnTemplateString WHERE id = :id'; - $q_params{id} = $id; - } - elsif (my $label = $params{label}) { - $query = 'SELECT value FROM rhnTemplateString WHERE label = :label'; - $q_params{label} = $label; - } - else { - throw "No id or label."; - } - - my $dbh = RHN::DB->connect; - - my $sth = $dbh->prepare($query); - $sth->execute_h(%q_params); - - my ($value) = $sth->fetchrow; - $sth->finish; - - return $value; -} - -#load all label/value pairs -sub load_all { - my $class = shift; - - my $dbh = RHN::DB->connect; - - my $query = <<EOQ; -SELECT TS.label, TS.value - FROM rhnTemplateString TS -EOQ - - my $sth = $dbh->prepare($query); - $sth->execute; - - my %strings; - - while (my ($key, $value) = $sth->fetchrow) { - $strings{$key} = $value || ''; - } - - return %strings; -} - -sub commit { - my $self = shift; - my $dbh = shift || RHN::DB->connect; - my $mode = 'update'; - - if ($self->id == -1) { - my $sth = $dbh->prepare("SELECT sequence_nextval('rhn_template_str_id_seq') FROM DUAL"); - $sth->execute; - my ($id) = $sth->fetchrow; - die "No id from rhn_template_str_id_seq (possible error: " . $sth->errstr . ")" unless $id; - $sth->finish; - - $self->{":modified:"}->{id} = 1; - $self->{__id__} = $id; - $mode = 'insert'; - } - - die "$self->commit called without valid id" unless $self->id and $self->id > 0; - - my @modified = keys %{$self->{":modified:"}}; - my %modified = map { $_ => 1 } @modified; - - return unless @modified; - - my $query; - if ($mode eq 'update') { - $query = $ts_table->update_query($ts_table->methods_to_columns(@modified)); - $query .= "TS.ID = ?"; - } - else { - $query = $ts_table->insert_query($ts_table->methods_to_columns(@modified)); - } - - my $sth = $dbh->prepare($query); - - $sth->execute((map { $self->$_() } grep { $modified{$_} } $ts_table->method_names), ($mode eq 'update') ? ($self->id) : ()); - - $dbh->commit; - - delete $self->{":modified:"}; -} - -1; diff --git a/web/modules/rhn/RHN/Postal.pm b/web/modules/rhn/RHN/Postal.pm deleted file mode 100644 index 7d09f60..0000000 --- a/web/modules/rhn/RHN/Postal.pm +++ /dev/null @@ -1,275 +0,0 @@ -# -# Copyright (c) 2008--2011 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -package RHN::Postal; -use strict; - -use PXT::Parser; -use PXT::Config; -use RHN::Mail; -use RHN::TemplateString; -use Text::Wrap qw/wrap/; -use PXT::Utils (); - -my @allowed_params = qw/wrap_body allow_all_domains/; - -sub new { - my $class = shift; - my %attr = @_; - - my $self = bless { wrap => 0, - allow_all_domains => 0 }, $class; - - foreach my $param (@allowed_params) { - if (exists $attr{$param}) { - $self->$param($attr{$param}); - } - } - - return $self; -} - -sub template { - my $self = shift; - my $filename = shift; - my $absolute = shift; - - my $full_filename; - if (not $absolute) { - die "invalid filename, must be server root relative" - if $filename =~ m(^/) or $filename =~ m(\.\.); - - my $basedir = PXT::Config->get('formletter_dir'); - $full_filename = "$basedir/$filename"; - } - else { - $full_filename = $filename; - } - - local * FH; - open FH, '<', $full_filename - or die "Can't open $full_filename: $!"; - - local $/ = undef; - my $body = <FH>; - - close FH; - - $self->{original_body} = $body; -} - -sub set_tag { - my $self = shift; - my $tag = shift; - my $val = shift; - - $self->{tags}->{$tag} = $val; -} - -sub subject { - my $self = shift; - my $subject = shift; - - if (defined $subject) { - $self->{subject} = $subject; - } - - return $self->{subject}; -} - -sub to { - my $self = shift; - my $to = shift; - - $self->{to} = $to; -} - -sub from { - my $self = shift; - my $from = shift; - - $self->{from} = $from; -} - -sub bcc { - my $self = shift; - my $bcc = shift; - - $self->{bcc} = $bcc; -} - -sub cc { - my $self = shift; - my @ccs = @_; - - my $cc = join(', ', @ccs); - - $self->{cc} = $cc; -} - -sub sendmail_from { - my $self = shift; - my $from = shift; - - $self->{sendmail_from} = $from; -} - -sub set_header { - my $self = shift; - my $h = shift; - my $v = shift; - - $self->{headers}->{$h} = $v; -} - -sub render { - my $self = shift; - - die "Missing required params" - unless exists $self->{original_body}; - - my $p = new PXT::Parser; - - $p->register_tag("postal-letter" => - sub { - my %params = @_; - if (exists $params{subject}) { - my $subject = $params{subject}; - my $product_name = PXT::Config->get('product_name'); - $subject =~ s!&product_name;!$product_name!g; - $self->subject($subject); - } - return $params{__block__}; - } - ); - - $p->register_tag("postal-comment" => - sub { - return ''; - } - ); - - $p->register_tag("postal-template-replace" => \&template_replace, -5); - $p->register_tag("postal-template-block" => \&template_block, -5); - - foreach my $t (keys %{$self->{tags}}) { - $p->register_tag($t => sub { $self->{tags}->{$t} }); - } - - foreach my $t (keys %{$self->{hidden_tags}}) { - $p->register_tag($t => sub { '' }); - } - - foreach my $t (keys %{$self->{passthrough_tags}}) { - $p->register_tag($t => sub { my %params = @_; $params{__block__} || '' }); - } - - $self->{current_body} = $self->{original_body}; - $p->expand_tags(\$self->{current_body}); - - die "No pre-defined or inline subject" if not exists $self->{subject}; -} - -sub current_body { - my $self = shift; - - die "Body not yet rendered" - unless exists $self->{current_body}; - - return $self->{current_body}; -} - -sub wrap_body { - my $self = shift; - - $self->{wrap} = 1; -} - -sub allow_all_domains { - my $self = shift; - my $flag = shift; - - if (defined $flag) { - $self->{allow_all_domains} = $flag; - } - - return $self->{allow_all_domains}; -} - -sub send { - my $self = shift; - my %params = @_; - my $slow = $params{-slow} || 0; - - $self->set_header("X-RHN-Email" => $self->{to}); - my $username = $self->{tags}->{username} || $self->{tags}->{login}; - $self->set_header("X-RHN-Login" => $username) - if defined $username; - - die "Body not yet rendered" - unless exists $self->{current_body}; - die "No recipient specified" - unless exists $self->{to}; - - my $subject = $self->{subject}; - $subject = PXT::Utils->perform_substitutions($subject, $self->{tags}); - my $body = $self->{current_body}; - - if ($self->{wrap}) { - $body = wrap("", "", $body); - } - RHN::Mail->send(to => $self->{to}, - subject => $subject, - body => $body, - sendmail_from => $self->{sendmail_from}, - from => $self->{from}, - cc => $self->{cc}, - bcc => $self->{bcc}, - slow => $slow, - headers => $self->{headers} || { }, - allow_all_domains => $self->allow_all_domains); -} - -sub template_replace { - my %params = @_; - - my $label = $params{label}; - my $default = $params{default}; - die "No label." unless $label; - - if ($params{__block__}) { - return $params{__block__}; - } - - my $from_db = RHN::TemplateString->get_string(-label => $label); - - # if a default was specified in the .xml file, - # and no override is found in the db, return the .xml's default - if ($default and not $from_db) { - return $default; - } - - return $from_db; -} - -sub template_block { - my %params = @_; - - my %subst = RHN::TemplateString->load_all; - - return PXT::Utils->perform_substitutions($params{__block__}, \%subst); -} - -1; diff --git a/web/modules/rhn/RHN/TemplateString.pm b/web/modules/rhn/RHN/TemplateString.pm deleted file mode 100644 index a6839f5..0000000 --- a/web/modules/rhn/RHN/TemplateString.pm +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; - -package RHN::TemplateString; - -use RHN::DB::TemplateString; -our @ISA = qw/RHN::DB::TemplateString/; - -1; - diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm index 11aeed3..278d268 100644 --- a/web/modules/sniglets/Sniglets/Users.pm +++ b/web/modules/sniglets/Sniglets/Users.pm @@ -23,8 +23,6 @@ use RHN::User; use RHN::Org; use PXT::HTML; use RHN::Mail; -use RHN::Postal; -use RHN::TemplateString; use PXT::ACL; use Mail::RFC822::Address; use URI; @@ -55,9 +53,6 @@ sub register_callbacks { my $class = shift; my $pxt = shift; - $pxt->register_callback('rhn:forgot_password_cb', \&forgot_password_cb); - $pxt->register_callback('rhn:forgot_accounts_cb', \&forgot_accounts_cb); - $pxt->register_callback('rhn:user_prefs_edit_cb' => \&user_prefs_edit_cb); } @@ -180,80 +175,6 @@ sub rhn_login_form { return $body; } -sub forgot_password_cb { - my $pxt = shift; - - my $user = RHN::User->lookup(-username => $pxt->dirty_param('username')); - my $email = $pxt->dirty_param('email'); - - my $previous_request = $pxt->session->get('previous_password_request'); - if ($previous_request) { - if (uc($previous_request->{email}) eq uc($email) and - $previous_request->{username} eq $pxt->dirty_param('username') and - time - $previous_request->{time} < 60) { - warn "attempt to rerequest password reset; ignoring"; - $pxt->push_message(site_info => 'Email sent.'); - return; - } - } - - if ($user and uc($user->email) eq uc($email)) { - my $password = PXT::Utils->random_password(12); - my $username = $user->login; - - $user->set_password($password); - $user->commit; - - my $letter = new RHN::Postal; - $letter->template("forgot_password.xml"); - $letter->set_tag('email-address' => $email); - $letter->set_tag('product-name' => PXT::Config->get('product_name')); - $letter->set_tag('username' => $username); - $letter->set_tag('password' => $password); - $letter->render; - $letter->to($email); - - $pxt->session->set(previous_password_request => {email => $email, username => $pxt->dirty_param('username'), time => time }); - - $pxt->push_message(site_info => 'Email sent.'); - $letter->send; - } - else { - $pxt->push_message(local_alert => 'Either that username does not exist, or the supplied email address does not match our records.'); - } -} - -sub forgot_accounts_cb { - my $pxt = shift; - - my $email = $pxt->dirty_param('email'); - my @users = sort { $a->login_uc cmp $b->login_uc } map { RHN::User->lookup(-id => $_->[0]) } RHN::User->users_by_email($email); - - my $last_req = $pxt->session->get('previous_account_request'); - if ($last_req and time - $last_req < 300) { - $pxt->push_message(site_info => "An email has already been sent; you may only request your account list every five minutes."); - return; - } - if (not @users) { - $pxt->push_message(site_info => 'There are no registered accounts with that email address.'); - return; - } - - $pxt->session->set('previous_account_request' => time); - my $letter = new RHN::Postal; - $letter->template("forgot_accounts.xml"); - $letter->set_tag('email-address' => $email); - $letter->set_tag('product-name' => PXT::Config->get('product_name')); - $letter->set_tag('account-list' => join("\n", map { " " . $_->login } @users)); - $letter->set_header("X-RHN-Info" => "account_list"); - $letter->render; - $letter->to($email); - - $pxt->push_message(site_info => 'Email sent.'); - - $letter->send; -} - sub user_prefs_edit_cb { my $pxt = shift; diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 4dbb812..d485008 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -197,7 +197,6 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/RHN/Org.pm %{perl_vendorlib}/RHN/Package.pm %{perl_vendorlib}/RHN/Package/ -%{perl_vendorlib}/RHN/Postal.pm %{perl_vendorlib}/RHN/Profile.pm %{perl_vendorlib}/RHN/SCDB.pm %{perl_vendorlib}/RHN/SatCluster.pm @@ -214,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/RHN/SystemSnapshot.pm %{perl_vendorlib}/RHN/TSDB.pm %{perl_vendorlib}/RHN/Tag.pm -%{perl_vendorlib}/RHN/TemplateString.pm %{perl_vendorlib}/RHN/Token.pm %{perl_vendorlib}/RHN/User.pm %{perl_vendorlib}/RHN/Utils.pm commit 0f0d9a09711fb5fdeb1bfea7ddbeb6f963c31da6 Author: Jan Dobes <jdobes(a)redhat.com> Date: Wed Oct 23 16:50:02 2013 +0200 1015747 - resources diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 827d626..841b936 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -7759,6 +7759,24 @@ tree will not be usable for kickstarting. <trans-unit id="images.message.success.scheduled"> <source>Image deployment scheduled: {0}</source> </trans-unit> + <trans-unit id="help.credentials.rerequest"> + <source>An email has already been sent. You may request this action only every {0} seconds.</source> + </trans-unit> + <trans-unit id="help.credentials.passwordsent"> + <source>New password sent to {0}.</source> + </trans-unit> + <trans-unit id="help.credentials.invalidemail"> + <source>Supplied email address and login do not match.</source> + </trans-unit> + <trans-unit id="help.credentials.invalidlogin"> + <source>Supplied login does not exist.</source> + </trans-unit> + <trans-unit id="help.credentials.nologins"> + <source>There are no registered accounts with that email address.</source> + </trans-unit> + <trans-unit id="help.credentials.loginssent"> + <source>Found login(s) sent to {0}.</source> + </trans-unit> </body> </file> </xliff> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 9669c0c..ff300b7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -20543,6 +20543,35 @@ given channel.</source> <source>This master did not export any of its organizations to this slave</source> </trans-unit> </group> + <group> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/help/ForgotCredentials.do</context> + </context-group> + <trans-unit id="help.credentials.jsp.passwordreset"> + <source>Password Reset</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.logininfo"> + <source>Login Information</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.passwordtip"> + <source>If you do not know your password, please enter your @@PRODUCT_NAME@@ login and email address below and your password will be reset and sent to you.</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.loginstip"> + <source>If you do not know your @@PRODUCT_NAME@@ login, please enter your email address below and your @@PRODUCT_NAME@@ login will be sent to you.</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.passwordbutton"> + <source>Send Password</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.loginbutton"> + <source>Send Login(s)</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.emailinput"> + <source>Email Address:</source> + </trans-unit> + <trans-unit id="help.credentials.jsp.logininput"> + <source>@@PRODUCT_NAME@@ Login:</source> + </trans-unit> + </group> </body> </file> </xliff> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml index 63f6544a..d83b434 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml @@ -358,6 +358,63 @@ until your certificate is renewed.</source> <context context-type="paramnotes">{0} - Hostname of the @@PRODUCT_NAME@@ Whose Cert has Expired: highwind.devel.redhat.com </context> </context-group> </trans-unit> + <trans-unit id="email.forgotten.password"> + <source> +[ This is an automated email sent to {0} at your request. ] + +Your @@PRODUCT_NAME@@ password has been reset. To sign in, go to: + +https://{1}/ + +And use the following username and password: + +Username: {2} +Password: {3} + +Once you have logged in, you may then change your password. + +If you continue to have difficulties logging in, please contact +your @@PRODUCT_NAME@@ administrator for further assistance. + +Thank you for using @@PRODUCT_NAME@@. + </source> + <context-group name="ctx"> + <context context-type="sourcefile">ForgotCredentials</context> + <context context-type="paramnotes"> + {0} - Email address + {1} - Hostname of the @@PRODUCT_NAME@@</context> + {2} - Username + {3} - Password + </context-group> + </trans-unit> + <trans-unit id="email.forgotten.logins"> + <source> +[ This is an automated email sent to {0} at your request. ] + +You have requested a list of all @@PRODUCT_NAME@@ logins associated +with the email address {0}. + +Existing login(s): + +{1} +You may reset the passwords for any of the above @@PRODUCT_NAME@@ logins at: + + https://{2}/rhn/help/ForgotCredentials.do + +If you continue to have difficulties logging in, please contact +your @@PRODUCT_NAME@@ administrator for further assistance. +If you did not request this email be sent, please disregard this message. + +Thank you for using @@PRODUCT_NAME@@. + </source> + <context-group name="ctx"> + <context context-type="sourcefile">ForgotCredentials</context> + <context context-type="paramnotes"> + {0} - Email address + {1} - Existing logins + {2} - Hostname of the @@PRODUCT_NAME@@</context> + </context-group> + </trans-unit> </body> </file> </xliff> commit 0eb59408b3dec55abb480d3c251ed2acdb09decc Author: Jan Dobes <jdobes(a)redhat.com> Date: Mon Oct 21 20:29:54 2013 +0200 1015747 - page handling diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java index 023b002..a881de6 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -687,6 +687,19 @@ public class UserFactory extends HibernateFactory { } /** + * Return a list of all Users who has the given email. + * + * @param email String to find users for. + * @return list of users. + */ + public static List<User> lookupByEmail(String email) { + Session session = HibernateFactory.getSession(); + Query query = session.getNamedQuery("User.findByEmail") + .setParameter("userEmail", email); + return query.list(); + } + + /** * Return a list of all User's who are in the given org. * * @param inOrg Org to find users for. diff --git a/java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml b/java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml index 5419cd1..887fc44 100644 --- a/java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/user/legacy/UserImpl.hbm.xml @@ -91,6 +91,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <![CDATA[from com.redhat.rhn.domain.user.legacy.UserImpl as u where u.id in (:userIds)]]> </query> + <query name="User.findByEmail"> + <![CDATA[from com.redhat.rhn.domain.user.legacy.UserImpl as u where upper(u.personalInfo.email) = upper(:userEmail)]]> + </query> + <query name="User.findAllUsersByOrg"> <![CDATA[from com.redhat.rhn.domain.user.legacy.UserImpl as u where org_id = :org_id]]> </query> diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/ForgotCredentialsAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/ForgotCredentialsAction.java new file mode 100644 index 0000000..31f44ed --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/help/ForgotCredentialsAction.java @@ -0,0 +1,258 @@ +/** + * Copyright (c) 2009--2012 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.help; + +import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.hibernate.LookupException; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.messaging.Mail; +import com.redhat.rhn.common.messaging.SmtpMail; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.user.UserFactory; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; + +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + + +/** + * ForgotCredentialsAction + * @version $Rev$ + */ +public class ForgotCredentialsAction extends RhnAction { + private static Logger log = Logger.getLogger(ForgotCredentialsAction.class); + + private static final long PASSWORD_REQUEST_TIMEOUT = 60; + private static final long LOGINS_REQUEST_TIMEOUT = 300; + + /** {@inheritDoc} */ + @Override + public ActionForward execute(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, HttpServletResponse response) { + + DynaActionForm form = (DynaActionForm)formIn; + + if (!isSubmitted(form)) { + return getStrutsDelegate().forwardParams( + mapping.findForward(RhnHelper.DEFAULT_FORWARD), + request.getParameterMap()); + } + + ActionMessages msgs = new ActionMessages(); + ActionErrors errors = new ActionErrors(); + + RequestContext ctx = new RequestContext(request); + Map forwardParams = makeParamMap(request); + // For saving previous request times + HttpSession session = request.getSession(); + + String email = form.getString("email"); + String login = form.getString("username"); + + if (ctx.hasParam("password_button")) { + newPassword(login, email, errors, msgs, session); + } + else if (ctx.hasParam("login_button")) { + lookupLogins(email, errors, msgs, session); + } + + if (!errors.isEmpty()) { + addErrors(request, errors); + return getStrutsDelegate().forwardParams( + mapping.findForward(RhnHelper.DEFAULT_FORWARD), + forwardParams); + } + + saveMessages(request, msgs); + return getStrutsDelegate().forwardParams( + mapping.findForward("success"), + forwardParams); + } + + private void newPassword(String login, String email, + ActionErrors errors, ActionMessages msgs, HttpSession session) { + + // Check if time elapsed from last request + if (!hasTimeElapsed(session, "password", login, PASSWORD_REQUEST_TIMEOUT)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.rerequest", + PASSWORD_REQUEST_TIMEOUT)); + return; + } + + try { + User foundUser = UserFactory.lookupByLogin(login); + // Check if email and login agrees + if (foundUser.getEmail().toUpperCase().equals( + email.toUpperCase())) { + String newPw = StringUtil.makeRandomPassword(12); + foundUser.setPassword(newPw); + UserFactory.save(foundUser); + + String emailBody = setupEmailBody("email.forgotten.password", + email, ConfigDefaults.get().getHostname(), login, newPw); + sendEmail(email, LocalizationService.getInstance(). + getMessage("help.credentials.jsp.passwordreset"), emailBody); + + // Save time and login to session + saveRequestTime(session, "password", login); + + msgs.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.passwordsent", email)); + } + else { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.invalidemail")); + } + } + catch (LookupException e) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.invalidlogin")); + } + } + + private void lookupLogins(String email, + ActionErrors errors, ActionMessages msgs, HttpSession session) { + + // Check if time elapsed from last request + if (!hasTimeElapsed(session, "logins", email, LOGINS_REQUEST_TIMEOUT)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.rerequest", + LOGINS_REQUEST_TIMEOUT)); + return; + } + + List<User> users = UserFactory.lookupByEmail(email); + + if (!users.isEmpty()) { + StringBuilder logins = new StringBuilder(); + + for (User usr : users) { + logins.append(usr.getLogin() + "\n"); + } + + String emailBody = setupEmailBody("email.forgotten.logins", + email, logins.toString(), ConfigDefaults.get().getHostname()); + sendEmail(email, LocalizationService.getInstance(). + getMessage("help.credentials.jsp.logininfo"), emailBody); + + // Save time and email to session + saveRequestTime(session, "logins", email); + + msgs.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.loginssent", email)); + } + else { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("help.credentials.nologins")); + } + } + + private void sendEmail(String recipient, + String subject, String body) { + + Mail mail = new SmtpMail(); + mail.setHeader("X-RHN-Info", + "Requested " + subject + " for " + recipient); + mail.setRecipient(recipient); + mail.setSubject(Config.get().getString("web.product_name") + + " " + subject); + mail.setBody(body); + log.debug("Sending mail message:\n" + mail.toString()); + try { + mail.send(); + } + catch (Exception e) { + log.error("Exception while sending email: "); + log.error(e.getMessage(), e); + } + } + + /** + * Get template, enter args there and return result. + * @param template name of template + * @param args args to be in template + * @return complete body, args in template + */ + private String setupEmailBody(String template, Object... args) { + // Build email body from template + LocalizationService ls = LocalizationService.getInstance(); + String body = ls.getMessage(template, args); + return body; + } + + /** + * Method for simple checking if time from last request has elapsed. + * Like it was in old perl page. + * @param session http session + * @param type string to name record in session + * @param user identification of last request author + * @param timeout time in seconds + * @return if time has elapsed + */ + private boolean hasTimeElapsed(HttpSession session, String type, + String user, long timeout) { + + // Save time and request author/login + Long prevRequest = (Long) session.getAttribute( + "previous_" + type + "_request"); + String prevRequestUser = (String) session.getAttribute( + "previous_" + type + "_request_user"); + Long now = new Date().getTime(); + + // Time has not elapsed for last user + if (prevRequest != null && + ((now - prevRequest) < timeout * 1000) && + (user.toUpperCase().equals(prevRequestUser))) { + log.debug("Unsuccesful try to request email for " + user); + return false; + } + + return true; + } + + /** + * Actualize record of time and user in session. + * @param session http session + * @param type string to name record in session + * @param user identification of last request author + */ + private void saveRequestTime(HttpSession session, String type, + String user) { + + session.setAttribute("previous_" + type + "_request", + new Date().getTime()); + session.setAttribute("previous_" + type + "_request_user", + user.toUpperCase()); + } +} commit 2f1ff50d49467bea4a8a27688100d6341156a675 Author: Jan Dobes <jdobes(a)redhat.com> Date: Thu Oct 17 09:13:59 2013 +0200 1015747 - new jsp page + nav stuff diff --git a/java/code/webapp/WEB-INF/nav/sitenav.xml b/java/code/webapp/WEB-INF/nav/sitenav.xml index 88a2aa3..4504a21 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav.xml @@ -8,7 +8,7 @@ <rhn-tab name="About Spacewalk" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" > <rhn-tab name="About Spacewalk" url="/help/about.pxt" /> <rhn-tab name="Help Desk" url="/rhn/help/index.do" /> - <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" /> + <rhn-tab name="Lookup Login/Password" url="/rhn/help/ForgotCredentials.do" /> <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes"> <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory> </rhn-tab> diff --git a/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp b/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp new file mode 100644 index 0000000..c33d8dd --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp @@ -0,0 +1,70 @@ +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> + +<html:xhtml/> +<html> +<head> +<script type="text/javascript" src="/javascript/highlander.js"></script> +</head> +<body> + <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="lookup" + helpUrl=""> + <bean:message key="help.credentials.jsp.logininfo"/> + </rhn:toolbar> + + <h2><bean:message key="help.credentials.jsp.passwordreset"/></h2> + + <p><bean:message key="help.credentials.jsp.passwordtip"/></p> + + <html:form action="/help/ForgotCredentials.do"> + <rhn:csrf /> + <table class="details"> + <tr><th><bean:message key="help.credentials.jsp.logininput"/></th> + <td> + <html:text property="username" name="username" value="${username}" /> + </td> + </tr> + <tr><th><bean:message key="help.credentials.jsp.emailinput"/></th> + <td> + <html:text property="email" name="email" value="${email}" /> + </td> + </tr> + </table> + <div align="right"> + <hr /> + <html:submit property="password_button"> + <bean:message key="help.credentials.jsp.passwordbutton"/> + </html:submit> + </div> + + <input type="hidden" name="submitted" value="true" /> + </html:form> + + <h2><bean:message key="help.credentials.jsp.logininfo"/></h2> + + <p><bean:message key="help.credentials.jsp.loginstip"/></p> + + <html:form action="/help/ForgotCredentials.do"> + <rhn:csrf /> + <table class="details"> + <tr><th><bean:message key="help.credentials.jsp.emailinput"/></th> + <td> + <html:text property="email" name="email" value="${email}" /> + </td> + </tr> + </table> + <div align="right"> + <hr /> + <html:submit property="login_button"> + <bean:message key="help.credentials.jsp.loginbutton"/> + </html:submit> + </div> + + <input type="hidden" name="submitted" value="true" /> + </html:form> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index f8a68b3..babc41a 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1302,6 +1302,13 @@ <form-property name="date_am_pm" type="java.lang.Integer"/> </form-bean> + <form-bean name="forgotCredentialsForm" + type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm"> + <form-property name="username" type="java.lang.String" /> + <form-property name="email" type="java.lang.String" /> + <form-property name="submitted" type="java.lang.Boolean" /> + </form-bean> + </form-beans> <global-exceptions> @@ -8088,6 +8095,18 @@ path="/WEB-INF/pages/common/errors/badcsvaction.jsp"/> </action> + <action path="/help/ForgotCredentials" + scope="request" + name="forgotCredentialsForm" + input="/WEB-INF/pages/help/forgotcredentials.jsp" + type="com.redhat.rhn.frontend.action.help.ForgotCredentialsAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <forward name="default" + path="/WEB-INF/pages/help/forgotcredentials.jsp"/> + <forward name="success" + path="/help/ForgotCredentials.do" redirect="true"/> + </action> + <action path="/help/Search" scope="request" name="docsSearchForm" diff --git a/web/include/nav/sitenav.xml b/web/include/nav/sitenav.xml index 9775219..8f8cf41 100644 --- a/web/include/nav/sitenav.xml +++ b/web/include/nav/sitenav.xml @@ -8,7 +8,7 @@ <rhn-tab name="About" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" > <rhn-tab name="About" url="/help/about.pxt" /> <rhn-tab name="Help Desk" url="/rhn/help/index.do" /> - <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" /> + <rhn-tab name="Lookup Login/Password" url="/rhn/help/ForgotCredentials.do" /> <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes"> <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory> </rhn-tab>

1 0

Changes to 'refs/tags/spacewalk-java-2.1.60-1'
by Michael Mraka 23 Oct '13

23 Oct '13

Tag 'spacewalk-java-2.1.60-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-23 15:05 +0000 Tagging package [spacewalk-java] version [2.1.60-1] in directory [java/]. Changes since spacewalk-web-2.1.27-1: Michael Mraka (3): reformated xliff file using xmllint added messages for SystemRemoteCommandAction.java Automatic commit of package [spacewalk-java] release [2.1.60-1]. --- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 311 +++++----- java/spacewalk-java.spec | 8 rel-eng/packages/spacewalk-java | 2 3 files changed, 166 insertions(+), 155 deletions(-) ---

1 0

3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 23 Oct '13

23 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 311 +++++----- java/spacewalk-java.spec | 8 rel-eng/packages/spacewalk-java | 2 3 files changed, 166 insertions(+), 155 deletions(-) New commits: commit 059b533fab4e108d48f1e2a36752935390b1aa70 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 23 17:05:55 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.60-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index ae1db6f..27eedf4 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.59 +Version: 2.1.60 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.60-1 +- added messages for SystemRemoteCommandAction.java +- reformated xliff file using xmllint +- using @@PRODUCT_NAME@@ instead of Spacewalk +- api doc fix + * Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.59-1 - add support for enhances rpm weak dependency (java) (bnc#846436) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 11be899..42bfe71 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.59-1 java/ +2.1.60-1 java/ commit afb035912a4b91aaa5ea9deee1e0dbabfecc2e43 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 23 16:58:49 2013 +0200 added messages for SystemRemoteCommandAction.java diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 56611e0..9669c0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -14858,6 +14858,18 @@ any of these revisions. Are you sure you want to do this?</source> <source>The errata below apply to one or more of your selected systems.</source> </trans-unit> </group> + <trans-unit id="ssm.operations.actionchaindetails.schedulesuccess"> + <source>Action chain "{0}" has been successfully scheduled at "{1}".</source> + </trans-unit> + <trans-unit id="ssm.operations.actionchaindetails.purgesuccess"> + <source>Action chain "{0}" has been purged.</source> + </trans-unit> + <trans-unit id="ssm.operations.actionchaindetails.scheduleerror.general"> + <source>Unable to schedule chain action.</source> + </trans-unit> + <trans-unit id="ssm.operations.actionchaindetails.scheduleerror.general.param"> + <source>Fatal error due to {0}.</source> + </trans-unit>  <group> <context-group name="ctx"> commit 215c5a846cb577babbf50eb836e7a238de405c6c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 23 16:57:37 2013 +0200 reformated xliff file using xmllint diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index ac8d527..56611e0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -1042,7 +1042,7 @@ <source>Comma (",", default)</source> </trans-unit> <trans-unit id="preferences.jsp.csvsemicolon"> - <source>Semicolon (";", compatible with Microsoft® Excel®)</source> + <source>Semicolon (";", compatible with Microsoft® Excel®)</source> </trans-unit> <trans-unit id="preferences.jsp.submitvalue"> <source>Save Preferences</source> @@ -4637,67 +4637,65 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="ssm.misc.index.syspref.preference"> <source>Preference</source> </trans-unit> - <trans-unit id="ssm.misc.reboot.header"> - <source>Reboot of the Systems</source> + <source>Reboot of the Systems</source> </trans-unit> <trans-unit id="ssm.misc.reboot.summary"> - <source>Choose the systems you need to reboot and run action immediately or schedule it for later.</source> + <source>Choose the systems you need to reboot and run action immediately or schedule it for later.</source> </trans-unit> <trans-unit id="ssm.misc.reboot.operationname"> - <source>Schedule Systems Reboot</source> + <source>Schedule Systems Reboot</source> </trans-unit> <trans-unit id="ssm.misc.reboot.message.success.default"> - <source>Systems reboot has been scheduled.</source> + <source>Systems reboot has been scheduled.</source> </trans-unit> <trans-unit id="ssm.misc.reboot.message.error.noselect"> - <source>Please select at least one system for reboot.</source> + <source>Please select at least one system for reboot.</source> </trans-unit> - - <trans-unit id="ssm.misc.lockunlock.tabtitle"> - <source>Lock/Unlock</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.header"> - <source>Lock or Unlock the Systems</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.summary"> - <source>Select system to lock or unlock their profiles. No updates will occur to locked systems until they are unlocked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.dispatch.lock"> - <source>Lock</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.dispatch.unlock"> - <source>Unlock</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.locked.success"> - <source>Out of {0} selected systems, {1} has been locked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.locked.skipped"> - <source>No systems has been locked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.locked.all.success"> - <source>All selected systems has been locked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.locked.all.skipped"> - <source>None of selected systems has been locked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.unlocked.success"> - <source>Out of {0} selected systems, {1} has been unlocked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.unlocked.skipped"> - <source>No systems has been unlocked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.success"> - <source>All selected systems has been unlocked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.skipped"> - <source>None of selected systems has been unlocked.</source> - </trans-unit> - <trans-unit id="ssm.misc.lockunlock.message.locked.missingreason"> - <source>In order to lock a system, please specify the reason.</source> - </trans-unit> - </group> - + <trans-unit id="ssm.misc.lockunlock.tabtitle"> + <source>Lock/Unlock</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.header"> + <source>Lock or Unlock the Systems</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.summary"> + <source>Select system to lock or unlock their profiles. No updates will occur to locked systems until they are unlocked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.dispatch.lock"> + <source>Lock</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.dispatch.unlock"> + <source>Unlock</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.locked.success"> + <source>Out of {0} selected systems, {1} has been locked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.locked.skipped"> + <source>No systems has been locked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.locked.all.success"> + <source>All selected systems has been locked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.locked.all.skipped"> + <source>None of selected systems has been locked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.unlocked.success"> + <source>Out of {0} selected systems, {1} has been unlocked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.unlocked.skipped"> + <source>No systems has been unlocked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.success"> + <source>All selected systems has been unlocked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.skipped"> + <source>None of selected systems has been unlocked.</source> + </trans-unit> + <trans-unit id="ssm.misc.lockunlock.message.locked.missingreason"> + <source>In order to lock a system, please specify the reason.</source> + </trans-unit> + </group> +  <trans-unit id="overview.jsp.header"> <source>System Overview</source> <context-group name="ctx"> @@ -14761,110 +14759,105 @@ any of these revisions. Are you sure you want to do this?</source> <source>Note: only child channel subscription changes and package install/remove/upgrade/verify tasks are listed.</source> </trans-unit> </group> -  <group> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/systems/ssm/kickstart/KickstartableSystems.do</context> - </context-group> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title"> - <source>Label</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.schedule.succeed"> - <source>Task "{0}" has been scheduled successfully at {1}.</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.body"> - <source>Run {0} Script on {1} {2} ({3}).</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_single"> - <source>client</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_plural"> - <source>clients</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.missing"> - <source>Username on the target system cannot be missing.</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.missing"> - <source>Group name on the target system is not specified.</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.missing"> - <source>No script has been specified.</source> - </trans-unit> - -  - <trans-unit id="ssm.overview.provisioning.remotecommand.staticname"> - <source>Remote Command on {0}.</source> - </trans-unit> - <trans-unit id="ssm.overview.provisioning.remotecommand.succeed"> - <source>Remote Command has been <a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">scheduled successfully</a> at <strong>{2}</strong>.</source> - </trans-unit> - <trans-unit id="ssm.overview.provisioning.remotecommand.header"> - <source>Remote Command on {0}</source> - </trans-unit> - <trans-unit id=""> - <source></source> - </trans-unit> - <trans-unit id=""> - <source></source> - </trans-unit> - -  - <trans-unit id="ssm.operations.provisioning.remotecommand.header"> - <source>Schedule Remote Command</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.summary"> - <source>The following script will be scheduled to run on the systems listed below.</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.tip.header"> - <source>Tip</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.tip.text"> - <source>Type new label of the queue or select from the existing. Please note, that the schedule date above will be ignored in this case.</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.label"> - <source>Run as user (UID)</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.label"> - <source>Run as group (GID)</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.timeout.label"> - <source>Timeout (seconds)</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.lbl.label"> - <source>Command label</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.label"> - <source>Script</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.date.label"> - <source>Schedule no sooner than</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.chain_id.new"> - <source>New...</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.form.submit"> - <source>Schedule</source> - </trans-unit> - <trans-unit id="ssm.operations.provisioning.remotecommand.nosystems"> - <source>No systems within this set are available to run remote commands.</source> - </trans-unit> - <trans-unit id="stringutil.scriptcheck.error.noshelldefined"> - <source>Script does not contain shell definition.</source> - </trans-unit> - <trans-unit id="stringutil.scriptcheck.error.noscript"> - <source>Script is does not seems like doing anything.</source> - </trans-unit> - -  - <trans-unit id="ssm.patches.list.header"> - <source>Relevant Errata List</source> - </trans-unit> - <trans-unit id="ssm.patches.list.summary"> - <source>The errata below apply to one or more of your selected systems.</source> - </trans-unit> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/ssm/kickstart/KickstartableSystems.do</context> + </context-group> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title"> + <source>Label</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.schedule.succeed"> + <source>Task "{0}" has been scheduled successfully at {1}.</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.body"> + <source>Run {0} Script on {1} {2} ({3}).</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_single"> + <source>client</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_plural"> + <source>clients</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.missing"> + <source>Username on the target system cannot be missing.</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.missing"> + <source>Group name on the target system is not specified.</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.missing"> + <source>No script has been specified.</source> + </trans-unit> +  + <trans-unit id="ssm.overview.provisioning.remotecommand.staticname"> + <source>Remote Command on {0}.</source> + </trans-unit> + <trans-unit id="ssm.overview.provisioning.remotecommand.succeed"> + <source>Remote Command has been <a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">scheduled successfully</a> at <strong>{2}</strong>.</source> + </trans-unit> + <trans-unit id="ssm.overview.provisioning.remotecommand.header"> + <source>Remote Command on {0}</source> + </trans-unit> + <trans-unit id=""> + <source/> + </trans-unit> + <trans-unit id=""> + <source/> + </trans-unit> +  + <trans-unit id="ssm.operations.provisioning.remotecommand.header"> + <source>Schedule Remote Command</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.summary"> + <source>The following script will be scheduled to run on the systems listed below.</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.tip.header"> + <source>Tip</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.tip.text"> + <source>Type new label of the queue or select from the existing. Please note, that the schedule date above will be ignored in this case.</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.label"> + <source>Run as user (UID)</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.label"> + <source>Run as group (GID)</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.timeout.label"> + <source>Timeout (seconds)</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.lbl.label"> + <source>Command label</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.label"> + <source>Script</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.date.label"> + <source>Schedule no sooner than</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.chain_id.new"> + <source>New...</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.form.submit"> + <source>Schedule</source> + </trans-unit> + <trans-unit id="ssm.operations.provisioning.remotecommand.nosystems"> + <source>No systems within this set are available to run remote commands.</source> + </trans-unit> + <trans-unit id="stringutil.scriptcheck.error.noshelldefined"> + <source>Script does not contain shell definition.</source> + </trans-unit> + <trans-unit id="stringutil.scriptcheck.error.noscript"> + <source>Script is does not seems like doing anything.</source> + </trans-unit> +  + <trans-unit id="ssm.patches.list.header"> + <source>Relevant Errata List</source> + </trans-unit> + <trans-unit id="ssm.patches.list.summary"> + <source>The errata below apply to one or more of your selected systems.</source> + </trans-unit> </group> -  <group> <context-group name="ctx">

1 0

Changes to 'refs/tags/spacewalk-web-2.1.27-1'
by Michael Mraka 23 Oct '13

23 Oct '13

Tag 'spacewalk-web-2.1.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-23 12:36 +0000 Tagging package [spacewalk-web] version [2.1.27-1] in directory [web/]. Changes since spacewalk-schema-2.1.22-1: Michael Mraka (2): report package arch in Event History Automatic commit of package [spacewalk-web] release [2.1.27-1]. Stephen Herr (1): api doc fix Tomas Kasparek (1): using @@PRODUCT_NAME@@ instead of Spacewalk --- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 6 - java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 5 - rel-eng/packages/spacewalk-web | 2 web/modules/rhn/RHN/DB/Server.pm | 32 ++++++++-- web/modules/rhn/RHN/Server.pm | 16 ++--- web/spacewalk-web.spec | 5 + 16 files changed, 75 insertions(+), 51 deletions(-) ---

1 0

2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka 23 Oct '13

23 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/modules/rhn/RHN/DB/Server.pm | 32 +++++++++++++++++++++++++++----- web/modules/rhn/RHN/Server.pm | 16 ++++++++-------- web/spacewalk-web.spec | 5 ++++- 4 files changed, 40 insertions(+), 15 deletions(-) New commits: commit 178f674f035557253c65e43e7b7fef482acea2f7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 23 14:36:30 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.27-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 58851b9..7d05402 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.26-1 web/ +2.1.27-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 176de76..4dbb812 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.26 +Version: 2.1.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -271,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1 +- report package arch in Event History + * Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 - add support for enhances rpm weak dependency (web) (bnc#846436) - 1020497 - provide a way to order kickstart scripts commit b6430c1edf76b42219c689d1dd056e0f2cd1078e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 23 13:59:39 2013 +0200 report package arch in Event History diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 91ca497..8d08737 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -600,15 +600,22 @@ sub server_event_package_action { SELECT PN.name || CASE WHEN PE.id IS NULL THEN '' - ELSE '-' || evr_t_as_vre_simple(PE.evr) END - AS NVRE, + ELSE '-' || evr_t_as_vre_simple(PE.evr) END || + CASE + WHEN AP.package_arch_id is NULL THEN '' + ELSE '.' || ARCH.label END + AS NVREA, AP.id AS ACTION_PACKAGE_ID, PN.id || '|' || PE.id AS id_combo, AP.package_arch_id FROM rhnPackageName PN, - rhnActionPackage AP LEFT OUTER JOIN + rhnActionPackage AP + LEFT OUTER JOIN rhnPackageEVR PE ON AP.evr_id = PE.id + LEFT OUTER JOIN + rhnPackageArch ARCH + ON ARCH.id = AP.package_arch_id WHERE AP.action_id = :aid AND AP.name_id = PN.id EOS @@ -664,13 +671,22 @@ sub server_event_delta_action { my $dbh = RHN::DB->connect; my $sth = $dbh->prepare(<<EOS); -SELECT rTO.label AS OPERATION, PN.name AS NAME, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE +SELECT rTO.label AS OPERATION, + PN.name AS NAME, + PN.name || '-' || evr_t_as_vre_simple(PE.evr) || + CASE + WHEN TP.package_arch_id is NULL THEN '' + ELSE '.' || ARCH.label END + AS NVREA FROM rhnPackageName PN, rhnPackageEVR PE, rhnTransactionOperation rTO, rhnTransactionPackage TP, rhnPackageDeltaElement PDE, rhnActionPackageDelta APD + LEFT OUTER JOIN + rhnPackageArch ARCH + ON ARCH.id = TP.package_arch_id WHERE APD.action_id = :aid AND APD.package_delta_id = PDE.package_delta_id AND PDE.transaction_package_id = TP.id @@ -1859,7 +1875,10 @@ sub event_package_results { SELECT SAPR.RESULT_CODE, SAPR.STDOUT, SAPR.STDERR, - PN.name || CASE WHEN PE.id IS NULL THEN '' ELSE '-' || evr_t_as_vre_simple(PE.evr) END AS NVRE, + PN.name || + CASE WHEN PE.id IS NULL THEN '' ELSE '-' || evr_t_as_vre_simple(PE.evr) END || + CASE WHEN AP.package_arch_id is NULL THEN '' ELSE '.' || ARCH.label END + AS NVRE, AP.id AS ACTION_PACKAGE_ID, PN.id || '|' || PE.id AS ID_COMBO, AP.package_arch_id, @@ -1871,6 +1890,9 @@ SELECT SAPR.RESULT_CODE, rhnPackageEVR PE, rhnPackageName PN, rhnActionPackage AP + LEFT OUTER JOIN + rhnPackageArch ARCH + ON ARCH.id = AP.package_arch_id WHERE AP.action_id = :aid AND AP.name_id = :name_id AND AP.evr_id = :evr_id diff --git a/web/modules/rhn/RHN/Server.pm b/web/modules/rhn/RHN/Server.pm index 08fd5a8..990d8a0 100644 --- a/web/modules/rhn/RHN/Server.pm +++ b/web/modules/rhn/RHN/Server.pm @@ -300,7 +300,7 @@ sub render { $ret->{server_event_details} .= qq{<div class="action-summary-package">$package_name to be removed:<br /><ul>\n}; for my $pkg (@{$self->{PACKAGES}}) { - $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n}; + $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n}; } $ret->{server_event_details} .= qq{</ul></div>\n}; @@ -321,7 +321,7 @@ sub render { $ret->{server_event_details} .= qq{<div class="action-summary-package">Packages to be verified:<br /><ul>\n}; for my $pkg (@{$self->{PACKAGES}}) { - $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n}; + $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n}; } $ret->{server_event_details} .= qq{</ul></div>\n}; @@ -366,7 +366,7 @@ EOQ $html .= "\n </li>"; - $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE}); + $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE}); } $ret->{server_event_details} .= qq{</ul></div>\n}; @@ -386,7 +386,7 @@ sub render { $ret->{server_event_details} .= qq{<div class="action-summary-package">Packages Scheduled:<br /><ul>\n}; for my $pkg (@{$self->{PACKAGES}}) { - $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n}; + $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n}; } $ret->{server_event_details} .= qq{</ul></div>\n}; @@ -421,7 +421,7 @@ EOQ $html .= "\n </li>"; - $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE}); + $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE}); } $ret->{server_event_details} .= qq{</ul></div>\n}; @@ -449,7 +449,7 @@ sub render { my @packages; for my $pkg (@{$self->{PACKAGES}}) { if ($packages[-1] and $packages[-1]->{NAME} eq $pkg->{NAME}) { - $packages[-1]->{OTHER_NVRE} = $pkg->{NVRE}; + $packages[-1]->{OTHER_NVREA} = $pkg->{NVREA}; $packages[-1]->{OPERATION} = 'replace'; } else { @@ -460,10 +460,10 @@ sub render { for my $pkg (@packages) { my $op = $operation_label_map{$pkg->{OPERATION}}; if ($pkg->{OPERATION} eq 'replace') { - $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVRE} with $pkg->{OTHER_NVRE}</li>\n}; + $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVREA} with $pkg->{OTHER_NVREA}</li>\n}; } else { - $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVRE}</li>\n}; + $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVREA}</li>\n}; } } $ret->{server_event_details} .= qq{</ul></div>\n};

1 0

java/code
by Tomáš Kašpárek 23 Oct '13

23 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) New commits: commit 833049f222500ba524d782794d3c4d3667128281 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Oct 23 14:30:46 2013 +0200 using @@PRODUCT_NAME@@ instead of Spacewalk diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 1c6d391..69edda6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5278,7 +5278,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ <target>Systemprofil-Aktualisierung</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Falls Sie Hardware auf Ihrem System geändert haben oder manuell RPMs installiert haben und diese Änderungen nicht in Spacewalk erscheinen, müssen Sie eine Systemprofil-Aktualisierung durchführen.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5322,7 +5322,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ <target>Systeme neustarten</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Mit Red Hat Enterprise Linux 3 oder neueren Releases erlaubt Spacewalk Ihnen den Neustart Ihrer Systeme von Remote aus.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5330,7 +5330,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ <target>Systeme sperren</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>Systeme können gesperrt oder entsperrt werden. Eine Sperrung verhindert Änderungen von der Spacewalk-Website.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index b60ae43..ac8d527 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -4551,7 +4551,7 @@ value for this entitlement, excluding the default organization's consumption.</s <source>System Profile Updates</source> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> <source>Update Hardware Profile</source> @@ -4584,13 +4584,13 @@ value for this entitlement, excluding the default organization's consumption.</s <source>Reboot Systems</source> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> <source>Lock Systems</source> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> <source>Lock System Profiles</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index bbc8416..1c8cc47 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5277,7 +5277,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta <target>Actualizaciones de perfil de sistema</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Si ha cambiado hardware en su sistema o si ha instalado RPM de forma manual, y esos cambios no aparecen en Spacewalk, necesitará programar una actualización de perfil.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5321,7 +5321,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta <target>Reiniciar sistemas</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Con Red Hat Enterprise Linux 3 o lanzamientos más recientes, Spacewalk le permite reiniciar sus sistemas de forma remota.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5329,7 +5329,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta <target>Bloquear sistemas</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>Los sistemas pueden ser bloqueados o desbloqueados. Al bloquear los sistemas no se pueden hacer cambios desde el sitio web de Spacewalk.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index aaa819a..09bcf79 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5278,7 +5278,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta <target>Mises à jour de profils système</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Si vous avez modifié le matériel sur votre système ou si vous avez installé des RPM manuellement et que ces changements n'apparaissent pas sur Spacewalk, vous devrez programmer une mise à jour du profil.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5322,7 +5322,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta <target>Redémarrer les systèmes</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Sur Red Hat Enterprise Linux 3 ou sur des versions plus récentes, Spacewalk vous permet de redémarrer vos systèmes à distance.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5330,7 +5330,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta <target>Verrouillage des systèmes</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>Les systèmes peuvent être verrouillés ou déverrouillés. Le verrouillage permet de prévenir des modifications à partir du site web Spacewalk.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index a272a79..034b5aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5277,7 +5277,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Aggiornamento profilo hardware</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Se non è stato modificato l'hardware sul sistema o se sono stati installati manualmente gli RPM e le modifiche non sono presenti su Spacewalk, allora sarà necessario programmare un aggiornamento del profilo.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5321,7 +5321,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Riavvia il sistema</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Con Red Hat Enterprise Linux 3 o versioni più recenti, Spacewalk permette di eseguire il riavvio remoto dei sistemi.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5329,7 +5329,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Blocca i sistemi</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>I sistemi possono essere bloccati o sbloccati. Il blocco impedisce le modifiche dal sito web di Spacewalk.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 4e49029..d1d61c2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5279,7 +5279,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>システムプロファイルの更新</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>システム上のハードウェアに変更を行っている場合、または手作業で RPM をインストールしている場合、Spacewalk には変更が表示されません。プロファイルの更新をスケジュールする必要があります。</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5323,7 +5323,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>システムの再起動</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Red Hat Enterprise Linux 3 またはそれ以降のリリースでは、Spacewalk を使用するとシステムをリモートで起動することができるようになります。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5331,7 +5331,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>システムのロック</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>システムのロックおよびロックの解除ができます。システムをロックすると Spacewalk Web サイトから変更されなくなります。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index a70ff43..b537e1a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5276,7 +5276,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>시스템 프로파일 업데이트 </target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>시스템의 하드웨어를 변경하거나 수동으로 RPM을 설치하는 경우 이러한 변경 사항은 Spacewalk에 표시되지 않습니다. 프로파일 업데이트를 스케줄해야 합니다.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5320,7 +5320,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>시스템 재부팅 </target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Red Hat Enterprise Linux 3 또는 이후 버전에서 Spacewalk를 사용하여 시스템을 원격으로 재부팅할 수 있습니다.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5328,7 +5328,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>시스템 잠금 </target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>시스템을 잠금 또는 잠금 해제할 수 있습니다. 시스템을 잠그면 Spacewalk 웹사이트에서 변경되지 않게 합니다.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index a913255..c501547 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5275,7 +5275,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Atualizações de Perfil de Sistema</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Se você mudou o hardware em seu sistema ou instalou manualmente RPMs, e estas mudanças não aparecem no Spacewalk, você irá precisar agendar uma atualização de perfil.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5319,7 +5319,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Reinicializar Sistemas</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Com o Red Hat Enterprise Linux 3 ou lançamentos mais novos, o Spacewal permite que você reinicialize de forma remota seus sistemas.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5327,7 +5327,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Bloquear Sistemas</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>Sistemas podem ser bloqueados ou desbloqueados. Bloqueá-los evita mudanças a partir do website Spacewalk.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index c664474..69cd388 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5274,7 +5274,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Обновления профилей систем</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>Если интерфейс Spacewalk не отражает новые устройства и установленные вручную пакеты, рекомендуется назначить обновление профиля системы.</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5318,7 +5318,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Перезагрузить системы</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>Начиная с Red Hat Enterprise Linux 3, Spacewalk позволяет удаленно перезагрузить системы.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5326,7 +5326,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Блокирование систем</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>Блокирование систем позволяет предотвратить их изменение на сайте Spacewalk.</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index d3ad636..0fdbbdd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5277,7 +5277,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>系统侧写更新</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>如果您已更改系统中的硬件，或者手动安装 RPM，且那些更改没有出现在 Spacewalk 中，则您需要调度一个侧写更新。</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5321,7 +5321,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>重启系统</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>在红帽企业版 Linux 3 或者更新的发行本中，Spacewalk 可让您远程重启系统。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5329,7 +5329,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>锁定系统</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>可以锁定或者取消锁定系统。锁定系统可防止来自 Spacewalk 网站的更改。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index b026ccb..e127c50 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5274,7 +5274,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>系統設定檔更新</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.summary"> - <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source> + <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source> <target>若您更改了您系統上的硬體，或是手動式安裝了 RPM，並且這些變更並未出現在 Spacewalk 上的話，您將需要排程設定檔更新。</target> </trans-unit> <trans-unit id="ssm.misc.index.profileupdates.hardware"> @@ -5318,7 +5318,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>重新啟動系統</target> </trans-unit> <trans-unit id="ssm.misc.index.reboot.summary"> - <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source> + <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source> <target>當使用 Red Hat Enterprise Linux 3 或是更新發行版時，Spacewalk 能讓您遠端重新啟動系統。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.header"> @@ -5326,7 +5326,7 @@ value for this entitlement, excluding the default organization's consumption.</s <target>鎖定系統</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.summary"> - <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source> + <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source> <target>您可鎖定系統或解除其鎖定。鎖定能避免來自於 Spacewalk 網站的變更。</target> </trans-unit> <trans-unit id="ssm.misc.index.lock.lock">

1 0

java/code
by StephenHerr 22 Oct '13

22 Oct '13

java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit fbd5f0475dd3865bbbf6d941eb7e3c6988a375cc Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 22 15:53:33 2013 -0400 api doc fix diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index 4f16b34..09bd801 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -391,14 +391,13 @@ public class ProfileHandler extends BaseHandler { /** * List the pre and post scripts for a kickstart profile in the order - * they will run. + * they will run during the kickstart. * @param sessionKey key * @param label the kickstart label * @return list of kickstartScript objects * * @xmlrpc.doc List the pre and post scripts for a kickstart profile - * in the order they will run. - * profile + * in the order they will run during the kickstart. * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "ksLabel", "The label of the * kickstart")

1 0

rel-eng/packages schema/spacewalk
by Michael Mraka 22 Oct '13

22 Oct '13

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 416d698881938345fb0d9eeb45a1fb952243bd57 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 22 14:45:35 2013 +0200 Automatic commit of package [spacewalk-schema] release [2.1.22-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 258e22f..dab0968 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.21-1 schema/spacewalk/ +2.1.22-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index b94be63..bdb33a5 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.21 +Version: 2.1.22 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1 +- Regenerate the metadata for rpm enhances dependency (bnc#846436) +- add support for enhances rpm weak dependency (schema) (bnc#846436) + * Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.21-1 - 1020497 - provide a way to order kickstart scripts

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.22-1'
by Michael Mraka 22 Oct '13

22 Oct '13

Tag 'spacewalk-schema-2.1.22-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:45 +0000 Tagging package [spacewalk-schema] version [2.1.22-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-2.1.59-1: Michael Mraka (2): Automatic commit of package [spacewalk-web] release [2.1.26-1]. Automatic commit of package [spacewalk-schema] release [2.1.22-1]. --- rel-eng/packages/spacewalk-schema | 2 +- rel-eng/packages/spacewalk-web | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- web/spacewalk-web.spec | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-web-2.1.26-1'
by Michael Mraka 22 Oct '13

22 Oct '13

Tag 'spacewalk-web-2.1.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:45 +0000 Tagging package [spacewalk-web] version [2.1.26-1] in directory [web/]. Changes since spacewalk-java-2.1.59-1: Michael Mraka (1): Automatic commit of package [spacewalk-web] release [2.1.26-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-java-2.1.59-1'
by Michael Mraka 22 Oct '13

22 Oct '13

Tag 'spacewalk-java-2.1.59-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:44 +0000 Tagging package [spacewalk-java] version [2.1.59-1] in directory [java/]. Changes since spacewalk-backend-2.1.32-1: Michael Mraka (1): Automatic commit of package [spacewalk-java] release [2.1.59-1]. --- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Michael Mraka 22 Oct '13

22 Oct '13

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) New commits: commit 7770d922196717a969ab384687465d155315e8c2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 22 14:45:10 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.26-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index c875299..58851b9 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.25-1 web/ +2.1.26-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index ca32265..176de76 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.25 +Version: 2.1.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -271,6 +271,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 +- add support for enhances rpm weak dependency (web) (bnc#846436) +- 1020497 - provide a way to order kickstart scripts + * Tue Oct 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1 - 1018194 - convert empty string to NULL commit 1a1d717f480c224226fe8ca0ec3192cc2f5fcc0e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 22 14:44:50 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.59-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index c9a63ad..ae1db6f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.58 +Version: 2.1.59 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.59-1 +- add support for enhances rpm weak dependency (java) (bnc#846436) + * Fri Oct 18 2013 Stephen Herr <sherr(a)redhat.com> 2.1.58-1 - 1020497 - fixing a bug and adding a unit test for ordering kickstarts - Cobbler tests: added missing return diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index a352366..11be899 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.58-1 java/ +2.1.59-1 java/

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.32-1'
by Michael Mraka 22 Oct '13

22 Oct '13

Tag 'spacewalk-backend-2.1.32-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:44 +0000 Tagging package [spacewalk-backend] version [2.1.32-1] in directory [backend/]. Changes since spacewalk-backend-2.1.31-1: Michael Calmer (5): add support for enhances rpm weak dependencies (backend) (bnc#846436) add support for enhances rpm weak dependency (java) (bnc#846436) add support for enhances rpm weak dependency (web) (bnc#846436) add support for enhances rpm weak dependency (schema) (bnc#846436) Regenerate the metadata for rpm enhances dependency (bnc#846436) Michael Mraka (2): fixed table alias Automatic commit of package [spacewalk-backend] release [2.1.32-1]. --- backend/satellite_tools/exporter/exportLib.py | 2 backend/satellite_tools/spacewalk-remove-channel | 1 backend/satellite_tools/xmlSource.py | 5 + backend/server/importlib/backend.py | 1 backend/server/importlib/backendOracle.py | 10 ++ backend/server/importlib/headerSource.py | 16 +++- backend/server/importlib/importLib.py | 1 backend/server/importlib/mpmSource.py | 1 backend/server/importlib/packageImport.py | 6 - backend/server/repomd/domain.py | 1 backend/server/repomd/mapper.py | 14 +++ backend/server/repomd/view.py | 4 + backend/server/rhnChannel.py | 17 ++++ backend/spacewalk-backend.spec | 6 + java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 10 ++ java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 3 rel-eng/packages/spacewalk-backend | 2 schema/spacewalk/common/tables/rhnPackageEnhances.sql | 39 ++++++++++ schema/spacewalk/common/tables/tables.deps | 1 schema/spacewalk/oracle/triggers/rhnPackageEnhances.sql | 22 +++++ schema/spacewalk/postgres/triggers/rhnPackageEnhances.sql | 27 ++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/030-rhnPackageEnhances.sql | 39 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.oracle | 22 +++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.postgresql | 27 ++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.oracle | 9 ++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql | 10 ++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/033-delete-cached-repodata.sql | 8 ++ web/html/network/software/packages/dependencies.pxt | 3 web/modules/rhn/RHN/DB/Package.pm | 27 ++++++ web/modules/sniglets/Sniglets/Packages.pm | 2 31 files changed, 329 insertions(+), 10 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 22 Oct '13

22 Oct '13

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 36e17071f902142b575cdffa6a1472af7e9accd4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 22 14:44:32 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.32-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 296a62f..ee7d78c 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.31 +Version: 2.1.32 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.32-1 +- fixed table alias +- add support for enhances rpm weak dependencies (backend) (bnc#846436) + * Mon Oct 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.31-1 - fixed pylint warnings and errors diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 2853561..41029bb 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.31-1 backend/ +2.1.32-1 backend/

1 0

6 commits - backend/satellite_tools backend/server java/code schema/spacewalk web/html web/modules
by Michael Mraka 22 Oct '13

22 Oct '13

backend/satellite_tools/exporter/exportLib.py | 2 backend/satellite_tools/spacewalk-remove-channel | 1 backend/satellite_tools/xmlSource.py | 5 + backend/server/importlib/backend.py | 1 backend/server/importlib/backendOracle.py | 10 ++ backend/server/importlib/headerSource.py | 16 +++- backend/server/importlib/importLib.py | 1 backend/server/importlib/mpmSource.py | 1 backend/server/importlib/packageImport.py | 6 - backend/server/repomd/domain.py | 1 backend/server/repomd/mapper.py | 14 +++ backend/server/repomd/view.py | 4 + backend/server/rhnChannel.py | 17 ++++ java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 10 ++ java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 3 schema/spacewalk/common/tables/rhnPackageEnhances.sql | 39 ++++++++++ schema/spacewalk/common/tables/tables.deps | 1 schema/spacewalk/oracle/triggers/rhnPackageEnhances.sql | 22 +++++ schema/spacewalk/postgres/triggers/rhnPackageEnhances.sql | 27 ++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/030-rhnPackageEnhances.sql | 39 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.oracle | 22 +++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.postgresql | 27 ++++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.oracle | 9 ++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql | 10 ++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/033-delete-cached-repodata.sql | 8 ++ web/html/network/software/packages/dependencies.pxt | 3 web/modules/rhn/RHN/DB/Package.pm | 27 ++++++ web/modules/sniglets/Sniglets/Packages.pm | 2 29 files changed, 323 insertions(+), 8 deletions(-) New commits: commit e8650f095af2d37e106fdde4d14cb2d78540112b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 22 14:34:05 2013 +0200 fixed table alias addressing ERROR: missing FROM-clause entry for table "supp" diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index f4678a4..34455d2 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1201,7 +1201,7 @@ def list_all_packages_complete_sql(channel_id): and supp.capability_id = pc.id union all select - supp.package_id, + enh.package_id, 'enhances' as capability_type, enh.capability_id, enh.sense, commit 63f14b6388526b300cdbfebb9d82d66c54521c60 Author: Michael Calmer <mc(a)suse.de> Date: Fri Oct 18 13:56:24 2013 +0200 Regenerate the metadata for rpm enhances dependency (bnc#846436) diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/033-delete-cached-repodata.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/033-delete-cached-repodata.sql new file mode 100644 index 0000000..5f290f5 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/033-delete-cached-repodata.sql @@ -0,0 +1,8 @@ +delete from rhnPackageRepodata; + +insert into rhnRepoRegenQueue (id, CHANNEL_LABEL, REASON, FORCE) +(select sequence_nextval('rhn_repo_regen_queue_id_seq'), + C.label, + 'package summary modification', + 'Y' + from rhnChannel C); commit fe9eb85f023d75451cfe2b70c267b97103e7ef08 Author: Michael Calmer <mc(a)suse.de> Date: Fri Oct 18 13:52:14 2013 +0200 add support for enhances rpm weak dependency (schema) (bnc#846436) diff --git a/schema/spacewalk/common/tables/rhnPackageEnhances.sql b/schema/spacewalk/common/tables/rhnPackageEnhances.sql new file mode 100644 index 0000000..d6787f7 --- /dev/null +++ b/schema/spacewalk/common/tables/rhnPackageEnhances.sql @@ -0,0 +1,39 @@ +-- +-- Copyright (c) 2013 Novell +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +CREATE TABLE rhnPackageEnhances +( + package_id NUMBER NOT NULL + CONSTRAINT rhn_pkg_enh_package_fk + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL + CONSTRAINT rhn_pkg_enh_capability_fk + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created timestamp with local time zone + DEFAULT (current_timestamp) NOT NULL, + modified timestamp with local time zone + DEFAULT (current_timestamp) NOT NULL +) +ENABLE ROW MOVEMENT +; + +CREATE UNIQUE INDEX rhn_pkg_enh_pid_cid_s_uq + ON rhnPackageEnhances (package_id, capability_id, sense) + TABLESPACE [[4m_tbs]]; + +CREATE INDEX rhn_pkg_enh_cid_idx + ON rhnPackageEnhances (capability_id) + NOLOGGING + TABLESPACE [[4m_tbs]]; diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps index 3594eca..1a71319 100644 --- a/schema/spacewalk/common/tables/tables.deps +++ b/schema/spacewalk/common/tables/tables.deps @@ -125,6 +125,7 @@ rhnPackageProvides :: rhnPackage rhnPackageCapability rhnPackageRequires :: rhnPackage rhnPackageCapability rhnPackageSuggests :: rhnPackage rhnPackageCapability rhnPackageSupplements :: rhnPackage rhnPackageCapability +rhnPackageEnhances :: rhnPackage rhnPackageCapability rhnPackageRecommends :: rhnPackage rhnPackageCapability rhnPackageSource :: web_customer rhnSourceRPM rhnFile rhnPackageGroup \ rhnChecksum diff --git a/schema/spacewalk/oracle/triggers/rhnPackageEnhances.sql b/schema/spacewalk/oracle/triggers/rhnPackageEnhances.sql new file mode 100644 index 0000000..765861c --- /dev/null +++ b/schema/spacewalk/oracle/triggers/rhnPackageEnhances.sql @@ -0,0 +1,22 @@ + +-- +-- Copyright (c) 2013 Novell, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +create or replace trigger +rhn_pkg_enh_mod_trig +before insert or update on rhnPackageEnhances +for each row +begin + :new.modified := current_timestamp; +end; +/ +show errors diff --git a/schema/spacewalk/postgres/triggers/rhnPackageEnhances.sql b/schema/spacewalk/postgres/triggers/rhnPackageEnhances.sql new file mode 100644 index 0000000..4890e5f --- /dev/null +++ b/schema/spacewalk/postgres/triggers/rhnPackageEnhances.sql @@ -0,0 +1,27 @@ +-- oracle equivalent source sha1 b31ae5f05f77f3e6fb83c8a7005e49e0a65424e6 +-- +-- Copyright (c) 2013 Novell, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +create or replace function rhn_pkg_enh_mod_trig_fun() returns trigger as +$$ +begin + new.modified := current_timestamp; + + return new; +end; +$$ language plpgsql; + +create trigger +rhn_pkg_enh_mod_trig +before insert or update on rhnPackageEnhances +for each row +execute procedure rhn_pkg_enh_mod_trig_fun(); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/030-rhnPackageEnhances.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/030-rhnPackageEnhances.sql new file mode 100644 index 0000000..d6787f7 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/030-rhnPackageEnhances.sql @@ -0,0 +1,39 @@ +-- +-- Copyright (c) 2013 Novell +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +CREATE TABLE rhnPackageEnhances +( + package_id NUMBER NOT NULL + CONSTRAINT rhn_pkg_enh_package_fk + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL + CONSTRAINT rhn_pkg_enh_capability_fk + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created timestamp with local time zone + DEFAULT (current_timestamp) NOT NULL, + modified timestamp with local time zone + DEFAULT (current_timestamp) NOT NULL +) +ENABLE ROW MOVEMENT +; + +CREATE UNIQUE INDEX rhn_pkg_enh_pid_cid_s_uq + ON rhnPackageEnhances (package_id, capability_id, sense) + TABLESPACE [[4m_tbs]]; + +CREATE INDEX rhn_pkg_enh_cid_idx + ON rhnPackageEnhances (capability_id) + NOLOGGING + TABLESPACE [[4m_tbs]]; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.oracle new file mode 100644 index 0000000..765861c --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.oracle @@ -0,0 +1,22 @@ + +-- +-- Copyright (c) 2013 Novell, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +create or replace trigger +rhn_pkg_enh_mod_trig +before insert or update on rhnPackageEnhances +for each row +begin + :new.modified := current_timestamp; +end; +/ +show errors diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.postgresql new file mode 100644 index 0000000..4890e5f --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/031-rhnPackageEnhances.sql.postgresql @@ -0,0 +1,27 @@ +-- oracle equivalent source sha1 b31ae5f05f77f3e6fb83c8a7005e49e0a65424e6 +-- +-- Copyright (c) 2013 Novell, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- + +create or replace function rhn_pkg_enh_mod_trig_fun() returns trigger as +$$ +begin + new.modified := current_timestamp; + + return new; +end; +$$ language plpgsql; + +create trigger +rhn_pkg_enh_mod_trig +before insert or update on rhnPackageEnhances +for each row +execute procedure rhn_pkg_enh_mod_trig_fun(); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.oracle new file mode 100644 index 0000000..6609897 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.oracle @@ -0,0 +1,9 @@ + +insert into rhnPackageEnhances (package_id, capability_id, sense) + select s.package_id, s.capability_id, s.sense + from rhnPackageSupplements s + where BITAND(s.sense, 134217728) != 134217728; +-- 134217728 == (1 << 27) STRONG FLAG in RPM + +delete from rhnPackageSupplements + where BITAND(sense, 134217728) != 134217728; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql new file mode 100644 index 0000000..d563b23 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/032-fix-supplements-enhances.sql.postgresql @@ -0,0 +1,10 @@ +-- oracle equivalent source sha1 9f3cf822ce526d1396838ceaf5fb952d37704611 + +insert into rhnPackageEnhances (package_id, capability_id, sense) + select s.package_id, s.capability_id, s.sense + from rhnPackageSupplements s + where (s.sense & 134217728) != 134217728; +-- 134217728 == (1 << 27) STRONG FLAG in RPM + +delete from rhnPackageSupplements + where (sense & 134217728) != 134217728; commit 3cdcf6a9813a67a18dc5800e6273f75913ee8629 Author: Michael Calmer <mc(a)suse.de> Date: Fri Oct 18 13:49:55 2013 +0200 add support for enhances rpm weak dependency (web) (bnc#846436) diff --git a/web/html/network/software/packages/dependencies.pxt b/web/html/network/software/packages/dependencies.pxt index 0a7464b..b3e440b 100644 --- a/web/html/network/software/packages/dependencies.pxt +++ b/web/html/network/software/packages/dependencies.pxt @@ -35,6 +35,9 @@ <h2>Supplements</h2> <p>{package_supplements}</p> + <h2>Enhances</h2> + <p>{package_enhances}</p> + </rhn-package-dependencies> </grail-canvas-template> diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm index dc58556..2726d9b 100644 --- a/web/modules/rhn/RHN/DB/Package.pm +++ b/web/modules/rhn/RHN/DB/Package.pm @@ -423,6 +423,33 @@ EOQ return @ret; } +sub enhances { + my $self = shift; + + my @ret; + my $dbh = RHN::DB->connect; + my $query; + my $sth; + + $query = <<EOQ; +SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper + FROM rhnPackageCapability C, rhnPackageEnhances P + WHERE P.package_id = ? + AND P.capability_id = C.id +ORDER BY name_upper, C.version +EOQ + + $sth = $dbh->prepare($query); + $sth->execute($self->id); + + my @columns; + while(@columns = $sth->fetchrow) { + push @ret, [ @columns ]; + } + + return @ret; +} + # don't know what tables these next 2 will need to talk to... sub obsoletes { my $self = shift; diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm index 2f5c408..105a63c 100644 --- a/web/modules/sniglets/Sniglets/Packages.pm +++ b/web/modules/sniglets/Sniglets/Packages.pm @@ -94,7 +94,7 @@ sub package_dependencies { $package = RHN::Package->lookup(-id => $pid); $pxt->pnotes(package_name => $package->nvre); - foreach my $dependency (qw/requires provides obsoletes conflicts recommends suggests supplements/) { + foreach my $dependency (qw/requires provides obsoletes conflicts recommends suggests supplements enhances/) { my @list = $package->$dependency(); my $dep_list; foreach my $dep (@list) { commit 755dff25f8931fe216aca6cf5ed42de568ed0676 Author: Michael Calmer <mc(a)suse.de> Date: Fri Oct 18 13:49:02 2013 +0200 add support for enhances rpm weak dependency (java) (bnc#846436) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml index c73ad00..a55bd09 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -682,6 +682,16 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id </query> </mode> +<mode name="repomdgenerator_capability_enhances" + class="com.redhat.rhn.frontend.dto.PackageCapabilityDto"> + <query params="package_id"> + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageEnhances pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id = pkgcap.id + AND pkgp.package_id = :package_id + </query> +</mode> + <mode name="repomdgenerator_package_changelog" class="com.redhat.rhn.frontend.dto.PackageChangelogDto"> <query params="package_id"> diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java b/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java index ba47c52..fada40a 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java @@ -157,6 +157,9 @@ public class TaskConstants { public static final String TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUPPLEMENTS = "repomdgenerator_capability_supplements"; + public static final String TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_ENHANCES = + "repomdgenerator_capability_enhances"; + public static final String TASK_QUERY_REPOMD_GENERATOR_PACKAGE_CHANGELOG = "repomdgenerator_package_changelog"; diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index 20f7f73..74a9134 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -263,6 +263,9 @@ public class PrimaryXmlWriter extends RepomdWriter { addPackageDepData( TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUPPLEMENTS, pkgDto.getId(), "supplements", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_ENHANCES, + pkgDto.getId(), "enhances", localHandler); } /** commit 93e0fef99d3a11c2461296248dbbe996be797aaa Author: Michael Calmer <mc(a)suse.de> Date: Fri Oct 18 13:47:55 2013 +0200 add support for enhances rpm weak dependencies (backend) (bnc#846436) diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index 5e14af2..aeb1c08 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -839,6 +839,8 @@ class _PackageDumper(BaseRowDumper): 'rhn-package-suggests-entry'], ['rhnPackageSupplements', 'rhn-package-supplements', 'rhn-package-supplements-entry'], + ['rhnPackageEnhances', 'rhn-package-enhances', + 'rhn-package-enhances-entry'], ] for table_name, container_name, entry_name in mappings: h = rhnSQL.prepare(""" diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel index 53fd3d9..f3b5d2e 100755 --- a/backend/satellite_tools/spacewalk-remove-channel +++ b/backend/satellite_tools/spacewalk-remove-channel @@ -488,6 +488,7 @@ def _delete_rpm_group(packageIds): 'rhnPackageRecommends', 'rhnPackageSuggests', 'rhnPackageSupplements', + 'rhnPackageEnhances', 'rhnServerNeededCache', ] deleteStatement = "delete from %s where package_id = :package_id" diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py index 81fd3a5..6ce2c3d 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -603,6 +603,7 @@ class PackageItem(IncompletePackageItem): 'rhn-package-recommends' : 'recommends', 'rhn-package-suggests' : 'suggests', 'rhn-package-supplements' : 'supplements', + 'rhn-package-enhances' : 'enhances', 'rhn-package-changelog' : 'changelog', } tagMap.update(IncompletePackageItem.tagMap) @@ -686,6 +687,10 @@ class SupplementsItem(DependencyItem): item_name = 'rhn-package-supplements-entry' addItem(SupplementsItem) +class EnhancesItem(DependencyItem): + item_name = 'rhn-package-enhances-entry' +addItem(EnhancesItem) + class FileItem(BaseChecksummedItem): item_name = 'rhn-package-file' item_class = importLib.File diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index f907794..797079b 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -732,6 +732,7 @@ class Backend: 'rhnPackageRecommends': 'package_id', 'rhnPackageSuggests': 'package_id', 'rhnPackageSupplements':'package_id', + 'rhnPackageEnhances' :'package_id', 'rhnPackageFile': 'package_id', 'rhnPackageChangeLogRec': 'package_id', } diff --git a/backend/server/importlib/backendOracle.py b/backend/server/importlib/backendOracle.py index acca10f..604192c 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -100,6 +100,16 @@ class OracleBackend(Backend): attribute = 'supplements', map = { 'sense' : 'flags', }, ), + Table('rhnPackageEnhances', + fields = { + 'package_id' : DBint(), + 'capability_id' : DBint(), + 'sense' : DBint(), + }, + pk = ['package_id', 'capability_id', 'sense'], + attribute = 'enhances', + map = { 'sense' : 'flags', }, + ), Table('rhnPackageChangeLogRec', fields = { 'id' : DBint(), diff --git a/backend/server/importlib/headerSource.py b/backend/server/importlib/headerSource.py index 7933d29..fc33691 100644 --- a/backend/server/importlib/headerSource.py +++ b/backend/server/importlib/headerSource.py @@ -118,6 +118,7 @@ class rpmBinaryPackage(Package, rpmPackage): 'obsoletes' : None, 'suggests' : None, 'supplements' : None, + 'enhances' : None, 'recommends' : None, 'files' : None, 'changelog' : None, @@ -162,6 +163,7 @@ class rpmBinaryPackage(Package, rpmPackage): 'conflicts' : rpmConflicts, 'obsoletes' : rpmObsoletes, 'supplements' : rpmSupplements, + 'enhances' : rpmEnhances, 'suggests' : rpmSuggests, 'recommends' : rpmRecommends, } @@ -213,15 +215,15 @@ class rpmBinaryPackage(Package, rpmPackage): hash[k] = v[i] # RPMSENSE_STRONG(1<<27) indicate recommends; if not set it is suggests only - if tag == 'recommends' and not(hash['flags'] & (1 << 27)): + if tag in ['recommends', 'supplements'] and not(hash['flags'] & (1 << 27)): continue - if tag == 'suggests' and (hash['flags'] & (1 << 27)): + if tag in ['suggests', 'enhances'] and (hash['flags'] & (1 << 27)): continue # Create a file obj = Class() # Fedora 10+ rpms have duplicate provides deps, # Lets clean em up before db inserts. - if tag in ['requires', 'provides', 'obsoletes', 'conflicts', 'recommends', 'suggests', 'supplements']: + if tag in ['requires', 'provides', 'obsoletes', 'conflicts', 'recommends', 'suggests', 'supplements', 'enhances']: if not len(hash['name']): continue dep_nv = (hash['name'], hash['version'], hash['flags']) @@ -352,6 +354,14 @@ class rpmSupplements(Dependency): 'flags' : 1161, #'enhancesflags', } +class rpmEnhances(Dependency): + # More mappings + tagMap = { + 'name' : 1159, #'enhancesname', + 'version' : 1160, #'enhancesversion', + 'flags' : 1161, #'enhancesflags', + } + class rpmConflicts(Dependency): # More mappings tagMap = { diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py index 0eb497a..1a8e2eb 100644 --- a/backend/server/importlib/importLib.py +++ b/backend/server/importlib/importLib.py @@ -374,6 +374,7 @@ class Package(IncompletePackage): 'obsoletes' : [Dependency], 'recommends' : [Dependency], 'supplements' : [Dependency], + 'enhances' : [Dependency], 'suggests' : [Dependency], 'changelog' : [ChangeLog], 'channels' : [StringType], diff --git a/backend/server/importlib/mpmSource.py b/backend/server/importlib/mpmSource.py index 8717f0c..17f57d6 100644 --- a/backend/server/importlib/mpmSource.py +++ b/backend/server/importlib/mpmSource.py @@ -127,6 +127,7 @@ class mpmBinaryPackage(headerSource.rpmBinaryPackage): 'obsoletes' : headerSource.rpmObsoletes, 'recommends': headerSource.rpmRecommends, 'supplements': headerSource.rpmSupplements, + 'enhances' : headerSource.rpmEnhances, 'suggests' : headerSource.rpmSuggests, } diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py index df4e995..34cb33a 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -226,14 +226,14 @@ class PackageImport(ChannelPackageSubscription): # XXX package['copyright'] = self._fix_encoding(package['license']) - for tag in ('recommends', 'suggests', 'supplements'): + for tag in ('recommends', 'suggests', 'supplements', 'enhances'): if not package.has_key(tag) or type(package[tag]) != type([]): # older spacewalk server do not export weak deps. # lets create an empty list package[tag] = [] # Creates all the data structures needed to insert capabilities - for tag in ('provides', 'requires', 'conflicts', 'obsoletes', 'recommends', 'suggests', 'supplements'): + for tag in ('provides', 'requires', 'conflicts', 'obsoletes', 'recommends', 'suggests', 'supplements', 'enhances'): depList = package[tag] if type(depList) != type([]): sys.stderr.write("!!! packageImport.PackageImport._processPackage: " @@ -369,7 +369,7 @@ class PackageImport(ChannelPackageSubscription): package['checksum_id'] = self.checksums[(package['checksum_type'], package['checksum'])] # Postprocess the dependency information - for tag in ('provides', 'requires', 'conflicts', 'obsoletes', 'files', 'recommends', 'suggests', 'supplements'): + for tag in ('provides', 'requires', 'conflicts', 'obsoletes', 'files', 'recommends', 'suggests', 'supplements', 'enhances'): for entry in package[tag]: nv = entry['capability'] entry['capability_id'] = self.capabilities[nv] diff --git a/backend/server/repomd/domain.py b/backend/server/repomd/domain.py index 7c5813b..c22f230 100644 --- a/backend/server/repomd/domain.py +++ b/backend/server/repomd/domain.py @@ -71,6 +71,7 @@ class Package: self.conflicts = [] self.obsoletes = [] self.supplements = [] + self.enhances = [] self.suggests = [] self.recommends = [] diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py index b79386d..951b482 100644 --- a/backend/server/repomd/mapper.py +++ b/backend/server/repomd/mapper.py @@ -297,6 +297,18 @@ class SqlPackageMapper: and supp.capability_id = pc.id union all select + 'enhances', + enh.sense, + pc.name, + pc.version + from + rhnPackageCapability pc, + rhnPackageEnhances enh + where + enh.package_id = :package_id + and enh.capability_id = pc.id + union all + select 'suggests', sugg.sense, pc.name, @@ -447,6 +459,8 @@ class SqlPackageMapper: package.recommends.append(dep) elif item[0] == "supplements": package.supplements.append(dep) + elif item[0] == "enhances": + package.enhances.append(dep) elif item[0] == "suggests": package.suggests.append(dep) else: diff --git a/backend/server/repomd/view.py b/backend/server/repomd/view.py index 18c5b85..68ba1de 100644 --- a/backend/server/repomd/view.py +++ b/backend/server/repomd/view.py @@ -159,6 +159,10 @@ class PrimaryView(object): output.extend(self._get_deps(package.supplements)) output.append(" </rpm:supplements>") + output.append(" <rpm:enhances>") + output.extend(self._get_deps(package.enhances)) + output.append(" </rpm:enhances>") + output.append(" <rpm:conflicts>") output.extend(self._get_deps(package.conflicts)) output.append(" </rpm:conflicts>") diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 2f2dfa8..f4678a4 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1201,6 +1201,20 @@ def list_all_packages_complete_sql(channel_id): and supp.capability_id = pc.id union all select + supp.package_id, + 'enhances' as capability_type, + enh.capability_id, + enh.sense, + pc.name, + pc.version + from + rhnPackageEnhances enh, + rhnPackageCapability pc + where + enh.package_id = :package_id + and enh.capability_id = pc.id + union all + select pcon.package_id, 'conflicts' as capability_type, pcon.capability_id, @@ -1245,6 +1259,7 @@ def list_all_packages_complete_sql(channel_id): pkgi['recommends'] = [] pkgi['suggests'] = [] pkgi['supplements'] = [] + pkgi['enhances'] = [] g.execute(package_id = pkgi["id"]) deps = g.fetchall_dict() or [] for item in deps: @@ -1262,7 +1277,7 @@ def list_all_packages_complete_sql(channel_id): # process the results ret = map(lambda a: (a["name"], a["version"], a["release"], a["epoch"], a["arch"], a["package_size"], a['provides'], - a['requires'], a['conflicts'], a['obsoletes'], a['recommends'], a['suggests'], a['supplements']), + a['requires'], a['conflicts'], a['obsoletes'], a['recommends'], a['suggests'], a['supplements'], a['enhances']), __stringify(ret)) return ret

1 0

Branch 'bootstrap-css' - 68 commits - branding/css branding/fonts branding/spacewalk-branding.spec branding/styles branding/templates java/code web/html web/include web/modules
by Silvio Moioli 21 Oct '13

21 Oct '13

branding/css/mixins.less | 6 branding/css/roboto.less | 14 branding/css/spacewalk.less | 600 +++++---- branding/css/tables.less | 16 branding/css/theme.less | 64 + branding/css/variables.less | 5 branding/fonts/Roboto/LICENSE.txt | 202 +++ branding/fonts/Roboto/Roboto-Bold.ttf |binary branding/fonts/Roboto/Roboto-Light.ttf |binary branding/spacewalk-branding.spec | 6 branding/styles/navbar_bottom.txt | 3 branding/styles/navbar_top.txt | 51 branding/templates/c.pxt | 144 +- branding/templates/footer.pxt | 17 branding/templates/header.pxt | 26 java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 53 java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java | 5 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 8 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 26 java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java | 17 java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 1 java/code/webapp/WEB-INF/decorators/layout_c.jsp | 10 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 17 java/code/webapp/WEB-INF/includes/footer.jsp | 6 java/code/webapp/WEB-INF/includes/header.jsp | 12 java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 2 java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 2 java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 2 java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 4 java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp | 2 java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 120 - java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 88 - java/code/webapp/WEB-INF/pages/activationkeys/create.jsp | 27 java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp | 94 - java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp | 67 - java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 2 java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 208 +-- java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 90 - java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 2 java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp | 74 - java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 126 -- java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp | 242 +-- java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp | 185 +-- java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 154 +- java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 119 - java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 2 java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 234 +-- java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 2 java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2 java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2 java/code/webapp/WEB-INF/pages/audit/overview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 4 java/code/webapp/WEB-INF/pages/channel/all.jsp | 2 java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp | 2 java/code/webapp/WEB-INF/pages/channel/custom.jsp | 2 java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp | 201 +-- java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 608 +++++----- java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 203 +-- java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2 java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 300 ++-- java/code/webapp/WEB-INF/pages/channel/popular.jsp | 2 java/code/webapp/WEB-INF/pages/channel/retired.jsp | 2 java/code/webapp/WEB-INF/pages/channel/shared.jsp | 2 java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 258 ++-- java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf | 37 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 152 +- java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf | 1 java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 113 + java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 4 java/code/webapp/WEB-INF/pages/common/login.jsp | 10 java/code/webapp/WEB-INF/pages/common/relogin.jsp | 10 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/credentials/delete.jsp | 2 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 4 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 4 java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keycreate.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 2 java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/list.jsp | 2 java/code/webapp/WEB-INF/pages/software/downloads/download.jsp | 2 java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 2 java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 4 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4 java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 2 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 48 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 55 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 2 web/html/javascript/channel_tree.js | 8 web/html/javascript/check_all.js | 22 web/html/javascript/less.js | 11 web/html/javascript/spacewalk-essentials.js | 84 - web/include/network/components/legends/system-list-legend.pxi | 4 web/include/network/components/status_bar/ssm.pxi | 25 web/modules/sniglets/Sniglets/HTML.pm | 23 web/modules/sniglets/Sniglets/Navi.pm | 8 web/modules/sniglets/Sniglets/Navi/Style.pm | 100 - web/modules/sniglets/Sniglets/Sets.pm | 10 273 files changed, 3234 insertions(+), 2773 deletions(-) New commits: commit 12ce0476ba547fade1cbe3819e77fd560de7fdb0 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 21 15:21:58 2013 +0200 Install only those *.css files on the first layer Omit everything else: subfolders, but especially the *.less files. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 2b7f60f..f666818 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -49,7 +49,7 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/ install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/ install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults -cp -pR css %{buildroot}/%{_var}/www/html/ +cp -p css/*.css %{buildroot}/%{_var}/www/html/ cp -pR img %{buildroot}/%{_var}/www/html/ # Appplication expects two favicon's for some reason, copy it so there's just # one in source: commit cb3d206cf8c46f6afaccb03fb2060da16ab45ed8 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 21 15:13:22 2013 +0200 Use nodejs-less to compile spacewalk.less into css diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 38a93dc..2b7f60f 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1.5.0 +BuildRequires: nodejs-less Requires: httpd %description @@ -35,6 +36,9 @@ javac java/code/src/com/redhat/rhn/branding/strings/StringPackage.java rm -f java/code/src/com/redhat/rhn/branding/strings/StringPackage.java jar -cf java-branding.jar -C java/code/src com +# Compile less into css +lessc css/spacewalk.less > css/spacewalk.css + %install rm -rf %{buildroot} install -d -m 755 %{buildroot}%{_var}/www/html commit 9182071d2917e81f171743d46f80f181076caf1f Author: cyntss <csanchez(a)suse.com> Date: Mon Oct 21 14:48:00 2013 +0200 Panels added to forms inside the Your Account section diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp index 4372532..239de14 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp @@ -11,27 +11,33 @@ imgAlt="users.jsp.imgAlt"> <bean:message key="yourchangeemail.jsp.title"/> </rhn:toolbar> - <p class="lead">${pageinstructions}</p> - <html:form action="/account/ChangeEmailSubmit" - styleClass="form-horizontal"> - <rhn:csrf /> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="channel.edit.jsp.emailaddress" />: - </label> - <div class="col-lg-6"> - <html:text property="email" - styleClass="form-control" - maxlength="${emailLength}" /> - </div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4>${pageinstructions}</h4> </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" class="btn btn-success" value="${button_label}"> - ${button_label} - </button> - </div> + <div class="panel-body"> + <html:form action="/account/ChangeEmailSubmit" + styleClass="form-horizontal"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.emailaddress" />: + </label> + <div class="col-lg-6"> + <html:text property="email" + styleClass="form-control" + maxlength="${emailLength}" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" class="btn btn-success" value="${button_label}"> + ${button_label} + </button> + </div> + </div> + </html:form> </div> - </html:form> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index d3c6ced..946e2a3 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -14,30 +14,37 @@ imgAlt="users.jsp.imgAlt"> <bean:message key="details.jsp.account_details" /> </rhn:toolbar> - <h2><bean:message key="details.jsp.personal_info" /></h2> - <p class="lead"><bean:message key="yourdetails.jsp.summary" /></p> - <html:form action="/account/UserDetailsSubmit" styleClass="form-horizontal"> - <rhn:csrf /> - <%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="created.displayname"/></label> - <div class="col-lg-6">${created}</div> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="details.jsp.personal_info" /></h4> </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="last_sign_in.displayname"/></label> - <div class="col-lg-6">${lastLoggedIn}</div> + <div class="panel-body"> + <p><bean:message key="yourdetails.jsp.summary" /></p> + <hr /> + <html:form action="/account/UserDetailsSubmit" styleClass="form-horizontal"> + <rhn:csrf /> + <%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="created.displayname"/></label> + <div class="col-lg-6">${created}</div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="last_sign_in.displayname"/></label> + <div class="col-lg-6">${lastLoggedIn}</div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" + class="btn btn-success" + value="<bean:message key="message.Update"/>" + <c:if test="${empty mailableAddress}">disabled="disabled"</c:if> > + <bean:message key="message.Update"/> + </button> + </div> + </div> + <html:hidden property="uid"/> + </html:form> </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" - class="btn btn-success" - value="<bean:message key="message.Update"/>" - <c:if test="${empty mailableAddress}">disabled="disabled"</c:if> > - <bean:message key="message.Update"/> - </button> - </div> - </div> - <html:hidden property="uid"/> - </html:form> + </div> </body> </html> commit d8f4f9ff0df31a3f9377a9d71a6a9fd143e6cc5b Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Oct 21 13:10:28 2013 +0200 TB3: Systems/Activation Keys/ ranking, deletion and packages forms diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp index aeb3852..880403e 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp @@ -5,45 +5,53 @@ <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> <html:xhtml/> <html> -<head> -<script src="/javascript/config_channel_ranks.js" type="text/javascript"></script> -</head> -<body> -<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> - <html:form method="post" - action="/activationkeys/configuration/Rank.do?tid=${param.tid}"> - <rhn:csrf /> - <h2> <img src="${cfg:channelHeaderIcon('central')}" - alt="${cfg:channelAlt('central')}"/> - <bean:message key="sdc.config.rank.jsp.header"/></h2> - <c:if test="${not empty param.wizardMode}"> - <h3><bean:message key="ssm.config.rank.jsp.step"/></h3> - <input type="hidden" name="wizardMode" value="true"/> - </c:if> - <p><bean:message key="activation-keys.config.rank.jsp.para1"/></p> - <p><bean:message key="activation-keys.config.rank.jsp.para2" - arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/></p> - <c:if test="${not empty param.wizardMode}"> - <p><span class="small-text"><bean:message key="common.config.rank.jsp.warning" - arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/></span></p> - </c:if> - <noscript> - <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> - </noscript> - <h2><bean:message key="sdc.config.rank.jsp.subscribed_channels"/></h2> - <table style="width:50%;"> - <tr> + <head> + <script src="/javascript/config_channel_ranks.js" type="text/javascript"></script> + </head> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> + <html:form method="post" + styleClass="form-horizontal" + action="/activationkeys/configuration/Rank.do?tid=${param.tid}"> + <rhn:csrf /> + <h2> + <img src="${cfg:channelHeaderIcon('central')}" alt="${cfg:channelAlt('central')}"/> + <bean:message key="sdc.config.rank.jsp.header"/> + </h2> + <c:if test="${not empty param.wizardMode}"> + <h3><bean:message key="ssm.config.rank.jsp.step"/></h3> + <input type="hidden" name="wizardMode" value="true"/> + </c:if> + <p> + <bean:message key="activation-keys.config.rank.jsp.para1"/> + </p> + <p> + <bean:message key="activation-keys.config.rank.jsp.para2" + arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/> + </p> + <c:if test="${not empty param.wizardMode}"> + <p> + <span class="small-text"> + <bean:message key="common.config.rank.jsp.warning" + arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/> + </span> + </p> + </c:if> + <noscript> + <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> + </noscript> + <h2><bean:message key="sdc.config.rank.jsp.subscribed_channels"/></h2> <%@ include file="/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf" %> - </tr> - </table> - <div align="right"> - <hr /> - <rhn:submitted/> - <html:hidden property="dispatch" value="${rhn:localize('sdc.config.rank.jsp.update')}"/> - <input type=submit name="dispatcher" - value="${rhn:localize('sdc.config.rank.jsp.update')}" - onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> - </div> - </html:form> -</body> + <div class="form-group"> + <rhn:submitted/> + <div class="col-lg-offset-3 col-lg-6"> + <html:hidden property="dispatch" value="${rhn:localize('sdc.config.rank.jsp.update')}"/> + <input type=submit name="dispatcher" + class="btn btn-success" + value="${rhn:localize('sdc.config.rank.jsp.update')}" + onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> + </div> + </div> + </html:form> + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp index fa44887..45807a4 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp @@ -2,55 +2,47 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<rhn:toolbar base="h1" icon="icon-key" - imgAlt="activation-keys.common.alt" - helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" - > - <bean:message key ="activation-key.jsp.delete.title"/> -</rhn:toolbar> - -<div class="page-summary"> - <p> - <bean:message key="activation-key.jsp.delete.para" arg0="/rhn/activationkeys/List.do"/> - </p> - <p> - <bean:message key="activation-key.jsp.delete.warning" /> - </p> -</div> - - -<hr/> -<table class="details"> - <tr> - <th> - <bean:message key="kickstart.activationkeys.jsp.description"/> - </th> - <td> - <c:out value="${requestScope.activationkey.note}"/> - </td> - </tr> - <tr> - <th> - <bean:message key="kickstart.activationkeys.jsp.key"/> - </th> - <td> - <c:out value="${requestScope.activationkey.key}"/> - </td> - </tr> -</table> - -<div align="right"> -<hr/> - <form action="/rhn/activationkeys/Delete.do" - id ="delete_confirm" name = "delete_confirm" method="POST"> - <input type="hidden" name="tid" value="${param.tid}"/> - <rhn:csrf /> - <input type="submit" name="dispatch" - value="${rhn:localize('activation-key.jsp.delete-key')}" align="top" /> - <rhn:submitted/> - </form> -</div> -</body> +<html:html> + <body> + <rhn:toolbar base="h1" icon="icon-key" + imgAlt="activation-keys.common.alt" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" + > + <bean:message key ="activation-key.jsp.delete.title"/> + </rhn:toolbar> + <p><bean:message key="activation-key.jsp.delete.para" arg0="/rhn/activationkeys/List.do"/></p> + <p><bean:message key="activation-key.jsp.delete.warning" /></p> + <form action="/rhn/activationkeys/Delete.do" class="form-horizontal" + id ="delete_confirm" name = "delete_confirm" method="POST"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstart.activationkeys.jsp.description"/>: + </label> + <div class="col-lg-6"> + <div class="form-control"> + <c:out value="${requestScope.activationkey.note}"/> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstart.activationkeys.jsp.key"/> + </label> + <div class="col-lg-6"> + <div class="form-control"> + <c:out value="${requestScope.activationkey.key}"/> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <input type="hidden" name="tid" value="${param.tid}"/> + <rhn:csrf /> + <input type="submit" name="dispatch" class="btn btn-success" + value="${rhn:localize('activation-key.jsp.delete-key')}" align="top" /> + <rhn:submitted/> + </div> + </div> + </form> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp index 03a429e..f3f79e9 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp @@ -4,43 +4,32 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> - -<head> - <meta name="name" value="activationkeys.jsp.header" /> -</head> - -<body> -<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> - -<html:form action="/activationkeys/packages/Packages"> - - <rhn:csrf /> - <div class="page-summary"> - <p> - <bean:message key="activation-key.packages.jsp.summary"/> - </p> - <h2><bean:message key="activation-key.packages.jsp.enter-names"/></h2> - - <table class="details"> - <tr> - <td><html:textarea property="packages" rows="8" cols="64" /> - </tr> - </table> - - <div align="right"> - <rhn:submitted/> - <hr/> - <input type="submit" name ="dispatch" value='<bean:message key="keyedit.jsp.submit"/>'/> - </div> - - <html:hidden property="submitted" value="true" /> - <c:if test='${not empty param.tid}'> - <html:hidden property="tid" value="${param.tid}" /> - </c:if> - - </div> -</html:form> - -</body> + <head> + <meta name="name" value="activationkeys.jsp.header" /> + </head> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> + <html:form action="/activationkeys/packages/Packages" styleClass="form-horizontal"> + <rhn:csrf /> + <p><bean:message key="activation-key.packages.jsp.summary"/></p> + <h2><bean:message key="activation-key.packages.jsp.enter-names"/></h2> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:textarea styleClass="form-control" + property="packages" rows="8" cols="64" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <rhn:submitted/> + <input class="btn btn-success" type="submit" + name ="dispatch" value='<bean:message key="keyedit.jsp.submit"/>'/> + </div> + </div> + <html:hidden property="submitted" value="true" /> + <c:if test='${not empty param.tid}'> + <html:hidden property="tid" value="${param.tid}" /> + </c:if> + </html:form> + </body> </html> - commit 4ac405e42b61c0f656d01abc4d7e8a3c67a764c5 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Oct 21 11:52:45 2013 +0200 ssmToolbar hidden when the page loads diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 6c1a8a1..c739c2a 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -276,6 +276,7 @@ header { #bar .spacewalk-bar { padding: .5em 1.2em; text-align: right; + display: none; } #bar .spacewalk-bar .badge { margin-right: .5em commit 5670b9b145a8a58d3519637e33ce5c9a4139031d Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Oct 18 17:24:57 2013 +0200 Generate another div element inside the filter-input diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java index a714059..b50d77f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java @@ -317,8 +317,10 @@ public class UnpagedListDisplayTag extends BodyTagSupport { private void renderFilterBox(JspWriter out) throws IOException { LocalizationService ls = LocalizationService.getInstance(); - HtmlTag tag = new HtmlTag("div"); - tag.setAttribute("class", "filter-input"); + HtmlTag tagFilterInput = new HtmlTag("div"); + tagFilterInput.setAttribute("class", "filter-input"); + HtmlTag tagInputGroup = new HtmlTag("div"); + tagInputGroup.setAttribute("class", "input-group input-group-sm"); StringBuffer buf = new StringBuffer(); HtmlTag input = new HtmlTag("input"); @@ -344,12 +346,12 @@ public class UnpagedListDisplayTag extends BodyTagSupport { * TODO: This is BAD. Makes the code specific to the Chanel Tree view * Should be fixed in future versions */ - tag.addBody(ls.getMessage("message.filterby", ls.getMessage(filterBy)) + - buf.toString()); - + tagInputGroup.addBody(ls.getMessage("message.filterby", ls.getMessage(filterBy)) + + buf.toString()); + tagFilterInput.addBody(tagInputGroup); if (type.equals("treeview")) { - tag.addBody("<div style=\"text-align: right;\">" + + tagFilterInput.addBody("<div style=\"text-align: right;\">" + "<a href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + ls.getMessage("channels.overview.showall") + "</a>  |  " + @@ -357,8 +359,7 @@ public class UnpagedListDisplayTag extends BodyTagSupport { ls.getMessage("channels.overview.hideall") + "</a></div>"); } - - out.println(tag.render()); + out.println(tagFilterInput.render()); } private String getTrElement(Object o, int row) { commit 3c8a6e11066426f1b51b1df789c144367d58ac43 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 18 17:01:51 2013 +0200 TB3: Systems/Activation keys/Child channels form diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp index 91ab962..045c075 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp @@ -4,71 +4,57 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> - -<head> - <meta name="name" value="activationkeys.jsp.header" /> -</head> - -<body> -<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> - -<html:form action="/activationkeys/channels/ChildChannels"> - <rhn:csrf /> - - <div class="page-summary"> - <p> - <bean:message key="activation-key.childchannels.jsp.summary"/> - </p> - <c:if test='${not empty baseChannel}'> - <bean:message key="activation-key.childchannels.jsp.blurb" arg0="${baseChannel}"/> - </c:if> - - <table class="details"> - <tr> - <td> - <select multiple="multiple" name="childChannels" size="20"> - <c:set var="first" scope="session" value="yes"/> - <c:forEach items="${channels}" var="channel" varStatus="loop"> - <c:choose> - <c:when test="${first == 'yes'}"> - <c:set var="first" scope="session" value="no"/> - <c:set var="last_parent" scope="session" value="${channel.parent}"/> - <c:if test="${empty baseChannel}"> - <optgroup label="${channel.parent}"> - </c:if> - </c:when> - <c:otherwise> - <c:if test="${(channel.parent != last_parent) && empty baseChannel}"> - </optgroup> - <optgroup label="${channel.parent}"> - </c:if> - </c:otherwise> - </c:choose> - <option value="${channel.id}" ${channel.s}>${channel.name}</option> - <c:set var="last_parent" scope="session" value="${channel.parent}"/> - </c:forEach> - <c:if test="${empty baseChannel}"> - </optgroup> - </c:if> - </select> - </td> - </tr> - </table> - - <div align="right"> - <rhn:submitted/> - <hr/> - <input type="submit" name ="dispatch" value='<bean:message key="keyedit.jsp.submit"/>'/> - </div> - - <html:hidden property="submitted" value="true" /> - <c:if test='${not empty param.tid}'> - <html:hidden property="tid" value="${param.tid}" /> - </c:if> - - </div> -</html:form> - -</body> + <head> + <meta name="name" value="activationkeys.jsp.header" /> + </head> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> + <html:form action="/activationkeys/channels/ChildChannels" styleClass="form-horizontal"> + <rhn:csrf /> + <p><bean:message key="activation-key.childchannels.jsp.summary"/></p> + <c:if test='${not empty baseChannel}'> + <bean:message key="activation-key.childchannels.jsp.blurb" arg0="${baseChannel}"/> + </c:if> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <select multiple="multiple" name="childChannels" size="20" styleClass="form-control"> + <c:set var="first" scope="session" value="yes"/> + <c:forEach items="${channels}" var="channel" varStatus="loop"> + <c:choose> + <c:when test="${first == 'yes'}"> + <c:set var="first" scope="session" value="no"/> + <c:set var="last_parent" scope="session" value="${channel.parent}"/> + <c:if test="${empty baseChannel}"> + <optgroup label="${channel.parent}"> + </c:if> + </c:when> + <c:otherwise> + <c:if test="${(channel.parent != last_parent) && empty baseChannel}"> + </optgroup> + <optgroup label="${channel.parent}"> + </c:if> + </c:otherwise> + </c:choose> + <option value="${channel.id}" ${channel.s}>${channel.name}</option> + <c:set var="last_parent" scope="session" value="${channel.parent}"/> + </c:forEach> + <c:if test="${empty baseChannel}"> + </optgroup> + </c:if> + </select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <rhn:submitted/> + <input type="submit" name ="dispatch" class="btn btn-success" + value='<bean:message key="keyedit.jsp.submit"/>'/> + </div> + </div> + <html:hidden property="submitted" value="true" /> + <c:if test='${not empty param.tid}'> + <html:hidden property="tid" value="${param.tid}" /> + </c:if> + </html:form> + </body> </html> - commit 64b632c7a101d854ab821721e10c273f59443ed5 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 16:59:30 2013 +0200 panel-title added to the titles in the panels diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf index f1605e7..99b1f57 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf @@ -2,7 +2,7 @@ <div class="panel panel-default"> <div class="panel-heading"> - <h5><bean:message key="preferences.jsp.tz"/></h5> + <h5 class="panel-title"><bean:message key="preferences.jsp.tz"/></h5> </div> <div class="panel-body"> <p><bean:message key="preferences.jsp.datestimes"/></p> @@ -18,7 +18,7 @@ <div class="panel panel-default"> <div class="panel-heading"> - <h5><bean:message key="preferences.jsp.lang" /></h5> + <h5 class="panel-title"><bean:message key="preferences.jsp.lang" /></h5> </div> <div class="panel-body"> <p><bean:message key="preferences.jsp.langs" /></p> commit 5b50bb1b76624d2c083703603cb517d53cdfdc61 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 16:55:42 2013 +0200 Locale Preferences: Panels added diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf index 0c6a100..f1605e7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf @@ -1,58 +1,75 @@ <html> -<h2><bean:message key="preferences.jsp.tz"/></h2> -<p><bean:message key="preferences.jsp.datestimes"/></p> -<div class="preference"><bean:message key="preferences.jsp.displaytimesas"/> -<html:select property="timezone"> - <html:options collection="timezones" - property="value" - labelProperty="display" /> -</html:select> +<div class="panel panel-default"> + <div class="panel-heading"> + <h5><bean:message key="preferences.jsp.tz"/></h5> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.datestimes"/></p> + <div class="preference"><bean:message key="preferences.jsp.displaytimesas"/> + <html:select property="timezone"> + <html:options collection="timezones" + property="value" + labelProperty="display" /> + </html:select> + </div> + </div> </div> -<h2><bean:message key="preferences.jsp.lang" /></h2> -<p><bean:message key="preferences.jsp.langs" /></p> -<div class="preference"> -<c:set var="counter" value="0" /> -<html:hidden property="submitted" value="true" /> -<html:hidden property="uid" /> -<table width="75%" cellpadding="0"> - <tr> - <td width="50%"> - <input type="radio" name="preferredLocale" value="<c:out value="${noLocale.languageCode}" />" - <c:if test="${noLocale.languageCode == currentLocale}"> - checked="checked" - </c:if>/> - <c:out value="${noLocale.localizedName}" /> - <br /> - <br /> - </td> - </tr> -<c:forEach var="item" items="${supportedLocales}"> - <c:if test="${counter == 0}"> - <tr> - </c:if> - <td width="50%"> - <input type="radio" name="preferredLocale" value="<c:out value="${item.key}" />" - <c:if test="${item.key == currentLocale}"> - checked="checked" - </c:if>/> - <img src="<c:out value="${item.value.imageUri}" />" alt="<c:out value="${item.value.localizedName}" />" /> (<c:out value="${item.value.localizedName}" />) - </td> - <c:if test="${counter == 1}"> - </tr> - </c:if> - <c:set var="counter" value="${counter + 1}" /> - <c:if test="${counter == 2}"> +<div class="panel panel-default"> + <div class="panel-heading"> + <h5><bean:message key="preferences.jsp.lang" /></h5> + </div> + <div class="panel-body"> + <p><bean:message key="preferences.jsp.langs" /></p> + + <div class="preference"> <c:set var="counter" value="0" /> - </c:if> -</c:forEach> + <html:hidden property="submitted" value="true" /> + <html:hidden property="uid" /> + <table cellpadding="0"> + <tr> + <td width="50%"> + <input type="radio" name="preferredLocale" value="<c:out value="${noLocale.languageCode}" />" + <c:if test="${noLocale.languageCode == currentLocale}"> + checked="checked" + </c:if>/> + <c:out value="${noLocale.localizedName}" /> + <br /> + <br /> + </td> + </tr> + <c:forEach var="item" items="${supportedLocales}"> + <c:if test="${counter == 0}"> + <tr> + </c:if> + <td width="50%"> + <input type="radio" name="preferredLocale" value="<c:out value="${item.key}" />" + <c:if test="${item.key == currentLocale}"> + checked="checked" + </c:if>/> + <img src="<c:out value="${item.value.imageUri}" />" alt="<c:out value="${item.value.localizedName}" />" /> (<c:out value="${item.value.localizedName}" />) + </td> + <c:if test="${counter == 1}"> + </tr> + </c:if> + <c:set var="counter" value="${counter + 1}" /> + <c:if test="${counter == 2}"> + <c:set var="counter" value="0" /> + </c:if> + </c:forEach> + + <c:if test="${counter == 1}"> + </tr> + </c:if> + </table> + </div> -<c:if test="${counter == 1}"> - </tr> -</c:if> -</table> + </div> </div> + + + <hr/> <div align="right"> <rhn:submit valueKey="preferences.jsp.submitvalue"/> commit c084e7f8b31716f7f21c7bd86c3b38db321a39c2 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 16:36:31 2013 +0200 menu animation deleted diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index edbe24b..61d61f8 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -5,7 +5,7 @@ $(document).on("ready", function(){ $("#sidenav ul>ul").hide(); $("#sidenav li.active").each(function() { - $(this).next("ul").show(300); + $(this).next("ul").show(); }); /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when commit 8c049db45cddcbe975e6c489a291499e45d51839 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 18 16:34:51 2013 +0200 TB3: Systems/Activation Keys/Create Activation Key form diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp index 79b4021..9e04ddb 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp @@ -2,18 +2,17 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<rhn:toolbar base="h1" icon="icon-key" - imgAlt="activation-keys.common.alt" - helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" - > - <bean:message key ="activation-key.jsp.create"/> -</rhn:toolbar> -<c:import url="/WEB-INF/pages/common/fragments/activationkeys/details.jspf"> - <c:param name = "url" value="/activationkeys/Create.do"/> - <c:param name = "submit" value="activation-key.jsp.create-key"/> -</c:import> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" icon="icon-key" + imgAlt="activation-keys.common.alt" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" + > + <bean:message key ="activation-key.jsp.create"/> + </rhn:toolbar> + <c:import url="/WEB-INF/pages/common/fragments/activationkeys/details.jspf"> + <c:param name = "url" value="/activationkeys/Create.do"/> + <c:param name = "submit" value="activation-key.jsp.create-key"/> + </c:import> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf index 9af66fc..61d7244 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf @@ -3,130 +3,144 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:form action="${param.url}"> +<html:form action="${param.url}" styleClass="form-horizontal"> <rhn:csrf /> -<c:if test="${not empty param.tid}"> -<input type="hidden" name="tid" value="${param.tid}"/> -</c:if> -<div class="page-summary"> - <h2><bean:message key="activation-key.details.jsp.title"/></h2> - <p> - <bean:message key="activation-key.jsp.summary"/> - </p> + <c:if test="${not empty param.tid}"> + <input type="hidden" name="tid" value="${param.tid}"/> + </c:if> + <h2><bean:message key="activation-key.details.jsp.title"/></h2> + <p><bean:message key="activation-key.jsp.summary"/></p> -<table class="details"> - <tr> - <th> - <label for="description"><bean:message key="kickstart.activationkeys.jsp.description"/></label> - </th> - <td> - <html:text property="description" styleId="description"/><br/> - <rhn:tooltip> - <bean:message key="activation-key.jsp.edit-description-tooltip" - arg0 = "${requestScope.blankDescription}"/> - </rhn:tooltip> - </td> - </tr> - <tr> - <th> - <label for="key"><bean:message key="kickstart.activationkeys.jsp.key"/>:</label> - </th> - <td> - <c:if test="${not requestScope.unprefixed}">${requestScope.prefix}</c:if> - <html:text property="key" styleId="key"/><br/> - <c:choose> - <c:when test = "${not requestScope.unprefixed}"> - <rhn:tooltip key="activation-key.jsp.blank.auto-generator.prefix-notice"/> - </c:when> - <c:otherwise> - <rhn:tooltip key="activation-key.jsp.blank.auto-generator"/><br/> - <rhn:tooltip> - <bean:message key="activation-key.jsp.org_notice" arg0="${requestScope.prefix}"/> - </rhn:tooltip> - </c:otherwise> - </c:choose> + <div class="form-group"> + <label class="col-lg-3 control-label" for="description"> + <bean:message key="kickstart.activationkeys.jsp.description"/> + </label> + <div class="col-lg-6"> + <html:text property="description" styleClass="form-control" styleId="description"/><br/> + <span class="help-block"> + <bean:message key="activation-key.jsp.edit-description-tooltip" + arg0 = "${requestScope.blankDescription}"/> + </span> + </div> + </div> - </td> - </tr> - <tr> - <th> - <label for="usageLimit"><bean:message key="kickstart.activationkeys.jsp.usagelimit"/>:</label> - </th> - <td> - <html:text property="usageLimit" styleId="usageLimit"/><br/> - <rhn:tooltip key="activation-key.jsp.blank.unlimited-use"/> - </td> - </tr> - <tr> - <th> - <label for="selectedChannel"><bean:message key="activation-key.jsp.base-channels"/>:</label> - </th> - <td> - <html:select property="selectedChannel" styleId="selectedChannel"> - <html:options collection="possibleChannels" - property="value" - labelProperty="label" /> - </html:select><br/> - - <rhn:tooltip> - <bean:message key="activation-key.jsp.edit-basechannel-tooltip" - arg0 = "${rhn:localize('activation-key.jsp.rh-default')}"/> - </rhn:tooltip> - - </td> - </tr> - - <tr> - <th> - <bean:message key="activation-key.jsp.addon-entitlements"/>: - </th> - <td> - <c:forEach items="${possibleEntitlements}" var="item"> - <html:multibox property="selectedEntitlements" disabled="${item.disabled}" styleId="${item.value}" value="${item.value}"/> - <label for="${item.value}"><c:out value="${item.label}"/></label> - <br /> - </c:forEach> - - </td> - </tr> - <c:if test="${not requestScope.create}"> - <tr> - <th> - <label for="enable-config-auto-deploy"><bean:message key="activation-key.jsp.enable-config-auto-deploy"/>:</label> - </th> - <td> - - <rhn:require acl="token_has_entitlement(provisioning_entitled)" - mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler"> - <html:checkbox property="autoDeploy" styleId="enable-config-auto-deploy" /><br/> - <rhn:tooltip key="activation-key.jsp.config-auto-deploy-tooltip"/> - </rhn:require> - <rhn:require acl="not token_has_entitlement(provisioning_entitled)" - mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler"> - <input type=checkbox disabled=true/><br/> - <rhn:tooltip><bean:message key="activation-key.jsp.disabled-config-auto-deploy-tooltip" - arg0="${rhn:localize('provisioning_entitled')}" - arg1="${rhn:localize('activation-key.jsp.addon-entitlements')}"/> - </rhn:tooltip> - </rhn:require> - </td> - </tr> - </c:if> - <tr> - <th> - <label for="universal"><bean:message key="activation-key.jsp.universal-default"/>:</label> - </th> - <td> - <html:checkbox property="universal" styleId="universal" /><br/> - <rhn:tooltip key="activation-key.jsp.edit.universal-default-tooltip"/> - </td> - </tr> -</table> -<div align="right"> -<hr /> -<html:submit property="dispatch"><bean:message key="${param.submit}"/></html:submit> -</div> -<rhn:submitted/> -</div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="key"> + <bean:message key="kickstart.activationkeys.jsp.key"/>: + </label> + <div class="col-lg-6"> + <div class="input-group"> + <c:if test="${not requestScope.unprefixed}"> + <span class="input-group-addon">${requestScope.prefix}</span> + </c:if> + <html:text property="key" styleId="key" styleClass="form-control"/> + </div> + <c:choose> + <c:when test = "${not requestScope.unprefixed}"> + <span class="help-block"> + <bean:message key="activation-key.jsp.blank.auto-generator.prefix-notice"/> + </span> + </c:when> + <c:otherwise> + <span class="help-block"> + <bean:message key="activation-key.jsp.blank.auto-generator"/> + </span> + <span class="help-block"> + <bean:message key="activation-key.jsp.org_notice" arg0="${requestScope.prefix}"/> + </span> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="usageLimit"> + <bean:message key="kickstart.activationkeys.jsp.usagelimit"/>: + </label> + <div class="col-lg-6"> + <html:text property="usageLimit" styleClass="form-control" styleId="usageLimit"/> + <span class="help-block"> + <bean:message key="activation-key.jsp.blank.unlimited-use"/> + </span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="selectedChannel"> + <bean:message key="activation-key.jsp.base-channels"/>: + </label> + <div class="col-lg-6"> + <html:select property="selectedChannel" styleId="selectedChannel" styleClass="form-control"> + <html:options collection="possibleChannels" + property="value" + labelProperty="label" /> + </html:select> + <span class="help-block"> + <bean:message key="activation-key.jsp.edit-basechannel-tooltip" + arg0 = "${rhn:localize('activation-key.jsp.rh-default')}"/> + </span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="activation-key.jsp.addon-entitlements"/>: + </label> + <div class="col-lg-6"> + <c:forEach items="${possibleEntitlements}" var="item"> + <div class="checkbox"> + <label> + <html:multibox property="selectedEntitlements" disabled="${item.disabled}" + styleId="${item.value}" value="${item.value}"/> + <c:out value="${item.label}"/> + </label> + </div> + </c:forEach> + </div> + </div> + <c:if test="${not requestScope.create}"> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <rhn:require acl="token_has_entitlement(provisioning_entitled)" + mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler"> + <label> + <html:checkbox property="autoDeploy" styleId="enable-config-auto-deploy" /> + <bean:message key="activation-key.jsp.enable-config-auto-deploy"/> + </label> + <span class="help-block"> + <bean:message key="activation-key.jsp.config-auto-deploy-tooltip"/> + </span> + </rhn:require> + <rhn:require acl="not token_has_entitlement(provisioning_entitled)" + mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler"> + <label> + <input type=checkbox disabled=true/> + <bean:message key="activation-key.jsp.enable-config-auto-deploy"/> + </label> + <span class="help-block"> + <bean:message key="activation-key.jsp.disabled-config-auto-deploy-tooltip" + arg0="${rhn:localize('provisioning_entitled')}" + arg1="${rhn:localize('activation-key.jsp.addon-entitlements')}"/> + </span> + </rhn:require> + </div> + </div> + </c:if> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <html:checkbox property="universal" styleId="universal" /> + <bean:message key="activation-key.jsp.universal-default"/> + </div> + <span class="help-block"> + <rhn:tooltip key="activation-key.jsp.edit.universal-default-tooltip"/> + </span> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit property="dispatch" styleClass="btn btn-success"> + <bean:message key="${param.submit}"/> + </html:submit> + </div> + </div> + <rhn:submitted/> </html:form> commit 405db27eea43da199415473503933a2655d4799d Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 16:33:12 2013 +0200 button reverted and margin added to tab lists diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 5f987a1..6c1a8a1 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -504,8 +504,7 @@ h1 .icon-stack { margin: 1em 0 } -//button dispatch -input[name="dispatch"]{ - .btn; - .btn-default; +//tabs - adding a margin button to the last UL +ul.nav.nav-tabs:last-child{ + margin-bottom: 1.5em } commit 1a3aa8f8e4ff61944b7ce3b7eab642031ad1c716 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 16:23:11 2013 +0200 clear-btn fixed diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 7e26247..508c968 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -84,7 +84,7 @@ <span id="header_selcount"> <rhn:setdisplay user="${requestScope.session.user}" /> </span> - <a id="clear-btn" class="button" href="/rhn/ssm/index.do"> + <a class="button" href="/rhn/ssm/index.do"> <bean:message key="manage"/> </a> <%-- @@ -99,7 +99,7 @@ <c:set var="rurl" value="${pageContext.request.requestURI}" /> </c:otherwise> </c:choose> - <a class="button" href="/rhn/systems/Overview.do?empty_set=true&return_url=${rhn:urlEncode(rurl)}"> + <a id="clear-btn" class="button" href="/rhn/systems/Overview.do?empty_set=true&return_url=${rhn:urlEncode(rurl)}"> <bean:message key="clear"/> </a> </div> diff --git a/web/include/network/components/status_bar/ssm.pxi b/web/include/network/components/status_bar/ssm.pxi index 4fd4c49..1b545b7 100644 --- a/web/include/network/components/status_bar/ssm.pxi +++ b/web/include/network/components/status_bar/ssm.pxi @@ -11,11 +11,11 @@  </span> - <a id="clear-btn" class="button" href="/rhn/ssm/index.do"> + <a class="button" href="/rhn/ssm/index.do"> Manage </a> <rhn-return-link default="/network"> - <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a> + <a id="clear-btn" class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a> </rhn-return-link> </rhn-require> </div> commit f7584ee2839141ec0898e08a51811dc0ae17e4ff Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 14:59:07 2013 +0200 icon added to the button Update Email in user account diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf index ecf49e4..3c6ac6d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf @@ -79,6 +79,7 @@ <c:choose> <c:when test="${!empty mailableAddress}"> <a class="btn btn-default btn-sm" href="<c:out value="${email_link}"/>"> + <i class="icon-refresh"></i> <%-- <bean:message key="${email_display}"/> --%> commit 4f2c08bb89736c2649bd56ff8d7d8c561cbf4e9f Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 14:58:31 2013 +0200 changes in language files to add icons in some inline code diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 39fca95..a474a47 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -1684,19 +1684,19 @@ <target>চিহ্নিত মান অনুসারে ফিল্টার করা হবে: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> <strong id="list_total">{2}</strong>-র</target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> <span id="list_total">{2}</span>-র</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong>, <strong>{2}</strong>-র + <target><span>{0}</span> - <span>{1}</span>, <span>{2}</span>-র {3} প্রদর্শিত</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 0f7973a..e4e51a7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -1785,19 +1785,19 @@ <target>Filtern nach: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> von <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> von <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> von <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> von <span>{2}</span> {3} angezeigt</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index de21eb1..d825f63 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1535,13 +1535,13 @@ </context-group> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> @@ -1557,7 +1557,7 @@ </context-group> </trans-unit> <trans-unit id="message.items.per.page"> - <source>Display {0} items per page</source> + <source>{0} items per page</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 5cd62e1..93d0432 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -1785,19 +1785,19 @@ <target>Filtrar por: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> de <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> de <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> de <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> de <span>{2}</span> {3} mostrados</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index a742d1c..fc917f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -1787,19 +1787,19 @@ utilisateur avant de supprimer son compte.</target> <target>Filtrer par : </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> de <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> de <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> de <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> de <span>{2}</span> {3} affichés</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 6fc087c..f6564c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -1677,19 +1677,19 @@ <target>દ્વારા ગાળો: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{2}</strong> માંથી <strong>{0}</strong> - <strong>{1}</strong> + <target><span>{2}</span> માંથી <span>{0}</span> - <span>{1}</span> {3} દર્શાવાયેલ છે</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 15e4689..2f03a92 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -1677,19 +1677,19 @@ <target>इसके द्वारा फ़िल्टर: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{2}</strong> में से <strong>{0}</strong> - <strong>{1}</strong> + <target><span>{2}</span> में से <span>{0}</span> - <span>{1}</span> {3} प्रदर्शित</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 04c4c5f..b3aa3af 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -1785,19 +1785,19 @@ <target>Filtra per: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> di <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> di <span>{2}</span> {3} visualizzati</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 9addf59..47e2cf2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -1785,19 +1785,19 @@ <target>フィルターする: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> のうち <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> のうち <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{2}</strong> のうち <strong>{1}</strong> + <target><span>{0}</span> - <span>{2}</span> のうち <span>{1}</span> {3} 表示されました</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 7bdffae..1cb5f47 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -1785,19 +1785,19 @@ <target>거르기:</target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_total">{2}</strong> 중 <strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> </target> + <target><span id="list_total">{2}</span> 중 <span id="list_min" >{0}</span> - <span id="list_max">{1}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{2}</strong> 중 <strong>{0}</strong> - <strong>{1}</strong> + <target><span>{2}</span> 중 <span>{0}</span> - <span>{1}</span> {3} 출력됨 </target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index b3a32fb..3cfe41f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -1679,19 +1679,19 @@ <target>ਰਾਹੀਂ ਫਿਲਟਰ: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{2}</strong> ਵਿੱਚੋਂ <strong>{1}</strong> + <target><span>{0}</span> - <span>{2}</span> ਵਿੱਚੋਂ <span>{1}</span> {3} ਵਿਖਾਇਆ ਹੈ</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index 99df77d..293f683 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -1785,19 +1785,19 @@ <target>Filtrar por: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> de <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> de <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> de <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> de <span>{2}</span> {3}</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index aa071ad..f85621f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -1785,19 +1785,19 @@ <target>Фильтр: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> из <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> из <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> из <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> из <span>{2}</span> {3}</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index cdbb89a..e8f485d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -1677,19 +1677,19 @@ <target>வடிப்பு: </target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} காட்டப்பட்டது</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index bbef06b..dc3164e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -1785,19 +1785,19 @@ <target>过滤器：</target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_total">{2}</strong> 的 <strong id="list_max">{1}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_total">{2}</span> 的 <span id="list_max">{1}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{1}</strong> 之 <strong>{2}</strong> + <target><span>{0}</span> - <span>{1}</span> 之 <span>{2}</span> {3} 被显示</target> </trans-unit> <trans-unit id="message.numselected"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index 8ea5233..6924cee 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -1785,19 +1785,19 @@ <target>由...來篩選：</target> </trans-unit> <trans-unit id="message.range"> - <source><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></source> + <source><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong id="list_min" >{0}</strong> - <strong id="list_max">{1}</strong> of <strong id="list_total">{2}</strong></target> + <target><span id="list_min" >{0}</span> - <span id="list_max">{1}</span> of <span id="list_total">{2}</span></target> </trans-unit> <trans-unit id="message.range.withtypedescription"> - <source><strong>{0}</strong> - <strong>{1}</strong> of <strong>{2}</strong> + <source><span>{0}</span> - <span>{1}</span> of <span>{2}</span> {3} displayed</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target><strong>{0}</strong> - <strong>{2}</strong> 的 <strong>{1}</strong> + <target><span>{0}</span> - <span>{2}</span> 的 <span>{1}</span> {3} 已顯示。</target> </trans-unit> <trans-unit id="message.numselected"> commit fb02411a48ba26ee4bb3660806da7b28f73be410 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 14:48:03 2013 +0200 systems icons changed diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java index 63df11b..fb9c5d4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java @@ -58,14 +58,14 @@ public class SystemListHelper { String message; HtmlTag url = new HtmlTag("a"); - HtmlTag img = new HtmlTag("img"); + HtmlTag i = new HtmlTag("i"); LocalizationService ls = LocalizationService.getInstance(); if (next.getEntitlement() == null || next.getEntitlement().isEmpty()) { message = ls.getMessage("systemlist.jsp.unentitled"); - img.setAttribute("src", "/img/icon_unentitled.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "spacewalk-icon-unknown-system"); + //img.setAttribute("alt", message); + i.setAttribute("title", message); if (user.hasRole(RoleFactory.ORG_ADMIN)) { url.setAttribute("href", "/rhn/systems/details/Edit.do?sid=" + next.getId()); @@ -76,9 +76,9 @@ public class SystemListHelper { url.setAttribute("href", "/rhn/help/reference/en-US/s1-sm-systems.jsp"); message = ls.getMessage("systemlist.jsp.notcheckingin"); - img.setAttribute("src", "/img/icon_checkin.gif"); - img.setAttribute("alt", message); - img.setAttribute("title", message); + i.setAttribute("class", "spacewalk-icon-unknown-system"); + //img.setAttribute("alt", message); + i.setAttribute("title", message); if (makeLinks) { makeLinks = ConfigDefaults.get().isDocAvailable(); } @@ -90,9 +90,9 @@ public class SystemListHelper { "/rhn/systems/details/kickstart/SessionStatus.do?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.kickstart"); - img.setAttribute("src", "/img/icon_kickstart_session.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-rocket"); + i.setAttribute("title", message); + //i.setAttribute("alt", message); } else if (next.getEnhancementErrata() + next.getBugErrata() + next.getSecurityErrata() > 0 && @@ -103,9 +103,9 @@ public class SystemListHelper { "/network/systems/details/history/pending.pxt?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.updatesscheduled"); - img.setAttribute("src", "/img/icon_pending.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-time"); + i.setAttribute("title", message); + //i.setAttribute("alt", message); } else if (SystemManager.countActions(new Long(next.getId().longValue())) > 0) { //status = "actions scheduled"; @@ -113,9 +113,9 @@ public class SystemListHelper { "/network/systems/details/history/pending.pxt?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.actionsscheduled"); - img.setAttribute("src", "/img/icon_pending.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-time"); + i.setAttribute("title", message); + //img.setAttribute("alt", message); } else if ((next.getEnhancementErrata() + next.getBugErrata() + next.getSecurityErrata()) == 0 && @@ -125,9 +125,9 @@ public class SystemListHelper { //status = "up2date"; message = ls.getMessage("systemlist.jsp.up2date"); - img.setAttribute("src", "/img/icon_up2date.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-ok-sign"); + i.setAttribute("title", message); + //i.setAttribute("alt", message); } else if (next.getSecurityErrata().intValue() > 0) { //status = "critical"; @@ -136,9 +136,8 @@ public class SystemListHelper { next.getId() + "&type=" + LocalizationService.getInstance().getMessage(ErrataSetupAction.SECUR)); message = ls.getMessage("systemlist.jsp.critical"); - img.setAttribute("src", "/img/icon_crit_update.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-exclamation-sign"); + i.setAttribute("title", message); } else if (next.getOutdatedPackages().intValue() > 0) { //status = "updates"; @@ -146,19 +145,19 @@ public class SystemListHelper { "/rhn/systems/details/packages/UpgradableList.do?sid=" + next.getId()); message = ls.getMessage("systemlist.jsp.updates"); - img.setAttribute("src", "/img/icon_reg_update.gif"); - img.setAttribute("title", message); - img.setAttribute("alt", message); + i.setAttribute("class", "icon-warning-sign"); + i.setAttribute("title", message); } - url.addBody(img); + url.addBody(i.renderOpenTag()); + url.addBody(i.renderCloseTag()); String statusDisplay; if (makeLinks) { statusDisplay = url.render(); } else { - statusDisplay = img.render(); + statusDisplay = i.render(); } if (next.getLocked().intValue() == 1) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java index 1252c40..63a4d4f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java @@ -69,10 +69,9 @@ public class SystemListSetupActionTest extends RhnMockStrutsTestCase { ls.getMessage("systemlist.jsp.up2date") + "\" alt=\"" + ls.getMessage("systemlist.jsp.up2date") + "\" /></a>"; String awol = "<a href=\"/rhn/help/reference/en-US/s1-sm-systems.jsp" + - "\"><img src=\"/img/icon_checkin.gif\" " + - "alt=\"" + ls.getMessage("systemlist.jsp.notcheckingin") + "\" " + + "\"><i class=\"spacewalk-icon-unknown-system\" " + "\" " + "title=\"" + ls.getMessage("systemlist.jsp.notcheckingin") + - "\" /></a>"; + "\" ></i></a>"; //Page through all the systems because we don't know where our new system is diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index 8028be1..0bf6ee2 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -115,6 +115,7 @@ public class PageSizeDecorator extends BaseListDecorator { HtmlTag select = new HtmlTag("Select"); select.setAttribute("name", makePageSizeLabel(listName)); select.setAttribute("onChange", makeOnChangeScript()); + select.setAttribute("class","display-number"); for (int size : PAGE_SIZE) { HtmlTag option = new HtmlTag("option"); diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf index 68e478d..6fa1f3d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf @@ -7,9 +7,8 @@ title="<bean:message key="scapdiff.jsp.i.${current.diffIcon}"/>"/></a> </c:when> <c:otherwise> - <img src="/img/icon_checkin.gif" - alt="<bean:message key="system.audit.xccdfdetails.jsp.nodiff"/>" - title="<bean:message key="system.audit.xccdfdetails.jsp.nodiff"/>"/> + <i class="spacewalk-icon-unknown-system" + title="<bean:message key="system.audit.xccdfdetails.jsp.nodiff"/>"/></i> </c:otherwise> </c:choose>  diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp index 68d1910..e873955 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp @@ -26,7 +26,7 @@ <img src="/img/rhn-listicon-error.gif" title="<bean:message key="yourrhn.jsp.actions.failed" />" alt="<bean:message key="yourrhn.jsp.actions.failed" />" /> </c:when> <c:otherwise> - <img src="/img/icon_checkin.gif" title="<bean:message key="yourrhn.jsp.actions.unknown" />" alt="<bean:message key="yourrhn.jsp.actions.unknown" />" /> + <i class="spacewalk-icon-unknown-system" title="<bean:message key="yourrhn.jsp.actions.unknown" />"></i> </c:otherwise> </c:choose> <a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 2d945a4..46b498f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -19,7 +19,7 @@ <rl:listset name="registeredSystems" legend="system"> <rhn:csrf /> <bean:message key="registeredlist.jsp.view"/> - <select name="threshold"> + <select name="threshold" class="view-systems-registered"> <c:forEach var="option" items="${options}"> <c:choose> <c:when test="${recentlyRegisteredSystemsForm.map.threshold eq option.value}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 758a86e..a6e6330 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -19,7 +19,7 @@ </c:when> <c:when test="${systemInactive}"> - <img src="/img/icon_checkin.gif"/> <bean:message key="sdc.details.overview.inactive1"/> + <i class="spacewalk-icon-unknown-system"/></i> <bean:message key="sdc.details.overview.inactive1"/> <c:if test="${documentation == 'true'}"> <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> </c:if> diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi index f5736ec..66acbcd 100644 --- a/web/include/network/components/legends/system-list-legend.pxi +++ b/web/include/network/components/legends/system-list-legend.pxi @@ -5,12 +5,12 @@ <pxt-use class="Sniglets::Users" /> <div class="sideleg"> - <h2>System Legend</h2> + <h4>System Legend</h4> <ul> <li><img src="/img/icon_up2date.gif" alt="" />OK</li> <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li> <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li> - <li><img src="/img/icon_checkin.gif" alt="" />Unknown</li> + <li><i class="spacewalk-icon-unknown-system" />Unknown</li> <rhn-require acl="org_entitlement(sw_mgr_enterprise)"> <li><img src="/img/icon_locked.gif" alt="" />Locked</li> </rhn-require> commit bbdba294c7ebe013857ccb51584c883518326439 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 18 14:23:32 2013 +0200 TB3: Channels/Software Channels/Repositories/new repo form diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp index 614c4c4..292d06d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp @@ -3,110 +3,101 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<c:choose> - <c:when test = "${not empty requestScope.create_mode}"> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> - <bean:message key="repos.jsp.toolbar"/> - </rhn:toolbar> - <h2><bean:message key="repos.jsp.header2"/></h2> - </c:when> - <c:otherwise> - <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img" - deletionUrl="RepoDelete.do?id=${requestScope.repo.id}" - deletionType="repos"> - <c:out value="${requestScope.repo.label}"/> - </rhn:toolbar> - <h2><bean:message key="repos.jsp.details.header2"/></h2> - </c:otherwise> -</c:choose> - -<c:choose> - <c:when test="${empty requestScope.create_mode}"> - <c:set var="url" value ="/channels/manage/repos/RepoEdit"/> - </c:when> - <c:otherwise> - <c:set var="url" value ="/channels/manage/repos/RepoCreate"/> - </c:otherwise> -</c:choose> - -<div> - <html:form action="${url}"> - <rhn:csrf /> - <rhn:submitted/> - <html:hidden property="id" value="${repo.id}"/> - <table class="details"> - <tr> - <th> - <rhn:required-field key = "repos.jsp.create.label"/> - </th> - <td> - <html:text property="label"/> - - <c:if test = "${empty requestScope.create_mode}"> - <html:hidden property="sourceid"/> - </c:if> - </td> - </tr> - <tr> - <th> - <rhn:required-field key = "repos.jsp.create.url"/> - </th> - <td> - <html:text property="url"/> - </td> - </tr> - <tr> - <th> - <bean:message key = "repos.jsp.ssl.ca"/> - </th> - <td> - <html:select property="sslcacert"> - <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> - </html:select> - </td> - </tr> - <tr> - <th> - <bean:message key = "repos.jsp.ssl.clientcert"/> - </th> - <td> - <html:select property="sslclientcert"> - <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> - </html:select> - </td> - </tr> - <tr> - <th> - <bean:message key = "repos.jsp.ssl.clientkey"/> - </th> - <td> - <html:select property="sslclientkey"> - <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> - </html:select> - </td> - </tr> - </table> - - <hr /> - - <table align="right"> - <tr> - <td></td> - <c:choose> - <c:when test = "${empty requestScope.create_mode}"> - <td align="right"><html:submit><bean:message key="repos.jsp.update.submit"/></html:submit></td> - </c:when> - <c:otherwise> - <td align="right"><html:submit><bean:message key="repos.jsp.create.submit"/></html:submit></td> - </c:otherwise> - </c:choose> - </tr> - </table> - - </html:form> -</div> - -</body> +<html:html> + <body> + <c:choose> + <c:when test = "${not empty requestScope.create_mode}"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> + <bean:message key="repos.jsp.toolbar"/> + </rhn:toolbar> + <h2><bean:message key="repos.jsp.header2"/></h2> + </c:when> + <c:otherwise> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img" + deletionUrl="RepoDelete.do?id=${requestScope.repo.id}" + deletionType="repos"> + <c:out value="${requestScope.repo.label}"/> + </rhn:toolbar> + <h2><bean:message key="repos.jsp.details.header2"/></h2> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${empty requestScope.create_mode}"> + <c:set var="url" value ="/channels/manage/repos/RepoEdit"/> + </c:when> + <c:otherwise> + <c:set var="url" value ="/channels/manage/repos/RepoCreate"/> + </c:otherwise> + </c:choose> + <html:form action="${url}" styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted/> + <html:hidden property="id" value="${repo.id}"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key = "repos.jsp.create.label"/>: + </label> + <div class="col-lg-6"> + <html:text property="label" styleClass="form-control"/> + <c:if test = "${empty requestScope.create_mode}"> + <html:hidden property="sourceid"/> + </c:if> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key = "repos.jsp.create.url"/>: + </label> + <div class="col-lg-6"> + <html:text property="url" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key = "repos.jsp.ssl.ca"/>: + </label> + <div class="col-lg-6"> + <html:select property="sslcacert" styleClass="form-control"> + <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> + </html:select> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key = "repos.jsp.ssl.clientcert"/>: + </label> + <div class="col-lg-6"> + <html:select property="sslclientcert" styleClass="form-control"> + <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> + </html:select> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key = "repos.jsp.ssl.clientkey"/>: + </label> + <div class="col-lg-6"> + <html:select property="sslclientkey" styleClass="form-control"> + <html:options collection="sslcryptokeys" labelProperty="label" property="value" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test = "${empty requestScope.create_mode}"> + <html:submit styleClass="btn btn-success"> + <bean:message key="repos.jsp.update.submit"/> + </html:submit> + </c:when> + <c:otherwise> + <html:submit styleClass="btn btn-success"> + <bean:message key="repos.jsp.create.submit"/> + </html:submit> + </c:otherwise> + </c:choose> + </div> + </div> + </html:form> + </body> </html:html> commit 7b0c2d0a34aaab44680b2f6eea653fbeb49a26cf Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 14:23:50 2013 +0200 Bug fixed: Glyphicons are not allowed - use only FontAwesome icons diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 441a2e4..993a49a 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -167,7 +167,7 @@ <td> </td><td> </td> <td style="text-align: right;"> <button type="submit" class="btn btn-default btn-sm"> - <span class="glyphicon glyphicon-search" /> + <i class="icon-search" /> <bean:message key="button.search"/> </button> </td> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index 1e92221..51e52c7 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -40,7 +40,7 @@ <html:text property="search_string" name="search_string" value="${search_string}" maxlength="100" accesskey="4"/> <button type="submit" class="btn btn-default btn-sm"> - <span class="glyphicon glyphicon-search" /> + <i class="icon-search" /> <bean:message key="button.search"/> </button> <br/> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 96e8025..9c4efc2 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -48,7 +48,7 @@ <html:text property="search_string" name="search_string" value="${search_string}" maxlength="36" accesskey="4"/> <button type="submit" class="btn btn-default btn-sm"> - <span class="glyphicon glyphicon-search" /> + <i class="icon-search" /> <bean:message key="button.search"/> </button> <br /> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 98dca42..b924ffd 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -31,7 +31,7 @@ <td> <html:text property="search_string" name="search_string" value="${search_string}" accesskey="4"/> <button type="submit" class="btn btn-default btn-sm"> - <span class="glyphicon glyphicon-search" /> + <i class="icon-search" /> <bean:message key="button.search"/> </button> </td> commit 14b6a9650aa4eed5cc98483598e3f4a13e010bc9 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Oct 18 14:17:03 2013 +0200 thead improved diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 9845b43..5f987a1 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -463,19 +463,22 @@ h1 .icon-stack { } /* spacewalk toolbar */ -.spacewalk-toolbar { - .pull-right; - padding: .5em 1em; - a { - border-right:1px solid @gray-light; - padding: 0 .5em - } - a:hover { - text-decoration: none; - } - a:last-child { - border-right:0 - } +.spacewalk-toolbar-h1{ + margin-bottom: 1.5em; + .spacewalk-toolbar { + .pull-right; + padding: .5em 1em; + a { + border-right:1px solid @gray-light; + padding: 0 .5em + } + a:hover { + text-decoration: none; + } + a:last-child { + border-right:0 + } + } } /* systems selected tool*/ @@ -500,3 +503,9 @@ h1 .icon-stack { .btn.spacewalk-btn-margin-vertical{ margin: 1em 0 } + +//button dispatch +input[name="dispatch"]{ + .btn; + .btn-default; +} diff --git a/branding/css/tables.less b/branding/css/tables.less index bcd2f2a..6d6134a 100644 --- a/branding/css/tables.less +++ b/branding/css/tables.less @@ -67,3 +67,19 @@ .table-rounded tbody tr:last-child td{ border-bottom: 1px solid @gray-light; } + + +.table thead > tr > td{ + padding: 0 +} +// colour to the head, except for when it is the last TR in the thead (it will be white) +thead tr{ + background: #e7e7e7; + &:last-of-type{ + background: #ffffff; + } +} +// Colour to the tfoot +tfoot{ + background: #f3f3f3 +} diff --git a/branding/css/theme.less b/branding/css/theme.less index e98dc8d..1890e5c 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -2,9 +2,9 @@ .spacewalk-alphabar{ border-bottom: 1px solid #dddddd; - margin-bottom: .8em; + padding: .7em; .pagination{ - margin: .8em 0 + margin: 0 } .pagination > li > a, .pagination > li > span{ border-top: 1px solid #dddddd; @@ -42,7 +42,23 @@ //Table's filters .filter-input{ + padding: .7em; .col-md-3{ - padding-left: 0; + padding-left: 0 } -} \ No newline at end of file + .col-md-9{ + padding-right: 0 + } +} +.display-number{ + .input-sm; + display: inline-block; + width: 5em; + border: 1px solid #dddddd; +} +.view-systems-registered{ + .input-sm; + width: 10em; + display: inline-block; + border: 1px solid #dddddd; +} commit f8bcd3c2a2390789a13c952fcca38e00030baa35 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 18 13:55:42 2013 +0200 TB3: Forgot a colon for the control label. diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp index ceb71cb..034b0dc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -240,7 +240,7 @@ </div> <div class="form-group"> <label class="col-lg-3 control-label"> - <bean:message key="channel.edit.jsp.orgsharing"/> + <bean:message key="channel.edit.jsp.orgsharing"/>: </label> <div class="col-lg-6"> <div class="radio"> commit 4f995b494aceabe8be9e2c0b234fdc55a3987794 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Oct 18 13:53:21 2013 +0200 TB3: Channels/Manage Channels/Create channel form diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp index a0780fb..ceb71cb 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -4,288 +4,330 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> -<body> - -<script type="text/javascript"> -function setChildChannelArchChecksum() { -var baseChannelArches = {}; -<c:forEach items="${parentChannelArches}" var="parentChannel"> -baseChannelArches["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>"; -</c:forEach> - -var baseChannelChecksums = {}; -<c:forEach items="${parentChannelChecksums}" var="parentChannel"> -baseChannelChecksums["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>"; -</c:forEach> - -document.getElementById("parentarch").value = baseChannelArches[document.getElementById("parent").value]; -document.getElementById("checksum").value = baseChannelChecksums[document.getElementById("parent").value]; -} -</script> - -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" - deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}" - deletionAcl="user_role(channel_admin); formvar_exists(cid)" - deletionType="software.channel"> - <bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/> -</rhn:toolbar> - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/manage_channel.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - -<div> - <html:form action="/channels/manage/Edit"> - <rhn:csrf /> - - <h2><bean:message key="channel.edit.jsp.basicchanneldetails"/></h2> - <div class="page-summary"> - <bean:message key="channel.edit.jsp.introparagraph"/> - </div> - - <table class="details"> - <tr> - <th nowrap="nowrap"> - <label for="name"><rhn:required-field key="channel.edit.jsp.name"/>:</label> - </th> - <td class="small-form"> - <html:text property="name" maxlength="256" size="48" styleId="name"/> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="label"><rhn:required-field key="channel.edit.jsp.label"/>:</label> - </th> - <td class="small-form"> - <c:choose> - <c:when test='${empty param.cid}'> - <html:text property="label" maxlength="128" size="32" styleId="label" /> - </c:when> - <c:otherwise> - <c:out value="${channel_label}"/> - <html:hidden property="label" value="${channel_label}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="parent"><bean:message key="channel.edit.jsp.parent"/>:</label> - </th> - <td class="small-form"> - <c:choose> - <c:when test='${empty param.cid}'> - <html:select property="parent" styleId="parent" - onchange="setChildChannelArchChecksum()"> - <html:options collection="parentChannels" - property="value" - labelProperty="label" /> - </html:select> - </c:when> - <c:otherwise> - <c:out value="${parent_name}"/> - <html:hidden property="parent" value="${parent_id}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="parentarch"><bean:message key="packagelist.jsp.packagearch"/>:</label> - </th> - <td class="small-form"> - <c:choose> - <c:when test='${empty param.cid}'> - <html:select property="arch" styleId="parentarch"> - <html:options collection="channelArches" - property="value" - labelProperty="label" /> - </html:select> - </c:when> - <c:otherwise> - <c:out value="${channel_arch}"/> - <html:hidden property="arch" value="${channel_arch_label}" /> - <html:hidden property="arch_name" value="${channel_arch}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="checksum"><bean:message key="channel.edit.jsp.checksum"/>:</label> - </th> - <td class="small-form"> - <html:select property="checksum" styleId="checksum"> - <html:options collection="checksums" - property="value" - labelProperty="label" /> - </html:select><br/> - <span class="small-text"><bean:message key="channel.edit.jsp.checksumtip"/></span> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="summary"><rhn:required-field key="channel.edit.jsp.summary"/>:</label> - </th> - <td class="small-form"> - <html:text property="summary" maxlength="500" size="40" styleId="summary" /> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="description"><bean:message key="channel.edit.jsp.description"/>:</label> - </th> - <td class="small-form"> - <html:textarea property="description" cols="40" rows="6" styleId="description"/> - </td> - </tr> - <c:if test='${not empty param.cid}'> - <tr> - <th> - <bean:message key="channel.edit.jsp.lastsynced"/>: - </th> - <td> - <c:if test='${not empty log_url}'> - <a href='${log_url}'><c:out value='${last_sync}'/></a> - </c:if> - <c:if test='${empty log_url}'> - <c:out value='${last_sync}'/> - </c:if> - </td> - </tr> - </c:if> - </table> - - - - <h2><bean:message key="channel.edit.jsp.contactsupportinfo"/></h2> - <table class="details"> - <tr> - <th nowrap="nowrap"> - <label for="maintainer_name"><bean:message key="channel.edit.jsp.maintainername"/>:</label> - </th> - <td class="small-form"> - <html:text property="maintainer_name" maxlength="128" size="40" styleId="maintainer_name"/> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.maintainercontactinfo"/>: - </th> - <td class="small-form"> - <table> - <tr> - <td><label for="maintainer_email"><bean:message key="channel.edit.jsp.emailaddress"/>:</label></td> - <td><html:text property="maintainer_email" size="20" styleId="maintainer_email"/></td> - </tr><tr> - <td><label for="maintainer_phone"><bean:message key="channel.edit.jsp.phonenumber"/>:</label></td> - <td><html:text property="maintainer_phone" size="20" styleId="maintainer_phone"/></td> - </tr> - </table> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="support_policy"><bean:message key="channel.edit.jsp.supportpolicy"/>:</label> - </th> - <td class="small-form"> - <html:textarea property="support_policy" cols="40" rows="6" styleId="support_policy"/> - </td> - </tr> - </table> - <h2><bean:message key="channel.edit.jsp.channelaccesscontrol"/></h2> - <table class="details"> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.perusersub"/>: - </th> - <td class="small-form"> - <table> - <tr> - <td><html:radio property="per_user_subscriptions" value="all" styleId="allusers" /></td> - <td><label for="allusers"><bean:message key="channel.edit.jsp.allusers"/></label></td> - </tr><tr> - <td><html:radio property="per_user_subscriptions" value="selected" styleId="selectedusers" /></td> - <td><label for="selectedusers"><bean:message key="channel.edit.jsp.selectedusers"/></label></td> - </tr> - </table> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <bean:message key="channel.edit.jsp.orgsharing"/> - </th> - <td class="small-form"> - <table> - <tr> - <td><html:radio property="org_sharing" value="private" styleId="private"/></td> - <td><label for="private"><bean:message key="channel.edit.jsp.private" - arg0="/rhn/multiorg/Organizations.do"/></label></td> - </tr><tr> - <td><html:radio property="org_sharing" value="protected" styleId="protected" /></td> - <td><label for="protected"><bean:message key="channel.edit.jsp.protected" - arg0="/rhn/multiorg/Organizations.do"/></label> - </td> - </tr><tr> - <td><html:radio property="org_sharing" value="public" styleId="public"/></td> - <td><label for="public"><bean:message key="channel.edit.jsp.public" - arg0="/rhn/multiorg/Organizations.do"/></label></td> - </tr> - </table> - </td> - </tr> - </table> - <h2><bean:message key="channel.edit.jsp.security.gpg"/></h2> - <table class="details"> - <tr> - <th nowrap="nowrap"> - <label for="gpgkeyurl"><bean:message key="channel.edit.jsp.gpgkeyurl"/>:</label> - </th> - <td class="small-form"> - <html:text property="gpg_key_url" maxlength="256" size="40" styleId="gpgkeyurl"/> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="gpgkeyid"><bean:message key="channel.edit.jsp.gpgkeyid"/>:</label> - </th> - <td class="small-form"> - <html:text property="gpg_key_id" maxlength="8" size="8" styleId="gpgkeyid"/><br />Ex: DB42A60E - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="gpgkeyfingerprint"><bean:message key="channel.edit.jsp.gpgkeyfingerprint"/>:</label> - </th> - <td class="small-form"> - <html:text property="gpg_key_fingerprint" maxlength="50" size="60" styleId="gpgkeyfingerprint"/><br /> - Ex: CA20 8686 2BD6 9DFC 65F6 ECC4 2191 80CD DB42 A60E - </td> - </tr> - </table> - <div align="right"> - <hr /> - <c:choose> - <c:when test='${empty param.cid}'> - <html:submit property="create_button"> - <bean:message key="channel.edit.jsp.createchannel"/> - </html:submit> - </c:when> - <c:otherwise> - <html:submit property="edit_button"> - <bean:message key="channel.edit.jsp.editchannel"/> - </html:submit> - </c:otherwise> - </c:choose> - </div> - <html:hidden property="submitted" value="true" /> - <c:if test='${not empty param.cid}'> - <html:hidden property="cid" value="${param.cid}" /> - </c:if> -</html:form> -</div> - -</body> + <body> + <script type="text/javascript"> + function setChildChannelArchChecksum() { + var baseChannelArches = {}; + <c:forEach items="${parentChannelArches}" var="parentChannel"> + baseChannelArches["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>"; + </c:forEach> + var baseChannelChecksums = {}; + <c:forEach items="${parentChannelChecksums}" var="parentChannel"> + baseChannelChecksums["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>"; + </c:forEach> + document.getElementById("parentarch").value = baseChannelArches[document.getElementById("parent").value]; + document.getElementById("checksum").value = baseChannelChecksums[document.getElementById("parent").value]; + } + </script> + <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" + deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}" + deletionAcl="user_role(channel_admin); formvar_exists(cid)" + deletionType="software.channel"> + <bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/manage_channel.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <html:form action="/channels/manage/Edit" styleClass="form-horizontal"> + <rhn:csrf /> + <h2><bean:message key="channel.edit.jsp.basicchanneldetails"/></h2> + <div class="page-summary"> + <bean:message key="channel.edit.jsp.introparagraph"/> + </div> + <div class="form-group"> + <label for="name" class="col-lg-3 control-label"> + <rhn:required-field key="channel.edit.jsp.name"/>: + </label> + <div class="col-lg-6"> + <html:text property="name" maxlength="256" + styleClass="form-control" + size="48" styleId="name"/> + </div> + </div> + <div class="form-group"> + <label for="label" class="col-lg-3 control-label"> + <rhn:required-field key="channel.edit.jsp.label"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test='${empty param.cid}'> + <html:text property="label" maxlength="128" + styleClass="form-control" + size="32" styleId="label" /> + </c:when> + <c:otherwise> + <div class="form-control"> + <c:out value="${channel_label}"/> + </div> + <html:hidden property="label" value="${channel_label}" /> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label for="parent" class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.parent"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test='${empty param.cid}'> + <html:select property="parent" styleId="parent" + styleClass="form-control" + onchange="setChildChannelArchChecksum()"> + <html:options collection="parentChannels" + property="value" + labelProperty="label" /> + </html:select> + </c:when> + <c:otherwise> + <div class="form-control"> + <c:out value="${parent_name}"/> + </div> + <html:hidden property="parent" value="${parent_id}"/> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label for="parentarch" class="col-lg-3 control-label"> + <bean:message key="packagelist.jsp.packagearch"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test='${empty param.cid}'> + <html:select property="arch" + styleClass="form-control" + styleId="parentarch"> + <html:options collection="channelArches" + property="value" + labelProperty="label" /> + </html:select> + </c:when> + <c:otherwise> + <div class="form-control"> + <c:out value="${channel_arch}"/> + </div> + <html:hidden property="arch" value="${channel_arch_label}" /> + <html:hidden property="arch_name" value="${channel_arch}" /> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="checksum"> + <bean:message key="channel.edit.jsp.checksum"/>: + </label> + <div class="col-lg-6"> + <html:select property="checksum" + styleId="checksum" + styleClass="form-control"> + <html:options collection="checksums" + property="value" + labelProperty="label" /> + </html:select> + <span class="help-block"> + <bean:message key="channel.edit.jsp.checksumtip"/> + </span> + </div> + </div> + <div class="form-group"> + <label for="summary" class="col-lg-3 control-label"> + <rhn:required-field key="channel.edit.jsp.summary"/>: + </label> + <div class="col-lg-6"> + <html:text property="summary" + maxlength="500" size="40" + styleClass="form-control" + styleId="summary" /> + </div> + </div> + <div class="form-group"> + <label for="description" class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.description"/>: + </label> + <div class="col-lg-6"> + <html:textarea property="description" + styleClass="form-control" + cols="40" rows="6" styleId="description"/> + </div> + </div> + <c:if test='${not empty param.cid}'> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.lastsynced"/>: + </label> + <div class="col-lg-6"> + <c:if test='${not empty log_url}'> + <a class="btn btn-info" href='${log_url}'><c:out value='${last_sync}'/></a> + </c:if> + <c:if test='${empty log_url}'> + <div class="form-control"> + <c:out value='${last_sync}'/> + </div> + </c:if> + </div> + </div> + </c:if> + <h2><bean:message key="channel.edit.jsp.contactsupportinfo"/></h2> + <div class="form-group"> + <label class="col-lg-3 control-label" for="maintainer_name"> + <bean:message key="channel.edit.jsp.maintainername"/>: + </label> + <div class="col-lg-6"> + <html:text property="maintainer_name" + maxlength="128" size="40" + styleClass="form-control" + styleId="maintainer_name"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.maintainercontactinfo"/>: + </label> + <div class="col-lg-6"> + <div class="input-group"> + <span class="input-group-addon"><bean:message key="channel.edit.jsp.emailaddress"/>:</span> + <html:text property="maintainer_email" size="20" + styleClass="form-control" + styleId="maintainer_email"/> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="input-group"> + <span class="input-group-addon"><bean:message key="channel.edit.jsp.phonenumber"/>:</span> + <html:text property="maintainer_phone" size="20" + styleClass="form-control" + styleId="maintainer_phone"/> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="support_policy"> + <bean:message key="channel.edit.jsp.supportpolicy"/>: + </label> + <div class="col-lg-6"> + <html:textarea property="support_policy" + cols="40" rows="6" + styleClass="form-control" + styleId="support_policy"/> + </div> + </div> + <h2><bean:message key="channel.edit.jsp.channelaccesscontrol"/></h2> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.perusersub"/>: + </label> + <div class="col-lg-6"> + <div class="radio"> + <label> + <html:radio property="per_user_subscriptions" value="all" styleId="allusers" /> + <bean:message key="channel.edit.jsp.allusers"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="radio"> + <label> + <html:radio property="per_user_subscriptions" value="selected" styleId="selectedusers" /> + <bean:message key="channel.edit.jsp.selectedusers"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.orgsharing"/> + </label> + <div class="col-lg-6"> + <div class="radio"> + <label> + <html:radio property="org_sharing" value="private" styleId="private"/> + <bean:message key="channel.edit.jsp.private" + arg0="/rhn/multiorg/Organizations.do"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="radio"> + <label> + <html:radio property="org_sharing" value="protected" styleId="protected" /> + <bean:message key="channel.edit.jsp.protected" + arg0="/rhn/multiorg/Organizations.do"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="radio"> + <label> + <html:radio property="org_sharing" value="public" styleId="public"/> + <bean:message key="channel.edit.jsp.public" + arg0="/rhn/multiorg/Organizations.do"/> + </label> + </div> + </div> + </div> + <h2><bean:message key="channel.edit.jsp.security.gpg"/></h2> + <div class="form-group"> + <label for="gpgkeyurl" class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.gpgkeyurl"/>: + </label> + <div class="col-lg-6"> + <html:text property="gpg_key_url" maxlength="256" size="40" + styleClass="form-control" + styleId="gpgkeyurl"/> + </div> + </div> + <div class="form-group"> + <label for="gpgkeyid" class="col-lg-3 control-label"> + <bean:message key="channel.edit.jsp.gpgkeyid"/>: + </label> + <div class="col-lg-6"> + <html:text property="gpg_key_id" maxlength="8" size="8" + styleClass="form-control" + styleId="gpgkeyid"/> + <span class="help-block">Example: DB42A60E</span> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="gpgkeyfingerprint"> + <bean:message key="channel.edit.jsp.gpgkeyfingerprint"/>: + </label> + <div class="col-lg-6"> + <html:text property="gpg_key_fingerprint" maxlength="50" size="60" + styleClass="form-control" + styleId="gpgkeyfingerprint"/> + <span class="help-block">Example: CA20 8686 2BD6 9DFC 65F6 ECC4 2191 80CD DB42 A60E</span> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test='${empty param.cid}'> + <html:submit property="create_button" styleClass="btn btn-success"> + <bean:message key="channel.edit.jsp.createchannel"/> + </html:submit> + </c:when> + <c:otherwise> + <html:submit property="edit_button" styleClass="btn btn-success"> + <bean:message key="channel.edit.jsp.editchannel"/> + </html:submit> + </c:otherwise> + </c:choose> + </div> + </div> + <html:hidden property="submitted" value="true" /> + <c:if test='${not empty param.cid}'> + <html:hidden property="cid" value="${param.cid}" /> + </c:if> + </html:form> + </body> </html> commit 002621bb4f7c0864bebdc93be82ccf2c0bbadc51 Author: Maximilian Meister <mmeister(a)suse.de> Date: Fri Oct 18 09:50:34 2013 +0200 Changed users/organizations icons. diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp index 876fee4..b82759c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-org.gif" + icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp index c5fe460..d5635c3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp @@ -18,7 +18,7 @@ function modifyUploadCheckbox(checkbox) { <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -32,7 +32,7 @@ function modifyUploadCheckbox(checkbox) { </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp index da43bf5..af8fa3d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"> +<rhn:toolbar base="h1" icon="icon-group"> <bean:message key="orgdelete.jsp.header1" arg0="${orgName}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp index 8621e3d..b3b6de5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp index 94ef90e..6877ff3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" creationUrl="/rhn/admin/multiorg/OrgCreate.do" creationType="org"> <bean:message key="organizations.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp index 7fe18db..bbbcf1d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index f5ccd61..e2d7ec2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -8,7 +8,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -22,7 +22,7 @@ </rhn:toolbar> </c:when> <c:otherwise> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp index 58e0cfe..fd8b4dc 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp @@ -9,7 +9,7 @@ <body> <c:choose> <c:when test="${param.oid != 1}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" @@ -23,7 +23,7 @@ </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" + <rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp index 438dbe7..a0dbd51 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp @@ -7,7 +7,7 @@ <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-org.gif" + icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp index be78264..994efe5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-org.gif" + icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp index 0c7eb8e..270a8ea 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" +<rhn:toolbar base="h1" icon="icon-group" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp index f93a9c3..b434958 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"> +<rhn:toolbar base="h1" icon="icon-group"> ${trustorg} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp index 34c771e..60620bd 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"> +<rhn:toolbar base="h1" icon="icon-group"> ${trustorg} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index 75c567a..3f6a849 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -9,7 +9,7 @@ <c:set var="pageList" value="${requestScope.pageList}" /> -<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" > +<rhn:toolbar base="h1" icon="icon-group" > <bean:message key="organizations.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp index a72a97e..a29848f 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" > + <rhn:toolbar base="h1" icon="icon-group" > ${orgtrust} </rhn:toolbar> <rhn:dialogmenu mindepth="0" maxdepth="3" commit 0571073a059d3e57f9e68ba6cce95911e6df2a11 Author: Maximilian Meister <mmeister(a)suse.de> Date: Fri Oct 18 09:36:14 2013 +0200 Entitlements icon changed. diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp index ef6dae6..ee4bbc6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-entitlements-subscriptions" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" commit 5c8cdd1363e74b9713c5687bd9b48d5010fbd687 Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 17:20:19 2013 +0200 Updated Admin/Spacewalk Configuration info icons. diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp index f2efc48..4ed8222 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="bootstrap.jsp.toolbar"/> </rhn:toolbar> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp index 0297362..9d66555 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="certificate.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index 60c733b..21f7b26 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="cobbler.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp index 4cfd1cd..fc57501 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="general.jsp.toolbar"/> </rhn:toolbar> <p><bean:message key="general.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index 75a6f3b..80d643c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="general.jsp.org.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index 8389105..f4023aa 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -11,7 +11,7 @@ </c:if> </head> <body <c:if test="${requestScope.restart == 'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if> > -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="restart.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp index 622049e..c6b5cd7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="iss.confirmmasterremove.jsp.toolbar" /> </rhn:toolbar> <p><bean:message key="iss.confirmmasterremove.jsp.areyousure" /></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index 4699a13..c2626e2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="iss.confirmslaveremove.jsp.toolbar" /> </rhn:toolbar> <p><bean:message key="iss.confirmslaveremove.jsp.areyousure" /></p> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp index 1831564..a104ba8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp @@ -7,14 +7,14 @@ <body> <c:choose> <c:when test="${requestScope.id > 0}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + <rhn:toolbar base="h1" icon="icon-info-sign" deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}" deletionType="master" deletionAcl="user_role(satellite_admin)"> <bean:message key="iss.editmaster.jsp.toolbar" /> </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="iss.editmaster.jsp.toolbar" /> </rhn:toolbar> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp index 30821e3..b8fbe1f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp @@ -7,14 +7,14 @@ <body> <c:choose> <c:when test="${requestScope.sid > 0}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + <rhn:toolbar base="h1" icon="icon-info-sign" deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}" deletionType="slave" deletionAcl="user_role(satellite_admin)"> <bean:message key="iss.editslave.jsp.toolbar" /> </rhn:toolbar> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="iss.editslave.jsp.toolbar" /> </rhn:toolbar> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index 14bca4d..1d1bb1b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -6,7 +6,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + <rhn:toolbar base="h1" icon="icon-info-sign" creationUrl="/rhn/admin/iss/EditSlave.do" creationType="slave" creationAcl="user_role(satellite_admin)"> <bean:message key="iss.master.jsp.toolbar" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index f726814..ba07a24 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + <rhn:toolbar base="h1" icon="icon-info-sign" creationUrl="/rhn/admin/iss/EditMaster.do" creationType="master" creationAcl="user_role(satellite_admin)"> <bean:message key="iss.slave.jsp.toolbar" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp index 1cd10cf..62005e5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> +<rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="methods.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp index 92e8be7..ae17a41 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp @@ -6,7 +6,7 @@ <html> <body> <script language="javascript" src="/javascript/display.js"></script> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="orgcreate.jsp.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp index 6c9e3cc..ca16caa 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <c:out value="${requestScope.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp index 625b633..614c4c4 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp @@ -7,13 +7,13 @@ <body> <c:choose> <c:when test = "${not empty requestScope.create_mode}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="repos.jsp.toolbar"/> </rhn:toolbar> <h2><bean:message key="repos.jsp.header2"/></h2> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img" + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img" deletionUrl="RepoDelete.do?id=${requestScope.repo.id}" deletionType="repos"> <c:out value="${requestScope.repo.label}"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp index 843f636..d3a973b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" +<rhn:toolbar base="h1" icon="icon-info-sign" creationUrl="RepoCreate.do" creationType="repos" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp index f9d83f1..74d502f 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="keycreate.jsp.toolbar"/> </rhn:toolbar> <bean:message key="keycreate.jsp.summary"/> diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp index cd7da63..e911ebc 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="system.common.kickstartAlt" + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/keys/CryptoKeyDelete.do?key_id=${cryptoKey.id}" deletionType="CryptoKeyDelete"> <bean:message key="keyedit.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp b/java/code/webapp/WEB-INF/pages/keys/keys.jsp index 7310ade..4e1c3fa 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" +<rhn:toolbar base="h1" icon="icon-info-sign" creationUrl="CryptoKeyCreate.do" creationType="keys" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp index 6afd6b0..3b30208 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp @@ -11,14 +11,14 @@ <body> <c:choose> <c:when test = "${not empty requestScope.create_mode}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="snippetcreate.jsp.toolbar"/> </rhn:toolbar> <h2><bean:message key="snippetcreate.jsp.header2"/></h2> </c:when> <c:otherwise> <rhn:toolbar base="h1" - img="/img/rhn-icon-info.gif" + icon="icon-info-sign" imgAlt="info.alt.img" deletionUrl="CobblerSnippetDelete.do?name=${cobblerSnippetsForm.map.name}" deletionType="snippets"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp index 7a09412..00f79a7 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" +<rhn:toolbar base="h1" icon="icon-info-sign" creationUrl="CobblerSnippetCreate.do" creationType="snippets" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp index cbb2092..e565c29 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -9,7 +9,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> +<rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> ${requestScope.snippet.displayName} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp index 5337034..3bb22d4 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp @@ -9,7 +9,7 @@ <meta http-equiv="Pragma" content="no-cache" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="treecreate.jsp.toolbar"/> </rhn:toolbar> <bean:message key="treecreate.jsp.header1"/> diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp index 1602d54..8112142 100644 --- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> +<rhn:toolbar base="h1" icon="icon-info-sign"> <bean:message key="probes.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp index 72855e1..7e97460 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp @@ -5,7 +5,7 @@ <html:html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="icon-info-sign" imgAlt="info.alt.img"> <bean:message key="preservation_create.jsp.toolbar"/> </rhn:toolbar> commit 3ca173ad1022de2a7d9888ab9d38866c4bf1b550 Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 17:13:01 2013 +0200 Update icons of Configuration/Configuration channels. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf index b1ae6f9..8f70d02 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf @@ -35,7 +35,7 @@ </c:if> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-config_namespace-2.gif" + <rhn:toolbar base="h1" icon="spacewalk-icon-Software-Channel-Management" imgAlt="config.common.globalAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details"> <bean:message key="channelOverview.jsp.newToolbar" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp index 8aab5d5..7b07e22 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_namespace-2.gif" imgAlt="config.jsp.imgAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-Software-Channel-Management" imgAlt="config.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central" creationUrl="/rhn/configuration/ChannelCreate.do?editing=true" creationType="configchannel" commit 34d1469dafe9fcae364373bdfab44c9c972d5766 Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 17:07:27 2013 +0200 Updated channel icons. diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp b/java/code/webapp/WEB-INF/pages/channel/custom.jsp index d8547dd..ce2ceb6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> <bean:message key="channel.nav.custom"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index a325714..16760eb 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -9,7 +9,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="packagesearch.jsp.imgAlt" + <rhn:toolbar base="h1" icon="icon-search" imgAlt="packagesearch.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> <bean:message key="packagesearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code/webapp/WEB-INF/pages/channel/popular.jsp index ce54772..fe16d36 100644 --- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> <bean:message key="channel.nav.popular"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp index 5a6605d..3599f6f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> <bean:message key="channel.nav.vendor"/> </rhn:toolbar> commit 8ad61979b5c9b1b2a7e7d5fa954699b32909e7f3 Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 17 16:59:46 2013 +0200 Fix ISE when changing user details on /rhn/users/UserDetails.do As reported by Tomáš Kašpárek. diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index 2c581c2..fd37766 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -62,7 +62,7 @@ </label> </div> - <hidden name="disabledRoles" value="${disabledRoles}"/> + <input type="hidden" name="disabledRoles" value="${disabledRoles}"/> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> commit 41355a1d48a095beaa7264923eb7eda03b10290b Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 16:58:12 2013 +0200 Changed Kickstart icons. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf index eed9476..8b4440b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/kickstart/KickstartDeleteAdvanced.do?ksid=${ksdata.id}" deletionType="kickstart" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf index 3bda9a3..755d202 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="kickstart.clone.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf index 4ed5f02..ccf4258 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="kickstartdelete.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf index bc8dbe3..3d3c99b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf @@ -1,7 +1,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/kickstart/KickstartDelete.do?ksid=${ksdata.id}" deletionType="kickstart" diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp index 66f381c..25acacd 100644 --- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> <bean:message key="keydelete.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp index 56ac956..e9a81c2 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> <c:out value="${requestScope.snippet.displayName}"/> </rhn:toolbar> <h2><bean:message key="cobbler.snippet.delete"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index 75e51db..021ea28 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" creationUrl="/rhn/kickstart/CreateProfileWizard.do" creationType="kickstart" imgAlt="kickstarts.alt.img" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp index 3b1c377..95acbbc 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp @@ -7,7 +7,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="kickstarts.alt.img"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="kickstarts.alt.img"> <bean:message key="kickstartranges.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 6d64ed1..0ad1089 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -7,7 +7,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" creationUrl="/rhn/kickstart/CreateProfileWizard.do" creationType="kickstart" imgAlt="kickstarts.alt.img" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp index ac63ec3..645970c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstid}" deletionType="deleteTree" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp index f239a49..5e0dcc0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"> +<rhn:toolbar base="h1" icon="icon-rocket"> <bean:message key="kickstartdelete.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp index 8e588c6..79a7788 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp @@ -17,7 +17,7 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <p> -<rhn:toolbar base="h2" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h2" icon="icon-rocket" deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}" deletionType="kickstartscript" > <bean:message key="kickstart.script.header1"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 8be640b..3279228 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" creationType="kickstartscript" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp index 029094c..0a4e8f4 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp @@ -15,7 +15,7 @@ </div> </c:if> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="distro-delete.jsp.header1" arg0="${kstree.label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp index 9ddbb99..23ffd9f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp @@ -12,7 +12,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" deletionType="deleteTree" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp index 192271b..2125033 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp @@ -20,7 +20,7 @@ function clickNewestTree(obj) { </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key ="kickstart.advanced.jsp.create"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp index acd1ae8..03b6055 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp @@ -5,7 +5,7 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" imgAlt="system.common.kickstartAlt" + <rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt" deletionUrl="/rhn/systems/provisioning/preservation/PreservationListDeleteSingle.do?file_list_id=${fileList.id}" deletionType="filelist"> <bean:message key="preservation_edit.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp index 644acbb..be0850a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp @@ -5,7 +5,7 @@ <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt" creationUrl="PreservationListCreate.do" creationType="filelist"> diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp index 06777c6..9a7a7d6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> <bean:message key="preservation_list.jsp.toolbar"/> </rhn:toolbar> commit 92943ef4fe0a7b15d6e73f21a0816093994a8e42 Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 16:21:53 2013 +0200 Changed a few more icons. diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index d2c2266..cade102 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-home" +<rhn:toolbar base="h1" icon="icon-dashboard" helpUrl=""> <bean:message key="bunch.edit.jsp.toolbar" arg0="${label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp index 4c5bff2..951ffdb 100644 --- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="icon-home" +<rhn:toolbar base="h1" icon="icon-dashboard" imgAlt="channels.overview.toolbar.imgAlt" creationUrl="/rhn/admin/ScheduleDetail.do" creationType="schedule" diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp index 70ef0b0..488710f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" icon="icon-home" +<rhn:toolbar base="h1" icon="icon-dashboard" helpUrl=""> <bean:message key="task.status.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp index 0b4755c..115b761 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="overview.jsp.alt" +<rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp"> <bean:message key="channel.jsp.manage.package.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp index 4c50a6c..fee77d3 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp @@ -21,7 +21,7 @@ </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="overview.jsp.alt" +<rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp"> <bean:message key="channel.jsp.manage.package.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf index 24968d0..0729494 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf @@ -1,6 +1,6 @@ -<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="package.jsp.alt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="package.jsp.alt"> <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_new" class="help-title"><img src="/img/rhn-icon-help.gif" alt="Help Icon" /></a> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf index 8b4b217..f3e266d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <html:xhtml/> <rhn:toolbar base="h1" - img="/img/rhn-icon-packages.gif" + icon="spacewalk-icon-packages" imgAlt="profile.list.header.alt" deletionUrl="/rhn/profiles/Delete.do?prid=${param.prid}" deletionType="profile"> diff --git a/java/code/webapp/WEB-INF/pages/profiles/list.jsp b/java/code/webapp/WEB-INF/pages/profiles/list.jsp index 7fe3d37..60d9eff 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/list.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/list.jsp @@ -8,7 +8,7 @@ <html> <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-packages.gif" + icon="spacewalk-icon-packages" imgAlt="profile.list.header.alt"> <bean:message key="profile.list.header" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp index efece3c..2f9feba 100644 --- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="packagesearch.jsp.imgAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="packagesearch.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> <bean:message key="packagesbyname.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp index 6940356..41783db 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-packages.gif" +<rhn:toolbar base="h2" icon="spacewalk-icon-packages" deletionUrl="/rhn/systems/details/packages/profiles/DeleteProfile.do?sid=${param.sid}&prid=${param.prid}" deletionType="profile"> <bean:message key="compare.jsp.compareto" arg0="${requestScope.profilename}" /> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index b75a0cd..1f045bd 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -34,7 +34,7 @@ </c:if> </head> <body> -<rhn:toolbar base="h1" icon="icon-home" imgAlt="yourrhn.jsp.toolbar.img.alt" +<rhn:toolbar base="h1" icon="icon-dashboard" imgAlt="yourrhn.jsp.toolbar.img.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp"> <bean:message key="yourrhn.jsp.toolbar"/> </rhn:toolbar> commit 6a3fbe466acb27af26b45ba6ee0647cd275c6d23 Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 17 16:26:00 2013 +0200 Put the summary in the right place on Credentials page diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index ca31051..0164c09 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -12,10 +12,10 @@ deletionType="credentials"> <bean:message key="Credentials"/> </rhn:toolbar> - <h2><bean:message key="credentials.jsp.susestudio" /></h2> <p class="lead"> <bean:message key="credentials.jsp.edit.summary" /> </p> + <h2><bean:message key="credentials.jsp.susestudio" /></h2> <form method="post" action="/rhn/account/Credentials.do" class="form-horizontal" role="form"> commit 9cb3df51290623910ca0fc88fc7458e70723ad99 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Oct 17 16:19:48 2013 +0200 TB3: Channels/Distribution Channel Mapping/Create new distromap form diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp index 2ee25db..ba1418e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp @@ -3,107 +3,106 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<c:choose> - <c:when test="${empty dcm}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img"> - <bean:message key="distchannelmap.jsp.create"/> - </rhn:toolbar> - <h2><bean:message key="distchannelmap.jsp.create"/></h2> - </c:when> - <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img" - deletionUrl="DistChannelMapDelete.do?dcm=${dcm}" - deletionType="distchannelmap"> - <bean:message key="distchannelmap.jsp.update"/> - </rhn:toolbar> - <h2><bean:message key="distchannelmap.jsp.update"/></h2> - </c:otherwise> -</c:choose> - -<div class="page-summary"> - <p><bean:message key="distchannelmap.jsp.edit.summary"/></p> -</div> - - -<html:form action="/channels/manage/DistChannelMapEdit"> - <rhn:csrf /> - <rhn:submitted/> - <table class="details"> - <tr> - <th> - <label for="os"> - <rhn:required-field key = "Operating System"/> - </label> - </th> - <td> - <html:text property="os" styleId="os"/> - </td> - </tr> - <tr> - <th> - <label for="release"> - <rhn:required-field key = "column.release"/> - </label> - </th> - <td> - <c:choose> - <c:when test="${empty dcm}"> - <html:text property="release" styleId="release" disabled="${not empty dcm}"/> - </c:when> - <c:otherwise> - <c:out value="${release}"/> - <html:hidden property="release" value="${release}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th> - <rhn:required-field key = "column.architecture"/> - </th> - <td> +<html:html> + <body> <c:choose> - <c:when test="${empty dcm}"> - <html:select property="architecture"> - <html:options collection="channelArches" - property="value" labelProperty="label" /> - </html:select> - </c:when> - <c:otherwise> - <c:out value="${architecture}"/> - <html:hidden property="architecture" value="${architecture}"/> - </c:otherwise> + <c:when test="${empty dcm}"> + <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img"> + <bean:message key="distchannelmap.jsp.create"/> + </rhn:toolbar> + <h2><bean:message key="distchannelmap.jsp.create"/></h2> + </c:when> + <c:otherwise> + <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img" + deletionUrl="DistChannelMapDelete.do?dcm=${dcm}" + deletionType="distchannelmap"> + <bean:message key="distchannelmap.jsp.update"/> + </rhn:toolbar> + <h2><bean:message key="distchannelmap.jsp.update"/></h2> + </c:otherwise> </c:choose> - </td> - </tr> - <tr> - <th> - <rhn:required-field key = "channel.edit.jsp.label"/> - </th> - <td> - <html:select property="channel_label"> - <html:options collection="channels" - property="value" labelProperty="label" /> - </html:select> - </td> - </tr> - </table> - - <div align="right"> - <hr /> - <c:choose> - <c:when test="${empty dcm}"> - <html:submit><bean:message key="distchannelmap.jsp.create.submit"/></html:submit> - </c:when> - <c:otherwise> - <html:submit><bean:message key="distchannelmap.jsp.update.submit"/></html:submit> - </c:otherwise> - </c:choose> - - <html:hidden property="dcm" value="${dcm}" /> -</html:form> - -</body> + <div class="page-summary"> + <p><bean:message key="distchannelmap.jsp.edit.summary"/></p> + </div> + <html:form action="/channels/manage/DistChannelMapEdit" + styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted/> + <div class="form-group"> + <label for="os" class="col-lg-3 control-label"> + <rhn:required-field key = "Operating System"/> + </label> + <div class="col-lg-6"> + <html:text property="os" styleId="os" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label for="release" class="col-lg-3 control-label"> + <rhn:required-field key = "column.release"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${empty dcm}"> + <html:text property="release" styleId="release" + styleClass="form-control" + disabled="${not empty dcm}"/> + </c:when> + <c:otherwise> + <input class="form-control" type="text" disabled value="<c:out value="${release}"/>" /> + <html:hidden property="release" value="${release}"/> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key = "column.architecture"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${empty dcm}"> + <html:select property="architecture" styleClass="form-control"> + <html:options collection="channelArches" + property="value" labelProperty="label" /> + </html:select> + </c:when> + <c:otherwise> + <div class="form-control"> + <c:out value="${architecture}"/> + </div> + <html:hidden property="architecture" value="${architecture}"/> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key = "channel.edit.jsp.label"/> + </label> + <div class="col-lg-6"> + <html:select property="channel_label" styleClass="form-control"> + <html:options collection="channels" + property="value" labelProperty="label" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test="${empty dcm}"> + <html:submit styleClass="btn btn-success"> + <bean:message key="distchannelmap.jsp.create.submit"/> + </html:submit> + </c:when> + <c:otherwise> + <html:submit styleClass="btn btn-success"> + <bean:message key="distchannelmap.jsp.update.submit"/> + </html:submit> + </c:otherwise> + </c:choose> + </div> + <html:hidden property="dcm" value="${dcm}" /> + </div> + </html:form> + </body> </html:html> commit d80cd64c922ef2a4b82126d56fe2be6d920ad9b4 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Oct 17 15:35:37 2013 +0200 TB3: Channels/Package search form diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 4415f53..a325714 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -4,149 +4,163 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> <html> -<head> -<script type="text/javascript" src="/javascript/highlander.js"></script> -</head> -<body> -<rhn:toolbar base="h1" icon="icon-search" imgAlt="packagesearch.jsp.imgAlt" - helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> - <bean:message key="packagesearch.jsp.toolbar"/> - </rhn:toolbar> - - <p><bean:message key="packagesearch.jsp.pagesummary"/></p> - - <p><bean:message key="packagesearch.jsp.instructions"/></p> - - <html:form action="/channels/software/Search.do"> - <rhn:csrf /> - -  - <div class="search-choices"> - - <div class="search-choices-group"> - <table class="details"> - <tr><th><bean:message key="packagesearch.jsp.searchfor"/></th> - <td> - <html:text property="search_string" name="search_string" value="${search_string}" accesskey="4"/> - <button type="submit" class="btn btn-default btn-sm"> - <span class="glyphicon glyphicon-search" /> - <bean:message key="button.search"/> - </button> - </td> - </tr> - <tr><th><bean:message key="packagesearch.jsp.whatsearch"/></th> - <td> - <div style="text-align: left"> - <html:select property="view_mode" value="${view_mode}" > - <html:options collection="searchOptions" - property="value" - labelProperty="display" /> - </html:select> - </div> - </td> - </tr> - <tr><th><bean:message key="packagesearch.jsp.wheresearch"/></th> - <td> - - <div style="text-align: left;"> - <input type="radio" name="whereCriteria" value="relevant" <c:if test="${whereCriteria eq 'relevant'}">checked</c:if> /><bean:message key="packagesearch.jsp.relevant"/> - </div> - <div style="text-align: left;"> - <input type="radio" name="whereCriteria" value="channel" <c:if test="${whereCriteria eq 'channel'}">checked</c:if> /><bean:message key="packagesearch.jsp.specificchannel"/><br/> - <div style="margin-left: 30px; margin-top: 5px;"> - <html:select property="channel_filter"> - <html:options collection="allChannels" - property="id" - labelProperty="name" /> - </html:select><br/> - </div> - </div> - <div style="text-align: left;"> - <input type="radio" name="whereCriteria" value="architecture" <c:if test="${whereCriteria eq 'architecture'}">checked</c:if> /><bean:message key="packagesearch.jsp.specificarch"/><br/> - <div style="margin-left: 30px; margin-top: 5px;"> - <html:select property="channel_arch" multiple="multiple" - size="5" onclick="javascript:highlander(this);"> - <html:options collection="channelArches" - property="value" - labelProperty="display" /> - </html:select><br/> - - <bean:message key="packagesearch.jsp.searchwherelegend"/> + <head> + <script type="text/javascript" src="/javascript/highlander.js"></script> + </head> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="packagesearch.jsp.imgAlt" + helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> + <bean:message key="packagesearch.jsp.toolbar"/> + </rhn:toolbar> + <p><bean:message key="packagesearch.jsp.pagesummary"/></p> + <p><bean:message key="packagesearch.jsp.instructions"/></p> + <html:form action="/channels/software/Search.do" styleClass="form-horizontal"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="packagesearch.jsp.searchfor"/> + </label> + <div class="col-lg-6"> + <div class="input-group"> + <html:text property="search_string" styleClass="form-control" + name="search_string" value="${search_string}" accesskey="4"/> + <span class="input-group-btn"> + <button type="submit" class="btn btn-default"> + <i class="icon-search"></i> + </button> + </span> </div> - </div> - - </td> - </tr> - <tr> - <th><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></th> - <td> - <div style="text-align: left"> - <html:checkbox property="fineGrained" styleId="fineGrainedlabel"><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox> - </div> - </td> - </tr> - </table> - </div> - - </div> - <input type="hidden" name="submitted" value="true" /> - </html:form> - - <c:if test="${search_string != null && search_string != ''}"> - - <hr /> - <c:set var="pageList" value="${requestScope.pageList}" /> -  - <c:forEach items="${requestScope.channel_arch}" var="item"> - <c:set var="archparams" value="${archparams}&channel_arch=${item}"/> - </c:forEach> - <rl:listset name="searchSet"> - <rhn:csrf /> - <rl:list name="searchResults" dataset="pageList" - emptykey="packagesearch.jsp.nopackages" width="100%" - filter="com.redhat.rhn.frontend.action.channel.PackageNameFilter"> - <rl:decorator name="PageSizeDecorator"/> - <rl:column bound="false" sortable="false" headerkey="packagesearch.jsp.name"> - <a href="/rhn/software/packages/NameOverview.do?package_name=${current.urlEncodedPackageName}${archparams}&search_subscribed_channels=${requestScope.relevant}&channel_filter=${requestScope.channel_filter}"> - <rhn:highlight tag="strong" text="${search_string}"> - ${current.packageName} - </rhn:highlight> - </a> - </rl:column> - <rl:column bound="false" sortable="false" headerkey="packagesearch.jsp.summary"> - <c:choose> - <c:when test="${param.view_mode != 'search_name'}"> - <rhn:highlight tag="strong" text="${search_string}"> - ${current.summary} - </rhn:highlight> - </c:when> - <c:otherwise> - ${current.summary} - </c:otherwise> - </c:choose> - - </rl:column> - </rl:list> - <rl:csv dataset="pageList" - name="searchResults" - exportColumns="packageName,summary"/> - -  - <input type="hidden" name="submitted" value="true" /> - <html:hidden property="search_string" name="search_string" value="${search_string}" /> - <input type="hidden" name="view_mode" value="${view_mode}" /> - <input type="hidden" name="whereCriteria" value="${whereCriteria}" /> - <input type="hidden" name="channel_filter" value="${channel_filter}" /> - <input type="hidden" name="fineGrained" value="${fineGrained}" /> - - <c:forEach items="${requestScope.channel_arch}" var="item"> - <input type="hidden" name="channel_arch" value="${item}" /> - </c:forEach> - - </rl:listset> - - </c:if> -</body> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="packagesearch.jsp.whatsearch"/> + </label> + <div class="col-lg-6"> + <html:select property="view_mode" value="${view_mode}" styleClass="form-control" > + <html:options collection="searchOptions" + property="value" + labelProperty="display" /> + </html:select> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="packagesearch.jsp.wheresearch"/> + </label> + <div class="col-lg-6"> + <div class="checkbox"> + <label> + <input type="radio" name="whereCriteria" + value="relevant" <c:if test="${whereCriteria eq 'relevant'}">checked</c:if> /> + <bean:message key="packagesearch.jsp.relevant"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="radio" name="whereCriteria" + value="channel" <c:if test="${whereCriteria eq 'channel'}">checked</c:if> /> + <bean:message key="packagesearch.jsp.specificchannel"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:select property="channel_filter" styleClass="form-control"> + <html:options collection="allChannels" + property="id" + labelProperty="name" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="radio" name="whereCriteria" + value="architecture" <c:if test="${whereCriteria eq 'architecture'}">checked</c:if> /> + <bean:message key="packagesearch.jsp.specificarch"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:select property="channel_arch" multiple="multiple" + styleClass="form-control" + size="5" onclick="javascript:highlander(this);"> + <html:options collection="channelArches" + property="value" + labelProperty="display" /> + </html:select> + <span class="help-block"> + <bean:message key="packagesearch.jsp.searchwherelegend"/> + </span> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <html:checkbox property="fineGrained" styleId="fineGrainedlabel" /> + <bean:message key="systemsearch.jsp.finegrained"/> + </label> + </div> + </div> + <input type="hidden" name="submitted" value="true" /> + </html:form> + + <c:if test="${search_string != null && search_string != ''}"> + <c:set var="pageList" value="${requestScope.pageList}" /> +  + <c:forEach items="${requestScope.channel_arch}" var="item"> + <c:set var="archparams" value="${archparams}&channel_arch=${item}"/> + </c:forEach> + <rl:listset name="searchSet"> + <rhn:csrf /> + <rl:list name="searchResults" dataset="pageList" + emptykey="packagesearch.jsp.nopackages" width="100%" + filter="com.redhat.rhn.frontend.action.channel.PackageNameFilter"> + <rl:decorator name="PageSizeDecorator"/> + <rl:column bound="false" sortable="false" headerkey="packagesearch.jsp.name"> + <a href="/rhn/software/packages/NameOverview.do?package_name=${current.urlEncodedPackageName}${archparams}&search_subscribed_channels=${requestScope.relevant}&channel_filter=${requestScope.channel_filter}"> + <rhn:highlight tag="strong" text="${search_string}"> + ${current.packageName} + </rhn:highlight> + </a> + </rl:column> + <rl:column bound="false" sortable="false" headerkey="packagesearch.jsp.summary"> + <c:choose> + <c:when test="${param.view_mode != 'search_name'}"> + <rhn:highlight tag="strong" text="${search_string}"> + ${current.summary} + </rhn:highlight> + </c:when> + <c:otherwise> + ${current.summary} + </c:otherwise> + </c:choose> + </rl:column> + </rl:list> + <rl:csv dataset="pageList" + name="searchResults" + exportColumns="packageName,summary"/> +  + <input type="hidden" name="submitted" value="true" /> + <html:hidden property="search_string" name="search_string" value="${search_string}" /> + <input type="hidden" name="view_mode" value="${view_mode}" /> + <input type="hidden" name="whereCriteria" value="${whereCriteria}" /> + <input type="hidden" name="channel_filter" value="${channel_filter}" /> + <input type="hidden" name="fineGrained" value="${fineGrained}" /> + <c:forEach items="${requestScope.channel_arch}" var="item"> + <input type="hidden" name="channel_arch" value="${item}" /> + </c:forEach> + </rl:listset> + </c:if> + </body> </html> commit d2952699ffabbc50034107cc2b2be0b909b3e5cf Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Oct 17 15:23:13 2013 +0200 Changed a few icons diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp index 90de0ba..79b4021 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif" +<rhn:toolbar base="h1" icon="icon-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" > diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp index a92eed7..fa44887 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif" +<rhn:toolbar base="h1" icon="icon-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" > diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index fb45abf..594b9df 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -9,7 +9,7 @@ <meta name="name" value="activationkeys.jsp.header" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif" +<rhn:toolbar base="h1" icon="icon-key" imgAlt="activation-keys.common.alt" creationUrl="/rhn/activationkeys/Create.do" creationType="activationkeys" diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp index b4024db..7401e8f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> <bean:message key="Addresses" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index 33c3f38..d2c2266 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif" +<rhn:toolbar base="h1" icon="icon-home" helpUrl=""> <bean:message key="bunch.edit.jsp.toolbar" arg0="${label}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp index b21bbeb..b980e85 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp @@ -5,7 +5,7 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-config_management.gif" + <rhn:toolbar base="h1" icon="icon-cog" helpUrl=""> <bean:message key="generalconfig.jsp.header1"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp index cbb29b8..50dd72a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp @@ -5,7 +5,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"> <bean:message key="schedule.edit.jsp.toolbar" arg0="${schedulename}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp index e9eacab..b02ed3a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp @@ -5,7 +5,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> <bean:message key="disableself.jsp.account_deactivation" /> </rhn:toolbar> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp index 0bc17e1..427083e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp @@ -5,7 +5,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"> +<rhn:toolbar base="h1" icon="icon-user"> <bean:message key="disableselfconfirm.jsp.warning_question" /> </rhn:toolbar> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp index 1706861..f8cdf68 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif"> <bean:message key="filtercreate.jsp.header1" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp index 0a34e3c..a67de42 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif"> <bean:message key="filteredit.jsp.header1" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp index 953e00b..35da59e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" creationUrl="FilterCreate.do" creationType="filter" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp index 875796a..ab7df8c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-config_management.gif" + <rhn:toolbar base="h1" icon="icon-cog" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probe-create.jsp.header1" arg0="${probeSuite.suiteName}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp index 68fdbbd..aaf183c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp @@ -20,7 +20,7 @@ } //--> </script> - <rhn:toolbar base="h1" img="/img/rhn-config_management.gif" + <rhn:toolbar base="h1" icon="icon-cog" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probe-edit.jsp.header1" arg0="${probe.description}" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp index aef9870..5ea078a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp @@ -9,7 +9,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_management.gif" +<rhn:toolbar base="h1" icon="icon-cog" creationUrl="ProbeSuiteProbeCreate.do?suite_id=${suite_id}" creationType="probe" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp index 4045e6e..f5c96e7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probesuitecreate.jsp.header1" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp index 72f7b8b..fde286f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probesuiteedit.jsp.header1" arg0="${probeSuite.suiteName}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp index 2eb7b6b..fef5805 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp @@ -9,7 +9,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" creationUrl="ProbeSuiteCreate.do" creationType="probesuite" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp index e21f045..eed3c55 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probesuitesremoveconfirm.jsp.header1"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index 6946a90..b9ffc69 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" creationUrl="ProbeSuiteSystemsEdit.do?suite_id=${probeSuite.id}" creationType="probesuitesystem" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index 2ab7059..a437d55 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -7,7 +7,7 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" + <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites"> <bean:message key="probesuitesystemsedit.jsp.header1" arg0="${probeSuite.suiteName}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index a242c3a..c1985d7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -15,7 +15,7 @@ function setOrgClicked(target) { </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp index 6e8cba8..493cb0b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp @@ -8,7 +8,7 @@ <head> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp index 827b5b8..c466791 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -8,7 +8,7 @@ <head> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp index a333d66..1830b01 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -10,7 +10,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp index 767ab97..ef6dae6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp index d225e0c..c2e729350 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp @@ -7,7 +7,7 @@ <head> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" +<rhn:toolbar base="h1" icon="icon-desktop" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp index df39e39..ad1e320 100644 --- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp @@ -6,7 +6,7 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" + <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}" deletionAcl="user_role(satellite_admin); formvar_exists(schid)" deletionType="schedule"> diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp index 9506918..4c5bff2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp @@ -9,7 +9,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif" +<rhn:toolbar base="h1" icon="icon-home" imgAlt="channels.overview.toolbar.imgAlt" creationUrl="/rhn/admin/ScheduleDetail.do" creationType="schedule" diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp index ad319bc..70ef0b0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif" +<rhn:toolbar base="h1" icon="icon-home" helpUrl=""> <bean:message key="task.status.title"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp index 1bea056..2d22e62 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp index 3457460..d296719 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 98d83e1..d870e07 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-deactivated" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp index c2f328f..40c537a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt"> +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt"> <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index d2b96f5..e4d8aba 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -10,7 +10,7 @@ <meta name="name" value="Users" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" +<rhn:toolbar base="h1" icon="icon-user" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp"> <bean:message key="userconfirm.jsp.header" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp index fc002d8..eb4fb8a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-all" creationUrl="/rhn/users/CreateUser.do?account_type=into_org" creationType="user"> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index bb65df7..441a2e4 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -15,7 +15,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="auditsearch.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp index 18c43ef..a808c5e 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp @@ -15,7 +15,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="auditsearch.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp index 46f28b9..ffcd114 100644 --- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp @@ -13,7 +13,7 @@ <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"> +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt"> <bean:message key="system.audit.listscap.jsp.overview"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp b/java/code/webapp/WEB-INF/pages/audit/machine.jsp index 60767cd..f7ce1cb 100644 --- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="audit.overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp b/java/code/webapp/WEB-INF/pages/audit/overview.jsp index 239afbd..d581c8b 100644 --- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="audit.jsp.alt" helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp"> <bean:message key="audit.overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp index 1a126a8..01fbdeb 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp @@ -10,7 +10,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> <bean:message key="scapdiff.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp index 7d9fb77..1a33f68 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp @@ -21,7 +21,7 @@ div.differs { </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> <bean:message key="scapdiff.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index 10699dc..1e92221 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -23,7 +23,7 @@ <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="search.alt.img"> +<rhn:toolbar base="h1" icon="icon-search" imgAlt="search.alt.img"> <bean:message key="scapsearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/webapp/WEB-INF/pages/channel/all.jsp index f80a972..26cd8c1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/all.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(4); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="channels.overview.toolbar.imgAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" > <bean:message key="channels.all.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp index dcf7721..a967c02 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp @@ -10,7 +10,7 @@ </head> <body onLoad="onLoadStuff(3); showAllRows();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="channels.jsp.alt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.jsp.alt"> ${requestScope.familyName} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp index ca7822f..f1fc736 100644 --- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp @@ -11,7 +11,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-systems-entitlements" imgAlt="channels.jsp.alt"> <bean:message key="entitlements.jsp.header"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index efba69f..ac6c85f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -5,7 +5,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"> <bean:message key="channel.delete.jsp.toolbar" arg0="${channel.name}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp index 3356638..a0780fb 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -23,7 +23,7 @@ document.getElementById("checksum").value = baseChannelChecksums[document.getEle } </script> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}" deletionAcl="user_role(channel_admin); formvar_exists(cid)" deletionType="software.channel"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp index 1a2f3b9..64fec19 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt" creationUrl="/rhn/channels/manage/Edit.do" creationType="channel" diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 4cb6642..4415f53 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -10,7 +10,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="packagesearch.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-search" imgAlt="packagesearch.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search"> <bean:message key="packagesearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp b/java/code/webapp/WEB-INF/pages/channel/retired.jsp index 5b72696..ffe9a5f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp @@ -17,7 +17,7 @@ function showFiltered() { </head> <body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="channels.overview.toolbar.imgAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> <bean:message key="channels.retired.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp b/java/code/webapp/WEB-INF/pages/channel/shared.jsp index 29bb4cd..d74e035 100644 --- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp @@ -19,7 +19,7 @@ function showFiltered() { <body onLoad="onLoadStuff(4); showFiltered();"> <rhn:toolbar base="h1" - img="/img/rhn-icon-channels.gif" + icon="spacewalk-icon-software-channels" imgAlt="channels.overview.toolbar.imgAlt"> <bean:message key="channel.nav.shared"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf index 26faeff..aadc347 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf @@ -1,6 +1,6 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif" +<rhn:toolbar base="h1" icon="icon-key" imgAlt="activation-keys.common.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf index 004c334..a471235 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf @@ -1,6 +1,6 @@ -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="channels.jsp.alt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="channels.jsp.alt"> <c:out value="${channel_name}" escapeXml="true"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf index dfe216e..7b08071 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf @@ -1,4 +1,4 @@ -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-channel-manage" deletionUrl="/rhn/channels/manage/Delete.do?cid=${cid}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf index 5c9f376..3e7b83d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <html:xhtml/> <rhn:toolbar base="h1" - img="/img/rhn-icon-system_group.gif" + icon="spacewalk-icon-system-groups" imgAlt="ssm.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm"> <bean:message key="ssm.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf index 3698327..a17b3fd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -14,7 +14,7 @@ <c:set var="img" value="action-add.gif" /> </c:if> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" +<rhn:toolbar base="h1" icon="icon-user" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s3-sm-user-active-details" miscUrl="${url}" miscAcl="user_role(org_admin)" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index 5da6529..b0dc83a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems" > <bean:message key="managedsystems.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index b0ebef9..222fa73 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -11,7 +11,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-config_management.gif" imgAlt="config.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-cog" imgAlt="config.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-overview" > <bean:message key="configoverview.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp index 600324c..4efe5cc 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp @@ -8,7 +8,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"> <bean:message key="targetsystems.jsp.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp index 091e078..aee619f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - img="/img/rhn-icon-system.gif" + icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcdeployfile.jsp.header" arg0="${system.name}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp index 9690d68..66c18c1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" > +<rhn:toolbar base="h2" icon="icon-desktop" > <bean:message key="sdcdeployconfirm.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp index 7479c85..694480a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - img="/img/rhn-icon-system.gif" + icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcdifffile.jsp.header" arg0="${fn:escapeXml(system.name)}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp index de5bd3d..99dfb08 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" > +<rhn:toolbar base="h2" icon="icon-desktop" > <bean:message key="sdcdiffconfirm.jsp.header" arg0="${fn:escapeXml(system.name)}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index bb13303..a4f1ff1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <rhn:toolbar base="h2" - img="/img/rhn-icon-system.gif" + icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="sdcimportfile.jsp.header" arg0="${fn:escapeXml(system.name)}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index 0086c71..d52f159 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -11,7 +11,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" > +<rhn:toolbar base="h2" icon="icon-desktop" > <bean:message key="sdcimportconfirm.jsp.header" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index 18ccef7..162b00c 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> <bean:message key="credentials.jsp.delete.dispatch" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 400b244..ca31051 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="users.jsp.imgAlt" + <rhn:toolbar base="h1" icon="icon-user" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" deletionUrl="/rhn/account/DeleteCredentials.do" deletionType="credentials"> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 90258f8..96e8025 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -25,7 +25,7 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" +<rhn:toolbar base="h1" icon="icon-search" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search" imgAlt="search.alt.img"> <bean:message key="erratasearch.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 38c4f8b..98dca42 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -10,7 +10,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="docsearch.jsp.imgAlt" +<rhn:toolbar base="h1" icon="icon-search" imgAlt="docsearch.jsp.imgAlt" helpUrl=""> <bean:message key="docsearch.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index ad92142..93667d1 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -9,7 +9,7 @@ <meta name="name" value="activationkeys.jsp.header" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}" deletionAcl="user_role(channel_admin); formvar_exists(cid)" deletionType="software.channel"> diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp index 658a36a..cb83d49 100644 --- a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp +++ b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp @@ -9,7 +9,7 @@ <script src="/javascript/iso_download.js" type="text/javascript"> </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="common.download.channelAlt"> +<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" imgAlt="common.download.channelAlt"> <c:choose> <c:when test="${empty channel}"> <decorator:getProperty property="meta.name" /> diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp index 045c575..54f19f7 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp @@ -8,7 +8,7 @@ <html> <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-system_group.gif" + icon="spacewalk-icon-system-groups" imgAlt="ssm.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm"> <bean:message key="ssm.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp index b077f80..324494d 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp @@ -8,7 +8,7 @@ <html> <body> <rhn:toolbar base="h1" - img="/img/rhn-icon-system_group.gif" + icon="spacewalk-icon-system-groups" imgAlt="ssm.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm"> <bean:message key="ssm.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp index 2444850..44a10c7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp index b7ee47b..e6f9e39 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -39,7 +39,7 @@ </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp index 3abf1de..070474a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp @@ -7,7 +7,7 @@ <html:xhtml/> <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="duplicates.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp index 7619ca2..c0d072d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none"/> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="overview.jsp.alt"> +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="overview.jsp.alt"> <bean:message key="systementitlements.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index b2b41a9..fb42ade 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -27,7 +27,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp index 6885cdc..a6bb28f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp @@ -14,7 +14,7 @@ </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> <p/> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp index 1a5ddc7..f393fb0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp @@ -14,7 +14,7 @@ </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> <p/> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp index 9ce55e1..a63c62a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp @@ -13,7 +13,7 @@ </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="virtualentitlements.toolbar" /> </rhn:toolbar> <p/> diff --git a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp index e0ea646..05e8cf5 100644 --- a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="extrapackagessystemslist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp index 0d5ac6b..a364cee 100644 --- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif" imgAlt="system.common.groupAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" imgAlt="system.common.groupAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" creationUrl="/rhn/groups/CreateGroup.do" creationType="group" diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp index 33774c9..440d9be 100644 --- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="inactivelist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp index c451ec4..5baf16d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> <bean:message key="outofdatelist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp index 89728cc..89d448d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="overview.jsp.alt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-overview"> <bean:message key="overview.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp index ebf76a3..84832a2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp"> <bean:message key="systemlist.jsp.physicalheader"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp index e8c9e10..3e3d726 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp @@ -10,7 +10,7 @@ </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif"> + <rhn:toolbar base="h2" icon="icon-desktop"> <bean:message key="probeedit.jsp.editprobe" /> </rhn:toolbar> <html:form action="/systems/details/probes/ProbeCreate" method="POST" styleClass="form-horizontal"> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 33208dd..7709bb7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <c:if test="${is_suite_probe}"> - <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" + <rhn:toolbar base="h2" icon="icon-desktop" miscAlt="probedetails.jsp.editsuiteprobe" miscImg="action-clone.gif" miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}" @@ -23,7 +23,7 @@ </rhn:toolbar> </c:if> <c:if test="${not is_suite_probe}"> - <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" + <rhn:toolbar base="h2" icon="icon-desktop" deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe" miscAlt="probedetails.jsp.editthisprobe" diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp index cf69df3..a268a03 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp @@ -24,7 +24,7 @@ function refreshNotifFields() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" +<rhn:toolbar base="h2" icon="icon-desktop" deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe"> <bean:message key="probeedit.jsp.editprobe" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp index 2ec3ee4..c01398d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp @@ -14,7 +14,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes" +<rhn:toolbar base="h2" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes" creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}" creationType="probe" > <bean:message key="probes.index.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp index 304554e..f4c9082 100644 --- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-proxy"> <bean:message key="proxylist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 226313e..2d945a4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -11,7 +11,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-list-rregistered"> <bean:message key="registeredlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp index d5cb310..afc2b79 100644 --- a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> <bean:message key="requiringrebootlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index b40949a..ff061ee 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -11,7 +11,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt"> <bean:message key="systemcurrency.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp index 0ee1b9e..7582149 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp"> <bean:message key="systemlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index 4f7f10b..46ce247 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -6,7 +6,7 @@ <html:html xhtml="true"> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" + <rhn:toolbar base="h1" icon="icon-search" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-search" imgAlt="search.alt.img"> <bean:message key="systemsearch.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp index 0bc6837..08aa829 100644 --- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-lists3-sm-system-list-unent"> <bean:message key="unentitledlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp index 5ad8f0e..4319e0c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" +<rhn:toolbar base="h1" icon="icon-desktop" imgAlt="system.common.systemAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ungrp"> <bean:message key="ungroupedlist.jsp.header"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp index d4bfc38..5881a96 100644 --- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" +<rhn:toolbar base="h1" icon="icon-desktop" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-virtual"> <bean:message key="virtuallist.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp index 35ad0d3..31d1a84 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -18,7 +18,7 @@ </c:if> <c:if test="${account_type == 'into_org'}" > - <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="user.common.userAlt" + <rhn:toolbar base="h1" icon="icon-user" imgAlt="user.common.userAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp"> <bean:message key="usercreate.toolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index 327559c..b764a3d 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -7,7 +7,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" imgAlt="user.common.userAlt"> + <rhn:toolbar base="h1" icon="icon-user" imgAlt="user.common.userAlt"> <bean:message key="Addresses"/> </rhn:toolbar> <h2> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp index e99cb61..4372532 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" + <rhn:toolbar base="h1" icon="icon-user" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" imgAlt="users.jsp.imgAlt"> <bean:message key="yourchangeemail.jsp.title"/> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index 717a50e..d3c6ced 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif" + <rhn:toolbar base="h1" icon="icon-user" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account" imgAlt="users.jsp.imgAlt"> <bean:message key="details.jsp.account_details" /> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index 2a689cb..b75a0cd 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -34,7 +34,7 @@ </c:if> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif" imgAlt="yourrhn.jsp.toolbar.img.alt" +<rhn:toolbar base="h1" icon="icon-home" imgAlt="yourrhn.jsp.toolbar.img.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp"> <bean:message key="yourrhn.jsp.toolbar"/> </rhn:toolbar> commit 1e95ed030945c0af84184038fc7b1363d54f50c8 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 17 15:07:45 2013 +0200 perl: port the toolbar move the pull-right for the links to the css as a mixin (DRY) diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index c3ba95e..9845b43 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -464,6 +464,7 @@ h1 .icon-stack { /* spacewalk toolbar */ .spacewalk-toolbar { + .pull-right; padding: .5em 1em; a { border-right:1px solid @gray-light; @@ -498,4 +499,4 @@ h1 .icon-stack { /* btn with margin top and bottom */ .btn.spacewalk-btn-margin-vertical{ margin: 1em 0 -} \ No newline at end of file +} diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index 2a204ba..109410a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -476,7 +476,7 @@ public class ToolbarTag extends TagSupport { baseTag.setAttribute("class", "spacewalk-toolbar-" + getBase()); toolbarDivTag = new HtmlTag("div"); - toolbarDivTag.setAttribute("class", "spacewalk-toolbar pull-right"); + toolbarDivTag.setAttribute("class", "spacewalk-toolbar"); buf.append(baseTag.renderOpenTag()); buf.append(toolbarDivTag.renderOpenTag()); diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 681e9d2..4c162d2 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -77,6 +77,7 @@ sub toolbar { my %params = @_; my $img = ''; + my $icon = ''; my $help = ''; my @toolbar; my $base = $params{base}; @@ -87,7 +88,10 @@ sub toolbar { $img = PXT::HTML->img(-src => $params{img}, -alt => $params{'alt'} || ''); } - + + if (defined $params{icon}) { + $icon= sprintf(qq{<i class="$params{icon}"></i>}); + } if (defined $params{'help-url'}) { $help = rhn_help($pxt, (href => $params{'help-url'}, @@ -106,6 +110,10 @@ sub toolbar { img => $params{'misc-img'}, alt => $params{'misc-alt'}, text => $params{'misc-text'})); + } elsif (defined $params{'misc-icon'} and $acl->eval_acl($pxt, $params{'misc-acl'} || '')) { + push @toolbar, misc_link($pxt, (url => $params{'misc-url'}, + img => $params{'misc-icon'}, + text => $params{'misc-text'})); } if (defined $params{'creation-url'} and $acl->eval_acl($pxt, $params{'creation-acl'} || '')) { @@ -119,28 +127,33 @@ sub toolbar { my $toolbar = join(" | ", @toolbar); - return qq{<div class="toolbar-$base"><div class="toolbar">$toolbar</div>$img $params{__block__}$help</div>}; + return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div>$img $icon $params{__block__}$help</div>}; } sub creation_link { my $pxt = shift; my %params = @_; - return qq{<span class="toolbar"><a href="$params{url}"><img src="/img/action-add.gif" alt="create new $params{type}" title="add new $params{type}" />create new $params{type}</a></span>}; + return qq{<a href="$params{url}"><i class="icon-plus"></i>create new $params{type}</a>}; } sub deletion_link { my $pxt = shift; my %params = @_; - return qq{<span class="toolbar"><a href="$params{url}"><img src="/img/action-del.gif" alt="delete $params{type}" title="delete $params{type}" />delete $params{type}</a></span>}; + return qq{<a href="$params{url}"><i class="icon-trash"></i>delete $params{type}</a>}; } sub misc_link { my $pxt = shift; my %params = @_; - return qq{<span class="toolbar"><a href="$params{url}"><img src="$params{img}" alt="$params{'alt'}" title="$params{'alt'}" />$params{text}</a></span>}; + if (defined $params{icon}) { + return qq{<a href="$params{url}"><i class="$params{icon}"></i>$params{text}</a>}; + } + else { + return qq{<a href="$params{url}"><img src="$params{img}" alt="$params{'alt'}" title="$params{'alt'}" />$params{text}</a>}; + } } sub rhn_help { commit bece236170ccefbc1dca12b9846b9413b22a6d2a Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 17 15:06:44 2013 +0200 port content-nav in perl diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm index 79b3022..7ace754 100644 --- a/web/modules/sniglets/Sniglets/Navi/Style.pm +++ b/web/modules/sniglets/Sniglets/Navi/Style.pm @@ -160,7 +160,7 @@ sub recursive_type { sub pre_nav { my $self = shift; - return qq{\n<div class="content-nav">}; + return qq{\n<div class="spacewalk-content-nav">}; } sub post_nav { @@ -179,19 +179,10 @@ sub pre_level { my $level_style = $self->level_style($level); if ($level_style) { - $ret = qq{\n<ul class="$level_style">} + $ret = qq{\n<ul class="nav nav-tabs $level_style">} } else { - $ret = qq{\n<ul>}; - } - - if ($level == 1) { - - $ret = sprintf("%s%s",<<EOQ, $ret); -<div class="contentnav-row2"> -<div class="top"></div> -<div class="bottom"> -EOQ + $ret = qq{\n<ul class="nav nav-tabs">}; } return $ret; @@ -203,41 +194,17 @@ sub post_level { my $ret = "</ul>\n"; - if ((defined $depth) and ($depth == 1)) { - $ret .= "\n</div>\n</div>\n"; - } - return $ret; } -sub level_style { - my $class = shift; - my $level = shift; - - if ($level == 0) { - return "content-nav-rowone"; - } - elsif ($level == 1) { - return "content-nav-rowtwo"; - } - elsif ($level == 2) { - return "content-nav-rowthree"; - } -} - sub item_style_active { - return "content-nav-selected"; + return "active"; } sub item_style_type { return "class"; } -sub link_style_active { - return "content-nav-selected-link"; -} - - package Sniglets::Navi::Style::sidenav; use base qw/Sniglets::Navi::Style::ul/; commit 7420a6b964ee48bc59160fd6d71f37fef98e92f9 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Oct 17 15:03:53 2013 +0200 paddings deleted from header diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 9083d7e..c3ba95e 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -19,10 +19,12 @@ .make-row(0); .spacewalk-logo { .make-md-column(3); + padding-left: 0; } .spacewalk-header-links { .make-md-column(9); .text-right; + padding-right: 0; } } commit da826ae24ba5221fd04e28a77323b6e2329bb516 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Oct 17 15:02:19 2013 +0200 Language files changed: they have the style of Vew System Groups inside diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index df6e355..92af70f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>সিস্টেমের আইকন</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>সিস্টেম (<a href="/rhn/systems/Overview.do?showgroups=true">সিস্টেম দল প্রদর্শন</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> সিস্টেম দল প্রদর্শন </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 1c6d391..1016dc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5402,11 +5402,11 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ <target>System-Icon</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Systeme (<a href="/rhn/systems/Overview.do?showgroups=true">Systemgruppen ansehen</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Systemgruppen ansehen </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 42392f6..9ed783a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -4705,7 +4705,7 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index bbc8416..97bcc51 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5401,11 +5401,11 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta <target>Icono de Sistema</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Sistemas (<a href="/rhn/systems/Overview.do?showgroups=true">Ver grupos de sistemas</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver grupos de sistemas </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index aaa819a..00736e2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5402,11 +5402,11 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta <target>Icône Système</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Systèmes (<a href="/rhn/systems/Overview.do?showgroups=true">Afficher les groupes de systèmes</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Afficher les groupes de systèmes </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 017fde5..0fafdd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>સિસ્ટમ ચિહ્ન</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>સિસ્ટમો (<a href="/rhn/systems/Overview.do?showgroups=true">સિસ્ટમ જૂથો જુઓ</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> સિસ્ટમ જૂથો જુઓ </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 292e29c..f3f6577 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>सिस्टम प्रतीक चिह्न</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>सिस्टम (<a href="/rhn/systems/Overview.do?showgroups=true">सिस्टम समूह देखें</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> सिस्टम समूह देखें </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index a272a79..167bea4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Icona sistema</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Sistemi (<a href="/rhn/systems/Overview.do?showgroups=true">Visualizza Gruppi di sistemi</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Visualizza Gruppi di sistemi </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 4e49029..32e8748 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5403,11 +5403,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>システムアイコン</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>システム (<a href="/rhn/systems/Overview.do?showgroups=true">システムグループの表示</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> システムグループの表示 </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index a70ff43..cd89ec4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5400,11 +5400,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>시스템 아이콘</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>시스템 (<a href="/rhn/systems/Overview.do?showgroups=true">시스템 그룹 보기</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 시스템 그룹 보기 </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 32c084b..bc200d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>ਸਿਸਟਮ ਆਈਕਾਨ</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>ਸਿਸਟਮ (<a href="/rhn/systems/Overview.do?showgroups=true">ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index a913255..3f7b69d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5399,11 +5399,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Ícone Sistema</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Sistemas (<a href="/rhn/systems/Overview.do?showgroups=true">Ver Grupos de Sistemas</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver Grupos de Sistemas </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index c664474..93e8bb9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Значок системы</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>Системы (<a href="/rhn/systems/Overview.do?showgroups=true">Группы систем</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Группы систем </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 20426ee..95478bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>கணினி சின்னம்</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>கணினிகள் (<a href="/rhn/systems/Overview.do?showgroups=true">கணினி குழுக்களை பார்வையிடுதல்</a>)</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> கணினி குழுக்களை பார்வையிடுதல் </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index d3ad636..cc0bf29 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>系统图标</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>系统（<a href="/rhn/systems/Overview.do?showgroups=true">查看系统组群</a>）</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 查看系统组群 </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index b026ccb..4810545 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s <target>系統圖示</target> </trans-unit> <trans-unit id="overview.jsp.systems"> - <source>Systems (<a href="/rhn/systems/Overview.do?showgroups=true">View System Groups</a>)</source> + <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/Overview</context> </context-group> - <target>系統（<a href="/rhn/systems/Overview.do?showgroups=true">檢視系統群組</a>）</target> + <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 檢視系統群組 </div> </a></target> </trans-unit> <trans-unit id="overview.jsp.groups"> <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source> commit 8b5e882e8297c867e9a128c57cd187767d21dd4f Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 17 14:45:55 2013 +0200 Support development mode also for perl pages Needs Sniglets::Users, because rhn-require is defined there. diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt index 10f24b1..7bd0ee7 100644 --- a/branding/templates/header.pxt +++ b/branding/templates/header.pxt @@ -1,15 +1,22 @@ <pxt-passthrough> <head> <pxt-use class="Sniglets::Navi" /> + <pxt-use class="Sniglets::Users" /> <title><rhn-navi-page-title /></title> <link rel="shortcut icon" href="/img/favicon.ico" /> <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> - <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> - <script type="text/javascript">less = { env: 'development' };</script> - <script src="/javascript/less.js"></script> + <rhn-require acl="global_config(development_environment)"> + <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> + <script type="text/javascript">less = { env: 'development' };</script> + <script src="/javascript/less.js"></script> + </rhn-require> + <rhn-require acl="not global_config(development_environment)"> + <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk.css" /> + </rhn-require> + <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> commit 649a8a663b756a224cba367e80014e925ce9ef88 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Oct 17 14:16:21 2013 +0200 New styles applied to the main objects in System Overview diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index b0d1638..7e602ee 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -594,7 +594,7 @@ public class ListDisplayTag extends BodyTagSupport { page.append("&" + request.getQueryString()); } out.println("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + page + - "\"><i class=\"icon-download-alt\"></i>" + + "\"><i class=\"spacewalk-icon-download-csv\"></i>" + LocalizationService.getInstance().getMessage("listdisplay.csv") + "</a></div>"); } @@ -663,7 +663,7 @@ public class ListDisplayTag extends BodyTagSupport { btnSpan.setAttribute("class", "input-group-btn"); HtmlTag btn = new HtmlTag("button"); - btn.setAttribute("class", "btn btn-default icon-filter"); + btn.setAttribute("class", "btn btn-default icon-eye-open"); btn.setAttribute("type", "submit"); btn.setAttribute("name", FILTER_DISPATCH); //input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index 3d5202a..2a204ba 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -533,14 +533,22 @@ public class ToolbarTag extends TagSupport { HtmlTag tag = new HtmlTag("a"); tag.setAttribute("href", getHelpUrl()); tag.setAttribute("target", "_new"); - tag.setAttribute("class", "help-title"); - - HtmlTag i = new HtmlTag("i"); - i.setAttribute("class", "icon-question text-info"); - - tag.addBody(i.renderOpenTag()); - tag.addBody(i.renderCloseTag()); - + //tag.setAttribute("class", "help-title"); + + HtmlTag stack = new HtmlTag("span"); + stack.setAttribute("class", "icon-stack"); + + HtmlTag iBack = new HtmlTag("i"); + iBack.setAttribute("class", "icon-circle icon-stack-base"); + HtmlTag iFront = new HtmlTag("i"); + iFront.setAttribute("class", "icon-question icon-light"); + + stack.addBody(iBack.renderOpenTag()); + stack.addBody(iBack.renderCloseTag()); + stack.addBody(iFront.renderOpenTag()); + stack.addBody(iFront.renderCloseTag()); + + tag.addBody(stack); return tag.render(); } return ""; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java index f5f9378..0e729a7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java @@ -197,7 +197,7 @@ public class CSVTag extends BodyTagSupport { StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI); page.append("?" + makeCSVRequestParams()); String exportLink = new String("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + - page + "\"><i class=\"icon-download-alt\"></i>" + + page + "\"><i class=\"spacewalk-icon-download-csv\"></i>" + LocalizationService.getInstance().getMessage( "listdisplay.csv") + "</a></div>"); ListTagUtil.write(pageContext, exportLink); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 1b796f5..be4a0c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -483,14 +483,14 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, "<div class=\"filter-input row\">"); // column with the filter - ListTagUtil.write(pageContext, "<div class=\"col-md-4 text-left\">"); + ListTagUtil.write(pageContext, "<div class=\"col-md-3 text-left\">"); if (filter != null && manip.getUnfilteredDataSize() != 0) { ListTagUtil.renderFilterUI(pageContext, filter, getUniqueName(), width, columnCount, searchParent, searchChild); } ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, "<div class=\"col-md-8 text-right\">"); + ListTagUtil.write(pageContext, "<div class=\"col-md-9 text-right\">"); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.beforeTopPagination(); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index dfd31ee..f907f8b 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -691,7 +691,7 @@ public class ListTagUtil { )); sb.append("<span class=\"input-group-btn\">"); sb.append(String.format("<button value=\"%s\" type=\"submit\" name=\"%s\" " + - " class=\"btn btn-default\"><i class=\"icon-filter\"></i>", + " class=\"btn btn-default spacewalk-button-filter\"><i class=\"icon-eye-open\"></i>", ls.getMessage(RequestContext.FILTER_KEY), filterName)); sb.append("</button>"); diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 4acef1c..67bae47 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -51,8 +51,8 @@ </rl:list> <span class="full-width-note-right"> - <a href="/rhn/systems/SystemGroupList.do"> - <bean:message key="yourrhn.jsp.allgroups" /> + <a href="/rhn/systems/SystemGroupList.do"> + <div class="btn btn-default spacewalk-btn-margin-vertical"><bean:message key="yourrhn.jsp.allgroups" /></div> </a> </span> diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp index 4e92fd7..89728cc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -20,7 +20,7 @@ <rhn:csrf /> <rhn:submitted /> <c:if test="${not groups}"> - <h2><bean:message key="overview.jsp.systems"/></h2> + <bean:message key="overview.jsp.systems"/> <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %> </c:if> commit 2a8f3377b772614cd2100a1de2ffb4cddd6c2fd2 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Oct 17 14:14:02 2013 +0200 Less re-organized diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index be91789..9083d7e 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -149,9 +149,17 @@ i[class^="icon-"], i[class*=" icon-"], i[class*="spacewalk-icon"], i[class^="spacewalk-icon"] { - margin-right: .5em; + margin-right: .5em; +} +/* if the icon is inside a H tag we wont use a margin*/ +h1, h2, h3, h4, h5, h6{ + i[class^="icon-"], + i[class*=" icon-"], + i[class*="spacewalk-icon"], + i[class^="spacewalk-icon"] { + margin-right: 0; + } } - /* color for icon */ .spacewalk-icon-green { color: @spacewalk-updates-green @@ -403,22 +411,16 @@ aside .sideleg { padding: .5em 1em; border-radius: 4px; margin: 2em auto; - font-size: 1em -} -aside .sideleg:hover { - background: @spacewalk-blue; -} -aside .sideleg:hover h4, aside .sideleg:hover li { - color: #fff -} -aside .sideleg li { - list-style: none; - margin: 1em 0; - padding:0; -} -aside .sideleg ul { - margin: 0; - padding: 0 + font-size: 1em; + li { + list-style: none; + margin: 1em 0; + padding:0; + } + ul { + margin: 0; + padding: 0 + } } @@ -429,13 +431,13 @@ aside .sideleg ul { background: @gray-lighter; margin-top: 2em; margin-bottom:2em; - padding: 1.5em -} -#loginForm label { - text-align: left; - .Roboto-thin; - color: @gray; - font-size: 1.1em + padding: 1.5em; + label { + text-align: left; + .Roboto-thin; + color: @gray; + font-size: 1.1em + } } #loginForm+.col-md-6.col-md-offset-3.text-left { @@ -460,17 +462,17 @@ h1 .icon-stack { /* spacewalk toolbar */ .spacewalk-toolbar { - padding: .5em 1em -} -.spacewalk-toolbar>a { - border-right:1px solid @gray-light; - padding: 0 .5em -} -.spacewalk-toolbar>a:hover { - text-decoration: none; -} -.spacewalk-toolbar>a:last-child { - border-right:0 + padding: .5em 1em; + a { + border-right:1px solid @gray-light; + padding: 0 .5em + } + a:hover { + text-decoration: none; + } + a:last-child { + border-right:0 + } } /* systems selected tool*/ @@ -491,3 +493,7 @@ h1 .icon-stack { .spacewalk-content-nav .nav.nav-tabs li.active a { background: #dddddd; } +/* btn with margin top and bottom */ +.btn.spacewalk-btn-margin-vertical{ + margin: 1em 0 +} \ No newline at end of file diff --git a/branding/css/theme.less b/branding/css/theme.less index b4b81a6..e98dc8d 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -1,20 +1,48 @@ -.pagination > li > a, .pagination > li > span{ - border-top: 1px solid #dddddd; +//PAGINATOR from 0 - 9 and A - Z + +.spacewalk-alphabar{ border-bottom: 1px solid #dddddd; - border-left: 0; - border-right: 0 -} -.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ - border-left: 1px solid #dddddd; - padding-left: 8px; + margin-bottom: .8em; + .pagination{ + margin: .8em 0 + } + .pagination > li > a, .pagination > li > span{ + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; + border-left: 0; + border-right: 0; + } + .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ + border-left: 1px solid #dddddd; + padding-left: 8px; + } + .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{ + border-right: 1px solid #dddddd; + padding-right: 8px; + } + .pagination-sm > li > a, .pagination-sm > li > span{ + padding: 4px 6px; + } + .pagination-sm > li:nth-child(11) > a{ + border-left: 1px solid #dddddd; + padding-left: 10px; + } + .pagination-sm > li:nth-child(10) > a{ + padding-right: 10px; + } } -.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{ - border-right: 1px solid #dddddd; - padding-right: 8px -} -.pagination-sm > li > a, .pagination-sm > li > span{ - padding: 4px 6px; + +// Filter by system button besides the input search +.spacewalk-button-filter{ + border-left: 0; + color: #666666; + background-color: #ffffff; + border-color: #cccccc; } -.pagination-sm > li:nth-child(11) > a{ - border-left: 1px solid #dddddd; + +//Table's filters +.filter-input{ + .col-md-3{ + padding-left: 0; + } } \ No newline at end of file commit c49078595311aec2a7402ea7878dcec488f70092 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Oct 17 14:12:58 2013 +0200 Legends titles and colour changed diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp index 9576041..7675aa2 100644 --- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <div class="sideleg"> - <h2><bean:message key="errata-legend.jsp.title"/></h2> + <h4><bean:message key="errata-legend.jsp.title"/></h4> <ul> <li><i class="icon-shield"></i><bean:message key="errata-legend.jsp.security"/></li> <li><i class="icon-bug"></i><bean:message key="errata-legend.jsp.bugfix"/></li> diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp index 5cf4e56..b1c5173 100644 --- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <div class="sideleg"> - <h2><bean:message key="probes-list-legend.jsp.title"/></h2> + <h4><bean:message key="probes-list-legend.jsp.title"/></h4> <ul> <li><i class="spacewalk-icon-health spacewalk-icon-green"></i> <bean:message key="probes-list-legend.jsp.ok"/> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp index 93740fd..29c1eeb 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <div class="sideleg"> - <h2><bean:message key="system-group-legend.jsp.title"/></h2> + <h4><bean:message key="system-group-legend.jsp.title"/></h4> <ul> <li><i class="icon-ok-sign"></i><bean:message key="system-group-legend.jsp.fully"/></li> <li><i class="icon-exclamation-sign"></i><bean:message key="system-group-legend.jsp.updates"/></li> diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index d927ab8..1fa91aa 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <div class="sideleg"> - <h2><bean:message key="system-legend.jsp.title"/></h2> + <h4><bean:message key="system-legend.jsp.title"/></h4> <ul> <li><i class="icon-ok-sign"></i><bean:message key="system-legend.jsp.fully"/></li> <li><i class="icon-exclamation-sign"></i><bean:message key="system-legend.jsp.critical"/></li> diff --git a/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp index 1c4e13f..6013106 100644 --- a/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <div class="sideleg"> -<h2><bean:message key="system.audit.listscap.jsp.legend"/></h2> +<h4><bean:message key="system.audit.listscap.jsp.legend"/></h4> <ul> <li><bean:message key="system.audit.listscap.jsp.pass.abb"/> - <bean:message key="system.audit.listscap.jsp.pass"/></li> diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp index f77b744..b88aa79 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <div class="sideleg"> - <h2><bean:message key="yourrhn-legend.jsp.title" /></h2> + <h4><bean:message key="yourrhn-legend.jsp.title" /></h4> <ul> <li><i class="icon-ok-sign"></i><bean:message key="system-legend.jsp.fully" /></li> <li><i class="icon-exclamation-sign"></i><bean:message key="system-legend.jsp.critical" /></li> @@ -12,7 +12,7 @@ <li><i class="spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked" /></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><i class="spacewalk-icon-autoinstalling"></i><bean:message key="system-legend.jsp.kickstarting" /></li> + <li><i class="icon-rocket"></i><bean:message key="system-legend.jsp.kickstarting" /></li> </rhn:require> <li><i class="icon-time"></i><bean:message key="system-legend.jsp.pending" /></li> <li><i class="icon-remove-circle"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> commit 536741353b8c73c0a55b39a7cd99a5c6be031adc Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 17 12:38:44 2013 +0200 I had already renamed clearbtn to clear-btn in the css diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 899eb9c..7e26247 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -84,7 +84,7 @@ <span id="header_selcount"> <rhn:setdisplay user="${requestScope.session.user}" /> </span> - <a id="clearbtn" class="button" href="/rhn/ssm/index.do"> + <a id="clear-btn" class="button" href="/rhn/ssm/index.do"> <bean:message key="manage"/> </a> <%-- diff --git a/web/include/network/components/status_bar/ssm.pxi b/web/include/network/components/status_bar/ssm.pxi index 4723974..4fd4c49 100644 --- a/web/include/network/components/status_bar/ssm.pxi +++ b/web/include/network/components/status_bar/ssm.pxi @@ -11,7 +11,7 @@  </span> - <a id="clearbtn" class="button" href="/rhn/ssm/index.do"> + <a id="clear-btn" class="button" href="/rhn/ssm/index.do"> Manage </a> <rhn-return-link default="/network"> commit 18f79d28bc8e21a10bfb3875d49a8ea1306c6f64 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 17 12:35:08 2013 +0200 Fix the System Set counter in the Perl pages. Had to rename the spacewalk-ssm-counter class to spacewalk-set-$name-counter, because perl has a common code to render the html for all sets. diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt index 996a711..5e742a9 100644 --- a/branding/templates/c.pxt +++ b/branding/templates/c.pxt @@ -73,8 +73,11 @@ </div> </div> - <pxt-include-late file="/network/components/status_bar/main.pxi" /> - <rhn-navi-nav depth="0" style="spacewalk-main-nav"/> + <nav class="navbar navbar-inverse spacewalk-main-nav" role="navigation"> + <rhn-navi-nav depth="0" style="spacewalk-main-nav"/> + <pxt-include-late file="/network/components/status_bar/main.pxi" /> + </nav> + </header> <div class="spacewalk-main-column-layout"> diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java index b2bfd20..91b70d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java @@ -103,7 +103,7 @@ public class DWRItemSelector { Boolean systemsRelated = RhnSetDecl.SYSTEMS.getLabel().equals(setLabel); if (systemsRelated) { StringBuffer headerMessage = new StringBuffer(); - headerMessage.append("<span id='spacewalk-ssm-counter' class='badge'>"); + headerMessage.append("<span id='spacewalk-set-system_list-counter' class='badge'>"); headerMessage.append(Integer.toString(setSize)); headerMessage.append("</span>"); if (setSize == 1) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java index df5344e..281a854 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java @@ -54,7 +54,7 @@ public class SystemSetDisplayTag extends TagSupport { size = rs.size(); } StringBuilder result = new StringBuilder(); - result.append("<span id=\"spacewalk-ssm-counter\" class=\"badge\">"); + result.append("<span id=\"spacewalk-set-system_list-counter\" class=\"badge\">"); result.append(Integer.toString(size)); result.append("</span>"); String msgKey; diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js index 7e0cfc5..c40c74e 100644 --- a/web/html/javascript/check_all.js +++ b/web/html/javascript/check_all.js @@ -206,7 +206,7 @@ function pageResponse(data) { // the function we call to read the number of systems selected and hide/show the toolbar function updateSsmToolbarOpacity() { - var systemsSpan = $("#spacewalk-ssm-counter").text(); + var systemsSpan = $("#spacewalk-set-system_list-counter").text(); if (systemsSpan == 0){ diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm index 7591243..79b3022 100644 --- a/web/modules/sniglets/Sniglets/Navi/Style.pm +++ b/web/modules/sniglets/Sniglets/Navi/Style.pm @@ -307,18 +307,6 @@ sub post_level { return "</ul>"; } -sub pre_nav { - my $self = shift; - my $pxt = shift; - return qq{\n<nav class="navbar navbar-inverse spacewalk-main-nav" role="navigation">}; -} - -sub post_nav { - my $self = shift; - my $pxt = shift; - return qq{\n</nav>}; -} - #sub item_style_active { # return "current"; #} diff --git a/web/modules/sniglets/Sniglets/Sets.pm b/web/modules/sniglets/Sniglets/Sets.pm index a6a4c81..28045b1 100644 --- a/web/modules/sniglets/Sniglets/Sets.pm +++ b/web/modules/sniglets/Sniglets/Sets.pm @@ -36,13 +36,17 @@ sub set_totals { if ($params{set}) { if ($params{noun}) { - return sprintf("%s %s%s selected", - $sets{$params{set}} || "No", + + return sprintf(qq{<span id="spacewalk-set-%s-counter" class="badge">%s</span> %s%s selected}, + $params{set}, + $sets{$params{set}} || "0", $params{noun}, ((not exists $sets{$params{set}}) || $sets{$params{set}} > 1) ? "s" : ""); } else { - return sprintf "%d", $sets{$params{set}} || 0; + return sprintf(qq{<span id="spacewalk-set-%s-counter" class="badge">%s</span>}, + $params{set}, + $sets{$params{set}} || "0"); } } commit e4131fa072a48c2f4a3a588743890a75dc4d73c8 Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Oct 17 12:17:12 2013 +0200 Make overview legend heading the same size as the other legends diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp index 4520f92..f77b744 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <div class="sideleg"> - <h4><bean:message key="yourrhn-legend.jsp.title" /></h4> + <h2><bean:message key="yourrhn-legend.jsp.title" /></h2> <ul> <li><i class="icon-ok-sign"></i><bean:message key="system-legend.jsp.fully" /></li> <li><i class="icon-exclamation-sign"></i><bean:message key="system-legend.jsp.critical" /></li> commit 7c80ef1d6143c6b5dd7f94bb8867d374e2a78721 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 16 23:05:51 2013 +0200 initial port of the perl pages to the new layout/css Only interesting change is in web/modules/sniglets/Sniglets/Navi.pm where the css class name hyphens are changed to underscores as the css class name is used then as a perl package dynamically to call functions there. diff --git a/branding/styles/navbar_bottom.txt b/branding/styles/navbar_bottom.txt deleted file mode 100644 index be52768..0000000 --- a/branding/styles/navbar_bottom.txt +++ /dev/null @@ -1,3 +0,0 @@ - -</div> -</div> diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt deleted file mode 100644 index cb8cd30..0000000 --- a/branding/styles/navbar_top.txt +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> - -<pxt-use class="Sniglets::Header" /> - -<div id="utility"> - <div id="utilityLinks"> -<p id="linx"><span class="hide"><strong>Shortcuts:</strong> </span><a -href="http://kbase.redhat.com/">Knowledgebase</a> <span -class="navPipe">|</span> <a href="rhn/">Documentation</a></p> - </div> - <div id="utilityAccount"> -<rhn-display-login> - <p> - <span class="label">User:</span> <a -href="/rhn/account/UserDetails.do">[login]</a><span -class="navPipe">|</span> - <span class="label">Organization:</span> <a>[org]</a><span class="navPipe">|</span> -<a href="/rhn/account/UserPreferences.do">Preferences</a><span -class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a> - - </p> -</rhn-display-login> - </div> - -</div> - -<div id="header"> - <a href="http://www.redhat.com/" title="Visit redhat.com for more information about Red Hat products and services"><img src="/img/logo_header_rh.gif" alt="Red Hat" width="37" height="31" id="rhLogo" /></a><a href="/" title="Red Hat homepage"><img src="/img/logo_header_network.gif" alt="Red Hat" width="164" height="31" id="rhnLogo" /></a> - <div id="searchbar"> - <form name="form1" action="/rhn/Search.do" method="get"> - <select name="search_type"> - - <option value="systems">Systems</option> - - <option value="packages">Packages</option> - <option value="errata">Errata</option> - <option value="docs">Documentation</option> - </select><input type="text" name="search_string" maxlength="40" -size="20" accesskey="4" autofocus="autofocus"/> - - <input type="hidden" name="submitted" value="true"/> - <input type="submit" class="button" name="image-1" value="Search" -align="top" /></form> - </div> - -</div> -<div id="navWrap"/> -<div id="mainNavWrap"/> - -</pxt-passthrough> diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt index 77540f1..996a711 100644 --- a/branding/templates/c.pxt +++ b/branding/templates/c.pxt @@ -1,54 +1,111 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE HTML> <pxt-passthrough> <pxt-use class="Sniglets::Users" /> <pxt-use class="Sniglets::HTML" /> <pxt-use class="Grail::Frame" /> <pxt-use class="Sniglets::Navi" /> + <pxt-use class="Sniglets::Header" /> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<html lang="en"> <pxt-include-late file="/templates/header.pxt" /> - <body><div class="wrap" id="top-wrap"> - <rhn-navi-nav depth="0" style="topnav"/> - <pxt-include-late file="/network/components/status_bar/main.pxi" /> - </div> - <div class="wrap" id="bottom-wrap"> - <div id="content"> - <table width="100%" cellspacing="0"> - <tr> - <td class="sidebar"> - <grail-canvas mode="left_menu_canvas"> - <rhn-navi-nav depth="1" style="sidenav"/> - </grail-canvas> - <grail-canvas mode="legend_canvas"> - </grail-canvas> - - <rhn-require acl="global_config(chat_enabled)"> - <br/> - <a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank"> - <img src="/img/chat.png" alt=""/> - </a> - </rhn-require> - - </td> - <td class="page-content" width="100%"> -<pxt-include-late file="/network/components/message_queues/site.pxi" /> - -<grail-early-canvas mode="main_canvas"> -</grail-early-canvas> - - </td> - </tr> - </table> - - <pxt-include-late file="/templates/footer.pxt" /> - <pxt-include-late file="/templates/profile.pxt" /> - - </div>  - </div>  + <body> + <div class="spacewalk-top-wrap"> + <header> + <div class="spacewalk-header-container"> + <div id="logo" class="spacewalk-logo"> + <a href="http://www.spacewalkproject.org/" title="Visit http://www.spacewalkproject.org/ for more information"> + <img src="/img/logo_vendor.png" alt="Spacewalk project" id="rhLogo" /> + </a> + <a href="/" title="Spacewalk homepage"> + <img src="/img/logo_product.png" alt="Spacewalk" id="rhnLogo" accesskey="2"/> + </a> + </div> + + <div class="spacewalk-header-links"> + <ul class="nav nav-pills"> + <li><a href="/rhn/account/LocalePreferences.do">English (change)</a></li> + </ul> + <ul class="nav nav-pills"> + <li><a href="http://kbase.redhat.com/">Knowledgebase</a></li> + <li><a href="/help">Documentation</a></li> + </ul> + + <rhn-display-login> + <ul class="nav nav-pills"> + <li> + <a href="/rhn/account/UserDetails.do"><i class="icon-user"></i>[login]</a> + </li> + <li> + <a><i class="icon-sitemap"></i>[org]</a> + </li> + <li> + <a href="/rhn/account/UserPreferences.do"><i class="icon-cogs"></i></a> + </li> + <li> + <a href="/rhn/Logout.do"><i class="icon-signout"></i></a> + </li> + </ul> + </rhn-display-login> + + <form name="form1" class="form-inline hidden-xs" role="form" action="/rhn/Search.do" method="get"> + <div class="form-group"> + <select name="search_type" class="form-control input-sm"> + + <option value="systems">Systems</option> + + <option value="packages">Packages</option> + <option value="errata">Errata</option> + <option value="docs">Documentation</option> + </select> + </div> + <div class="form-group"> + <input type="search" class="form-control input-sm" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus" placeholder="Search" /> + </div> + <div class="form-group"> + <input type="hidden" name="submitted" value="true" /> + <button type="submit" class="btn btn-info input-sm"> + <i class="icon-search"></i> + </button> + </div> + </form> + </div> + </div> + + <pxt-include-late file="/network/components/status_bar/main.pxi" /> + <rhn-navi-nav depth="0" style="spacewalk-main-nav"/> + </header> + <div class="spacewalk-main-column-layout"> + + <aside id="spacewalk-aside"> + <grail-canvas mode="left_menu_canvas"> + <rhn-navi-nav depth="1" style="sidenav"/> + </grail-canvas> + <grail-canvas mode="legend_canvas"> + </grail-canvas> + + <rhn-require acl="global_config(chat_enabled)"> + <a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank"> + <img src="/img/chat.png" alt=""/> + </a> + </rhn-require> + </aside> + + <section id="spacewalk-content"> + <pxt-include-late file="/network/components/message_queues/site.pxi" /> + <grail-early-canvas mode="main_canvas"> + </grail-early-canvas> + </section> + </div> + + </div> + <footer> + <pxt-include-late file="/templates/footer.pxt" /> + <pxt-include-late file="/templates/profile.pxt" /> + </footer> </body> -</html> + </pxt-passthrough> + -</pxt-passthrough> diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt index fca438a..7ee1502 100644 --- a/branding/templates/footer.pxt +++ b/branding/templates/footer.pxt @@ -2,10 +2,15 @@ <pxt-passthrough> <pxt-use class="Sniglets::Users" /> - <div id="footer"> - Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> - <div style="color: black"> - Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a> - </div> - </div> +<div> +</div> +<div> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> +<div style="color: black"> + Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a> +</div> +</div> +<div> + <img src="/img/logo_vendor.png" /> +</div> </pxt-passthrough> diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index 7434987..217b58c 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -42,7 +42,7 @@ </section> </div> </div> - <footer class="row"> + <footer> <jsp:include page="/WEB-INF/includes/footer.jsp" /> </footer> </body> diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index e740d86..bf7a7ed 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -2,9 +2,9 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<div class="col-xs-2"> +<div> </div> -<div class="col-xs-8 text-center"> +<div> <bean:message key="footer.jsp.copyright" /> <a href="https://www.redhat.com/legal/privacy_statement.html"><bean:message key="footer.jsp.privacyStatement" /></a> : <a href="http://www.redhat.com/legal/legal_statement.html"><bean:message key="footer.jsp.legalStatement" /></a> @@ -16,7 +16,7 @@ <p><c:out value="${custom_footer}" escapeXml="false" /></p> </c:if> </div> -<div class="col-xs-2 text-right"> +<div> <img src="/img/logo_vendor.png" /> </div> diff --git a/web/include/network/components/status_bar/ssm.pxi b/web/include/network/components/status_bar/ssm.pxi index d76aa2a..4723974 100644 --- a/web/include/network/components/status_bar/ssm.pxi +++ b/web/include/network/components/status_bar/ssm.pxi @@ -4,16 +4,19 @@ <pxt-use class="Sniglets::Lists" /> <pxt-use class="Sniglets::HTML" /> -<div> -<rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)"> - <span id="header_selcount"><rhn-set-totals set="system_list" noun="system"/></span> +<div class="spacewalk-bar pull-right"> + <rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)"> + <span id="header_selcount"> + <rhn-set-totals set="system_list" noun="system"/> +  + </span> - <a class="button" href="/rhn/ssm/index.do">Manage</a> - -<rhn-return-link default="/network"> - <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a> -</rhn-return-link> - -</rhn-require> + <a id="clearbtn" class="button" href="/rhn/ssm/index.do"> + Manage + </a> + <rhn-return-link default="/network"> + <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a> + </rhn-return-link> + </rhn-require> </div> -</pxt-passthrough> +</pxt-passthrough> \ No newline at end of file diff --git a/web/modules/sniglets/Sniglets/Navi.pm b/web/modules/sniglets/Sniglets/Navi.pm index 95ec229..6420081 100644 --- a/web/modules/sniglets/Sniglets/Navi.pm +++ b/web/modules/sniglets/Sniglets/Navi.pm @@ -92,7 +92,13 @@ sub navi_nav { } my $tree = Sniglets::Navi->load_tree($file); - my $style = new Sniglets::Navi::Style($params{style}); + + # the style is used as a perl package name so + # remove the hyphens + my $ns = $params{style}; + $ns =~ s/[\-]/_/g; + + my $style = new Sniglets::Navi::Style($ns); my $prefix = $tree->label; $prefix = "${prefix}_"; diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm index b1429dc..7591243 100644 --- a/web/modules/sniglets/Sniglets/Navi/Style.pm +++ b/web/modules/sniglets/Sniglets/Navi/Style.pm @@ -238,21 +238,19 @@ sub link_style_active { } - - package Sniglets::Navi::Style::sidenav; use base qw/Sniglets::Navi::Style::ul/; -sub pre_nav { return qq{\n<div id="sidenavp">} } -sub post_nav { return qq{\n</div>\n} } +sub pre_nav { return qq{\n<nav id="sidenav">} } +sub post_nav { return qq{\n</nav>\n} } -sub pre_level { return '<ul>' } +sub pre_level { return qq{\n<ul class="nav nav-pills nav-stacked">\n} } sub post_level { return '</ul>' } sub level_style { return "sidenav" } sub item_style { return "" } -sub item_style_active { return "sidenav-selected" } +sub item_style_active { return "active" } sub item_style_type { return "class" } sub link_style { @@ -263,7 +261,7 @@ sub link_style_active { } -package Sniglets::Navi::Style::topnav; +package Sniglets::Navi::Style::spacewalk_main_nav; use base qw/Sniglets::Navi::Style::ul/; sub item_style_type { return 'id' } @@ -285,24 +283,8 @@ sub pre_item { my $item_style_type = $self->item_style_type($level); my $item_style; - if ($sibling_count == 1) { - if ($active) { - $item_style = "mainFirst-active"; - } - else { - $item_style = "mainFirst"; - } - } - elsif ($sibling_count == $num_siblings) { - if ($active) { - $item_style = "mainLast-active"; - } - else { - $item_style = "mainLast"; - } - } - elsif ($active) { - $item_style = "main-active"; + if ($active) { + $item_style = "active"; } if ($item_style) { @@ -318,7 +300,7 @@ sub post_item { sub pre_level { - return "<ul>"; + return qq{<ul class="nav navbar-nav">}; } sub post_level { @@ -328,15 +310,13 @@ sub post_level { sub pre_nav { my $self = shift; my $pxt = shift; - - return $pxt->include(-file => "/nav/styles/navbar_top_sat.txt"); + return qq{\n<nav class="navbar navbar-inverse spacewalk-main-nav" role="navigation">}; } sub post_nav { my $self = shift; my $pxt = shift; - - return $pxt->include(-file => "/nav/styles/navbar_bottom.txt", -raw => 1); + return qq{\n</nav>}; } #sub item_style_active { @@ -353,21 +333,10 @@ sub render_link { my $active = shift; my $depth = shift; - # what number am i... - my $sibling_count = shift; - # ... out of ... - my $num_siblings = shift; - my $css_style; # if ($self->link_style($depth) or $self->link_style_active($depth)) { # $css_style = $active ? $self->link_style_active($depth) : $self->link_style($depth); # } - if ($sibling_count == 1) { - $css_style = "mainFirstLink"; - } - elsif ($sibling_count == $num_siblings) { - $css_style = "mainLastLink"; - } my $url = $node->urls->[0] || ''; my $tree_formvars = $tree->formvars; commit b717b3dcdfc1943393cd126e435f7a8ab789abde Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 16 15:30:00 2013 +0200 use make-row(0) for no margin instead of a hack make the footer semantic instead of class names diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 6175464..be91789 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -16,7 +16,7 @@ /* basic layout */ .spacewalk-header-container { - .make-row(); + .make-row(0); .spacewalk-logo { .make-md-column(3); } @@ -27,7 +27,7 @@ } .spacewalk-main-column-layout { - .make-row(); + .make-row(0); overflow: hidden; min-height: 100%; aside { @@ -38,7 +38,6 @@ } } - /* Main HTML5 tags defined for the theme */ body { background: #f7f7f7; @@ -57,7 +56,21 @@ footer { font-weight: normal; font-size: 0.9em; height: 80px; - clear: both + clear: both; + + .make-row(0); + + div:nth-child(1) { + .make-xs-column(2); + } + div:nth-child(2) { + .make-xs-column(8); + .text-center; + } + div:nth-child(3) { + .make-xs-column(2); + .text-right; + } } section { @@ -78,7 +91,7 @@ h2 { .spacewalk-main-column-layout { /* override the grid row margin */ - margin-right: 0; + margin-right: 0; margin-left: 0; aside { background: #eeeeee; @@ -100,8 +113,8 @@ h2 { padding-bottom: 3em; /* some animation */ transition: width 2s, height 2s, transform 2s; - -webkit-transition: width 2s, height 2s, -webkit-transform 2s; - } + -webkit-transition: width 2s, height 2s, -webkit-transform 2s; + } } /* glow and shadow for text */ @@ -152,13 +165,14 @@ i[class^="spacewalk-icon"] { .spacewalk-icon-blue { color: @spacewalk-enhancement-blue } -/* header style */ -header .row { - margin: 0 1em -} -/* undo the padding the grid columns give */ header { + + .spacewalk-header-container { + margin: 0 1em; + } + + /* undo the padding the grid columns give */ &#spacewalk-header { padding-right: 0; padding-left: 0 @@ -184,12 +198,12 @@ header { font-weight: normal; letter-spacing: normal; } - + .nav-pills li > a:hover { background: none; text-decoration: underline; } - + ul.nav-pills:nth-child(1) { background: #000; } @@ -262,9 +276,9 @@ header { /* fixing margin issue in Bootstrap 3 */ @media (min-width: 768px) { - .row { - margin-right: 0; - margin-left: 0; + .row { + margin-right: 0; + margin-left: 0; } } @@ -334,9 +348,9 @@ header { background: @spacewalk-list-first-submenu; border-bottom: 1px solid #ccc; } - ul>ul li.active, - ul>ul li.active:hover, - ul>ul li.active a, + ul>ul li.active, + ul>ul li.active:hover, + ul>ul li.active a, ul>ul li.active a:hover { background: @spacewalk-list-first-submenu-active; .glow-text-deleted; @@ -354,9 +368,9 @@ header { background: @spacewalk-list-second-submenu; border-bottom: 1px solid #bbb; } - ul>ul>ul li.active, - ul>ul>ul li.active:hover, - ul>ul>ul li.active a, + ul>ul>ul li.active, + ul>ul>ul li.active:hover, + ul>ul>ul li.active a, ul>ul>ul li.active a:hover { background: @spacewalk-list-second-submenu-active; .glow-text-deleted; commit 56c2800b80c88d21b4bd7d71a8274273451169ce Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 22:25:51 2013 +0200 don't use grid classes as selectors diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 975fb56..edbe24b 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -33,7 +33,7 @@ $(window).load(function () { // On window resize $(window).resize( function () { - $("section.col-md-10").css("padding-bottom", ""); + $(".spacewalk-main-column-layout section").css("padding-bottom", ""); columnHeight(); }); @@ -42,11 +42,11 @@ function columnHeight() { //Only if the screen size is higher than the max-width set up in the Variables.less under the definition @screen-md: //PLEASE: update this if you change the content of @screen-md if ($(document).width()>992) { - var sectionHeight = $("section.col-md-10").outerHeight(); + var sectionHeight = $(".spacewalk-main-column-layout section").outerHeight(); var heightDoc = $(document).height(); // Column heights should equal the document height minus the header height and footer height var newHeight = heightDoc - 160 - sectionHeight + "px"; - $("section.col-md-10").css("padding-bottom", newHeight); + $(".spacewalk-main-column-layout section").css("padding-bottom", newHeight); }; }; commit f87e46c28cb4be6588a6519dd4d6a54438867549 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 22:22:46 2013 +0200 typo, missing $ diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index a04dcb9..975fb56 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -7,7 +7,7 @@ $(document).on("ready", function(){ $("#sidenav li.active").each(function() { $(this).next("ul").show(300); }); - + /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when no system is selected */ @@ -24,7 +24,6 @@ $(document).on("ready", function(){ } // See if there is a system already selected as soon as the page loads updateSsmToolbarOpacity(); - }); /* Getting the screen size to create a fixed padding-bottom in the Section tag to make both columns the same size */ // On window load commit e437fc7456763d28e2fcc2204253e3321d595477 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 22:01:06 2013 +0200 .wrap is not global, does not include footer: rename wrap -> spacewalk-top-wrap diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 84a1f8c..6175464 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -116,7 +116,7 @@ h2 { } /* fixing the footer to the bottom */ -.wrap { +.spacewalk-top-wrap { overflow: hidden; margin-bottom: -80px; padding-bottom: 80px; diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index cf030c3..7434987 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -14,7 +14,7 @@ <decorator:head /> </head> <body onload="<decorator:getProperty property="body.onload" />"> - <div class="wrap"> + <div class="spacewalk-top-wrap"> <header> <jsp:include page="/WEB-INF/includes/header.jsp" /> </header> commit b02746507da5dbae250cbc7ddcedf5e5693999cd Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 21:53:14 2013 +0200 include the right js/less in the perl pages diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt index afb5d34..10f24b1 100644 --- a/branding/templates/header.pxt +++ b/branding/templates/header.pxt @@ -3,15 +3,18 @@ <pxt-use class="Sniglets::Navi" /> <title><rhn-navi-page-title /></title> <link rel="shortcut icon" href="/img/favicon.ico" /> - <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" type="text/css" /> - <style> - .nav-stacked ul { - margin-left: 15px !important; - } - </style> + + <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> + <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> + <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> + + <script type="text/javascript">less = { env: 'development' };</script> + <script src="/javascript/less.js"></script> + <script src="/javascript/jquery.js"></script> + <script src="/javascript/bootstrap.js"></script> + <script src="/javascript/spacewalk-essentials.js"></script> + </head> - <script src="/javascript/prototype-1.6.0.js"></script> - <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js" type="text/javascript"></script> <script src="/javascript/check_all.js" type="text/javascript"></script> </pxt-passthrough> commit 3f8193cc5bbf2057f39fe28f3b3323b262812fa4 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 16 17:47:59 2013 +0200 Fix channel_tree.js in case of no channels available diff --git a/web/html/javascript/channel_tree.js b/web/html/javascript/channel_tree.js index 8d01acf..acc8a19 100644 --- a/web/html/javascript/channel_tree.js +++ b/web/html/javascript/channel_tree.js @@ -16,9 +16,11 @@ browserType = is_ie; function onLoadStuff(columns) { columnsPerRow = columns; var channelTable = document.getElementById('channel-list'); - createParentRows(channelTable, rowHash); - reuniteChildrenWithParents(channelTable, rowHash); - iconifyChildlessParents(rowHash); + if (channelTable) { + createParentRows(channelTable, rowHash); + reuniteChildrenWithParents(channelTable, rowHash); + iconifyChildlessParents(rowHash); + } } function iconifyChildlessParents(rowHash) { commit 15d273557b47dc90b729d06576079649ce8caea6 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 16 16:52:29 2013 +0200 Go back to loading check_all.js in <head> Apparently loading it in the footer is not enough, actually I would say this script needs to be refactored. diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 0f0832f..b2decfe 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -41,6 +41,7 @@ <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> + <script src="/javascript/check_all.js"></script> <script src="/rhn/dwr/engine.js"></script> <script src="/rhn/dwr/util.js"></script> commit 00c1a8351c9d76df2acceb2630b94f794e65449d Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Oct 16 16:47:21 2013 +0200 paginator styled and icon fixed in systems legend diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index a373522..84a1f8c 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -11,7 +11,8 @@ @import url(mixins.less); /*Import of Tables style*/ @import url(tables.less); - +/* Import of the Theme */ +@import url(theme.less); /* basic layout */ .spacewalk-header-container { @@ -388,7 +389,7 @@ aside .sideleg { padding: .5em 1em; border-radius: 4px; margin: 2em auto; - font-size: .8em + font-size: 1em } aside .sideleg:hover { background: @spacewalk-blue; diff --git a/branding/css/theme.less b/branding/css/theme.less new file mode 100644 index 0000000..b4b81a6 --- /dev/null +++ b/branding/css/theme.less @@ -0,0 +1,20 @@ +.pagination > li > a, .pagination > li > span{ + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; + border-left: 0; + border-right: 0 +} +.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{ + border-left: 1px solid #dddddd; + padding-left: 8px; +} +.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{ + border-right: 1px solid #dddddd; + padding-right: 8px +} +.pagination-sm > li > a, .pagination-sm > li > span{ + padding: 4px 6px; +} +.pagination-sm > li:nth-child(11) > a{ + border-left: 1px solid #dddddd; +} \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index 7aa0be7..d927ab8 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -12,7 +12,7 @@ <li><i class="spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked"/></li> </rhn:require> <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><img src="/img/icon_kickstart_session.gif" alt="" /><bean:message key="system-legend.jsp.kickstarting"/></li> + <li><i class="icon-rocket"></i><bean:message key="system-legend.jsp.kickstarting"/></li> </rhn:require> <li><i class="icon-time"></i><bean:message key="system-legend.jsp.pending"/></li> <li><i class="spacewalk-icon-Unentitled"></i><bean:message key="system-legend.jsp.unentitled"/></li> commit b0eec2f68f3ca6c5c6cc95028a6d8fbbeb377493 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 16 16:24:22 2013 +0200 TB3: Admin/Task Schedules/Schedule task form diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp index d214234..df39e39 100644 --- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp @@ -5,126 +5,124 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <html> -<body> -<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" - deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}" - deletionAcl="user_role(satellite_admin); formvar_exists(schid)" - deletionType="schedule"> - <bean:message key="schedule.edit.jsp.toolbar" arg0="${schedulename}"/> -</rhn:toolbar> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" + deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}" + deletionAcl="user_role(satellite_admin); formvar_exists(schid)" + deletionType="schedule"> + <bean:message key="schedule.edit.jsp.toolbar" arg0="${schedulename}"/> + </rhn:toolbar> + <html:form action="/admin/ScheduleDetail" styleClass="form-horizontal"> + <rhn:csrf/> + <h2><bean:message key="schedule.edit.jsp.basicscheduledetails"/></h2> + <p> + <c:if test="${empty param.schid or active}"> + <bean:message key="schedule.edit.jsp.introparagraph"/> + </c:if> + <c:if test="${not empty param.schid and not active}"> + <bean:message key="schedule.edit.jsp.notactive"/> + </c:if> + </p> -<div> - <html:form action="/admin/ScheduleDetail"> - <rhn:csrf/> + <div class="form-group"> + <label for="joblabel" class="col-lg-3 control-label"> + <rhn:required-field key="schedule.edit.jsp.name"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test='${empty param.schid}'> + <html:text property="schedulename" maxlength="256" + styleClass="form-control" + size="48" styleId="name"/> + </c:when> + <c:otherwise> + <div class="form-control"> + <c:out value="${schedulename}"/> + </div> + </c:otherwise> + </c:choose> + </div> + </div> + <div class="form-group"> + <label for="bunch" class="col-lg-3 control-label"> + <rhn:required-field key="schedule.edit.jsp.bunch"/>: + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test='${empty param.schid}'> + <html:select property="bunch" styleClass="form-control"> + <html:options collection="bunches" + property="value" + labelProperty="label" /> + </html:select> + </c:when> + <c:otherwise> + <a href="/rhn/admin/BunchDetail.do?label=${bunch}" class="btn btn-default">${bunch}</a> + </c:otherwise> + </c:choose> + <html:hidden property="bunch" value="${bunch}" /> + </div> + </div> - <h2><bean:message key="schedule.edit.jsp.basicscheduledetails"/></h2> - <div class="page-summary"> - <c:if test="${empty param.schid or active}"> - <bean:message key="schedule.edit.jsp.introparagraph"/> - </c:if> - <c:if test="${not empty param.schid and not active}"> - <bean:message key="schedule.edit.jsp.notactive"/> - </c:if> - </div> - - <br/> - - <table class="details"> - <tr> - <th nowrap="nowrap"> - <label for="joblabel"><rhn:required-field key="schedule.edit.jsp.name"/>:</label> - </th> - <td class="small-form"> - <c:choose> - <c:when test='${empty param.schid}'> - <html:text property="schedulename" maxlength="256" size="48" styleId="name"/> - </c:when> - <c:otherwise> - <c:out value="${schedulename}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <th nowrap="nowrap"> - <label for="bunch"><rhn:required-field key="schedule.edit.jsp.bunch"/>:</label> - </th> - <td class="small-form"> - <c:choose> - <c:when test='${empty param.schid}'> - <html:select property="bunch" > - <html:options collection="bunches" - property="value" - labelProperty="label" /> - </html:select> - </c:when> - <c:otherwise> - <a href="/rhn/admin/BunchDetail.do?label=${bunch}">${bunch}</a> - </c:otherwise> - </c:choose> - <html:hidden property="bunch" value="${bunch}" /> - </td> - </tr> - <c:if test="${empty param.schid or active}"> - <tr> - <th nowrap="nowrap"> - <label for="parent"><bean:message key="schedule.edit.jsp.frequency"/>:</label> - </th> - <td class="small-form"> - <jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf"> - <jsp:param name="widget" value="date"/> - </jsp:include> - </td> - </tr> - </c:if> - <c:if test="${not active}"> - <c:if test="${cron}"> - <tr> - <th nowrap="nowrap"> - <bean:message key="schedule.edit.jsp.frequency"/> - </th> - <td class="small-form"> - <c:out value="${cronexpr}"/> - </td> - </tr> - </c:if> - <c:if test='${not empty param.schid}'> - <tr> - <th nowrap="nowrap"> - <bean:message key="schedule.edit.jsp.activetill"/>: - </th> - <td class="small-form"> - <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${activetill}"/> - </td> - </tr> - </c:if> - </c:if> - </table> - - <div align="right"> - <hr /> - <c:choose> - <c:when test='${empty param.schid}'> - <html:submit property="create_button"> - <bean:message key="schedule.edit.jsp.createschedule"/> - </html:submit> - </c:when> - <c:otherwise> - <c:if test="${active}"> - <html:submit property="edit_button"> - <bean:message key="schedule.edit.jsp.editschedule"/> - </html:submit> + <c:if test="${empty param.schid or active}"> + <div class="form-group"> + <label for="parent" class="col-lg-3 control-label"> + <bean:message key="schedule.edit.jsp.frequency"/>: + </label> + <div class=""> + <jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf"> + <jsp:param name="widget" value="date"/> + </jsp:include> + </div> + </div> </c:if> - </c:otherwise> - </c:choose> - </div> - - <html:hidden property="submitted" value="true" /> - <c:if test='${not empty param.schid}'> - <html:hidden property="schid" value="${param.schid}" /> - </c:if> -</html:form> -</div> + <c:if test="${not active}"> + <c:if test="${cron}"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="schedule.edit.jsp.frequency"/> + </label> + <div class="col-lg-6"> + <div class="form-control"> + <c:out value="${cronexpr}"/> + </div> + </div> + </div> + </c:if> + <c:if test='${not empty param.schid}'> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="schedule.edit.jsp.activetill"/>: + </label> + <div class="col-lg-6"> + <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${activetill}"/> + </div> + </div> + </c:if> + </c:if> -</body> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <c:choose> + <c:when test='${empty param.schid}'> + <html:submit property="create_button" styleClass="btn btn-success"> + <bean:message key="schedule.edit.jsp.createschedule"/> + </html:submit> + </c:when> + <c:otherwise> + <c:if test="${active}"> + <html:submit property="edit_button" styleClass="btn btn-success"> + <bean:message key="schedule.edit.jsp.editschedule"/> + </html:submit> + </c:if> + </c:otherwise> + </c:choose> + </div> + </div> + <html:hidden property="submitted" value="true" /> + <c:if test='${not empty param.schid}'> + <html:hidden property="schid" value="${param.schid}" /> + </c:if> + </html:form> + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf index 8093e4e..4267433 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf @@ -4,20 +4,23 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> - -<select name='${picker.name}_${timeName}_hour' size="1"> -<c:forEach var="hourLabel" begin="0" end="23"> - <option <c:if test="${picker.hourLong == hourLabel}">selected="selected"</c:if> value='${hourLabel}'>${hourLabel}</option> -</c:forEach> -</select>:<select name='${picker.name}_${timeName}_minute' size="1"> -<c:forEach var="minLabel" begin="0" end="9"> - <option <c:if test="${minLabel == picker.minuteLong}">selected="selected"</c:if> value='${minLabel}'> - 0${minLabel} - </option> -</c:forEach> -<c:forEach var="minLabel" begin="10" end="59"> - <option <c:if test="${minLabel == picker.minuteLong}">selected="selected"</c:if> value='${minLabel}'> - ${minLabel} - </option> -</c:forEach> -</select> \ No newline at end of file +<div class="input-group"> + <select name='${picker.name}_${timeName}_hour' size="1" class="form-control"> + <c:forEach var="hourLabel" begin="0" end="23"> + <option <c:if test="${picker.hourLong == hourLabel}">selected="selected"</c:if> value='${hourLabel}'>${hourLabel}</option> + </c:forEach> + </select> + <strong class="input-group-addon">:</strong> + <select name='${picker.name}_${timeName}_minute' size="1" class="form-control"> + <c:forEach var="minLabel" begin="0" end="9"> + <option <c:if test="${minLabel == picker.minuteLong}">selected="selected"</c:if> value='${minLabel}'> + 0${minLabel} + </option> + </c:forEach> + <c:forEach var="minLabel" begin="10" end="59"> + <option <c:if test="${minLabel == picker.minuteLong}">selected="selected"</c:if> value='${minLabel}'> + ${minLabel} + </option> + </c:forEach> + </select> +</div> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf index ce6ed6b..fc5fff0 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf @@ -3,64 +3,104 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> - <c:set value="${requestScope[param.widget]}" var="picker"/> -<bean:message key="schedule.header"/><br/><br/> - - - -<input type="radio" name="${picker.name}_status" value="disabled" id="disabled" - <c:if test="${picker.status == 'disabled'}">checked="true"</c:if> /> - <label for="disabled"><bean:message key="schedule.disabled"/></label> -<br/> - -<input type="radio" name="${picker.name}_status" value="daily" id="daily" -<c:if test="${picker.status == 'daily'}">checked="true"</c:if> /> - <label for="daily"><bean:message key="schedule.daily"/>: - - <c:set var="timeName" value="daily" /> - <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> - </label> - <br/> - -<input type="radio" name="${picker.name}_status" value="weekly" id="weekly" -<c:if test="${picker.status == 'weekly'}">checked="true"</c:if> /> - <label for="weekly"><bean:message key="schedule.weekly"/>: - <bean:message key="schedule.weekly.every"/> - <select name='${picker.name}_day_week' size="1"> - <c:forEach var="day" begin="0" end="6"> - <option <c:if test="${picker.dayNames[day] eq picker.dayOfWeekString}">selected="selected"</c:if> value='${day+1}'>${picker.dayNames[day]}</option> - </c:forEach> - </select> - - <bean:message key="schedule.weekly.at"/> - - <c:set var="timeName" value="weekly" /> - <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> - </label> - <br/> - -<input type="radio" name="${picker.name}_status" value="monthly" id="monthly" -<c:if test="${picker.status == 'monthly'}">checked="true"</c:if> /> - <label for="monthly"><bean:message key="schedule.monthly"/>: - - <bean:message key="schedule.monthly.day"/> +<span class="help-block"><bean:message key="schedule.header"/></span> - <select name='${picker.name}_day_month' size="1"> - <c:forEach var="day" begin="1" end="28"> - <option <c:if test="${picker.dayOfMonthLong == day}">selected="selected"</c:if> value='${day}'>${day}</option> - </c:forEach> - </select> - <bean:message key="schedule.weekly.at"/> - <c:set var="timeName" value="monthly" /> - <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> - </label> - <br/> - -<input type="radio" name="${picker.name}_status" value="cron" id="cron" -<c:if test="${picker.status == 'cron'}">checked="true"</c:if> /> - <label for="cron"><bean:message key="schedule.cron"/>:</label> - <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}" /> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="radio" name="${picker.name}_status" value="disabled" id="disabled" + <c:if test="${picker.status == 'disabled'}">checked="true"</c:if> /> + <bean:message key="schedule.disabled"/> + </label> + </div> + </div> +</div> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="row"> + <div class="checkbox"> + <label> + <input type="radio" name="${picker.name}_status" value="daily" id="daily" + <c:if test="${picker.status == 'daily'}">checked="true"</c:if> /> + <strong><bean:message key="schedule.daily"/></strong> + </label> + </div> + <div class="col-lg-5"> + <bean:message key="schedule.weekly.at"/> + <c:set var="timeName" value="daily" /> + <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> + </div> + </div> + </div> +</div> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="row"> + <div class="checkbox"> + <label> + <input type="radio" name="${picker.name}_status" value="weekly" id="weekly" + <c:if test="${picker.status == 'weekly'}">checked="true"</c:if> /> + <strong><bean:message key="schedule.weekly"/></strong> + </label> + </div> + <div class="col-lg-5"> + <bean:message key="schedule.weekly.every"/> + <select name='${picker.name}_day_week' size="1" class="form-control"> + <c:forEach var="day" begin="0" end="6"> + <option <c:if test="${picker.dayNames[day] eq picker.dayOfWeekString}">selected="selected"</c:if> value='${day+1}'>${picker.dayNames[day]}</option> + </c:forEach> + </select> + </div> + <div class="col-lg-5"> + <bean:message key="schedule.weekly.at"/> + <c:set var="timeName" value="weekly" /> + <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> + </div> + </div> + </div> +</div> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="row"> + <div class="checkbox"> + <label> + <input type="radio" name="${picker.name}_status" value="monthly" id="monthly" + <c:if test="${picker.status == 'monthly'}">checked="true"</c:if> /> + <strong><bean:message key="schedule.monthly"/></strong> + </label> + </div> + <div class="col-lg-5"> + <bean:message key="schedule.monthly.day"/> + <select name='${picker.name}_day_month' size="1" class="form-control"> + <c:forEach var="day" begin="1" end="28"> + <option <c:if test="${picker.dayOfMonthLong == day}">selected="selected"</c:if> value='${day}'>${day}</option> + </c:forEach> + </select> + </div> + <div class="col-lg-5"> + <bean:message key="schedule.weekly.at"/> + <c:set var="timeName" value="monthly" /> + <%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %> + </div> + </div> + </div> +</div> +<div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <input type="radio" name="${picker.name}_status" value="cron" id="cron" + <c:if test="${picker.status == 'cron'}">checked="true"</c:if> /> + <strong><bean:message key="schedule.cron"/></strong> + </lable> + </div> + <div class="col-lg-5"> + <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}" class="form-control" /> + </div> + </div> +</div> commit 8afc9b1069e54e1cfb32426c9e54b3afed8c21ab Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 16 16:06:03 2013 +0200 Require "development_environment = 1" Otherwise reference the lessc compiled spacewalk.css file. diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index d4bdabe..0f0832f 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -28,10 +28,16 @@ <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> - <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> - <script type="text/javascript">less = { env: 'development' };</script> - <script src="/javascript/less.js"></script> + <rhn:require acl="is(development_environment)"> + <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> + <script>less = { env: 'development' };</script> + <script src="/javascript/less.js"></script> + </rhn:require> + <rhn:require acl="not is(development_environment)"> + <link rel="stylesheet" href="/css/spacewalk.css" /> + </rhn:require> + <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> commit 9de73a93a2e7dced4ed4a036579a3eb7f5fe6a1d Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Oct 16 14:40:45 2013 +0200 Selected Systems Toolbar diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js index f0d9267..7e0cfc5 100644 --- a/web/html/javascript/check_all.js +++ b/web/html/javascript/check_all.js @@ -201,6 +201,28 @@ function pageResponse(data) { dwr.util.setValue("pagination_selcount_top", resp.pagination); dwr.util.setValue("pagination_selcount_bottom", resp.pagination); } + updateSsmToolbarOpacity(); +} + +// the function we call to read the number of systems selected and hide/show the toolbar +function updateSsmToolbarOpacity() { + var systemsSpan = $("#spacewalk-ssm-counter").text(); + + if (systemsSpan == 0){ + + $(".spacewalk-bar").animate({"opacity": "0"}, 300, function() { + /* stuff to do after animation is complete */ + $(this).hide(); + }); + } + else{ + + $(".spacewalk-bar").animate({"opacity":"100"}, 300, + function(){ + /* stuff to do after animation is complete */ + $(this).show(); + }); + } } function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) { diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 5cd6ef4..a04dcb9 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -10,7 +10,9 @@ $(document).on("ready", function(){ /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when no system is selected */ - $("#clearbtn").click(hidesystemtool); + + $("#clear-btn").click(hidesystemtool); + function hidesystemtool(){ $(".spacewalk-bar").animate({ "right": "-=50px", @@ -20,22 +22,9 @@ $(document).on("ready", function(){ $(this).hide(); }); } - // See if there is a system selected - ssmToolbar(); - - $("#spacewalk-ssm-counter").on("change", ssmToolbar); - function ssmToolbar(){ - console.log("entro"); - var systemsSpan = $("#spacewalk-ssm-counter").text(); - if (systemsSpan == 0){ - $(".spacewalk-bar").animate({"opacity": "0"}, 300, function() { - /* stuff to do after animation is complete */ - //$(this).hide(); - }); - }else{ - (".spacewalk-bar").animate({"opacity":"100"}, 300); - } - } + // See if there is a system already selected as soon as the page loads + updateSsmToolbarOpacity(); + }); /* Getting the screen size to create a fixed padding-bottom in the Section tag to make both columns the same size */ // On window load commit 5f26905080240ef735941ef36a58ccda89f4246b Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 21:48:40 2013 +0200 better name for the content wrapper fix some typos in the less diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 10ccdb3..a373522 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -25,7 +25,7 @@ } } -.spacewalk-aside-content-layout { +.spacewalk-main-column-layout { .make-row(); overflow: hidden; min-height: 100%; @@ -75,10 +75,10 @@ h2 { font-size: 1.7em; } -.spacewalk-aside-content-layout { +.spacewalk-main-column-layout { /* override the grid row margin */ margin-right: 0; - margin-left: 0; + margin-left: 0; aside { background: #eeeeee; border-right: 1px solid #d5d5d5; @@ -99,13 +99,7 @@ h2 { padding-bottom: 3em; /* some animation */ transition: width 2s, height 2s, transform 2s; - -webkit-transition: width 2s, height 2s, -webkit-transform 2s; - &:first-child { - padding-left:0; - } - &:last-child { - padding-right: 0 - } + -webkit-transition: width 2s, height 2s, -webkit-transform 2s; } } @@ -177,7 +171,7 @@ header { padding-top: 1.4em; } - header .nav-pills { + .nav-pills { display: inline-block; border-radius: 0 0 4px 4px } diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index 7e1625a..cf030c3 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -18,7 +18,7 @@ <header> <jsp:include page="/WEB-INF/includes/header.jsp" /> </header> - <div class="spacewalk-aside-content-layout"> + <div class="spacewalk-main-column-layout"> <aside id="spacewalk-aside"> <jsp:include page="/WEB-INF/includes/leftnav.jsp" /> <jsp:include page="/WEB-INF/includes/legends.jsp" /> commit 38d29e773acee64967825a23eff79fc07f8cab05 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 18:18:23 2013 +0200 make the layout semantic... now col-md-X and row classes in the html See http://getbootstrap.com/css/#grid-less diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 12482b7..10ccdb3 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -12,18 +12,44 @@ /*Import of Tables style*/ @import url(tables.less); +/* basic layout */ + +.spacewalk-header-container { + .make-row(); + .spacewalk-logo { + .make-md-column(3); + } + .spacewalk-header-links { + .make-md-column(9); + .text-right; + } +} + +.spacewalk-aside-content-layout { + .make-row(); + overflow: hidden; + min-height: 100%; + aside { + .make-md-column(2); + } + section { + .make-md-column(10); + } +} + + /* Main HTML5 tags defined for the theme */ -body{ +body { background: #f7f7f7; } -html, body{ +html, body { height: 100% } -header{ +header { width: 100%; background: url('../../img/spacewalk-header-background.png') repeat-x @gray; } -footer{ +footer { padding: 1.2em 0; background: @gray-dark; color: #fff; @@ -32,19 +58,8 @@ footer{ height: 80px; clear: both } -aside.col-md-2{ - background: #eeeeee; - border-right: 1px solid #d5d5d5; - height: auto; - min-height: 100%; - /* 100% height */ - margin-bottom: -9999px; - padding-bottom: 9999px; - /* errasing the predefined paddings in the columns */ - padding-right: 0; - padding-left: 0; -} -section{ + +section { /* for the body div to make both columns the same size*/ height: auto; min-height: 100%; @@ -53,29 +68,60 @@ section{ h1, h2, h3, h4 { .Roboto-thin } -h1{ +h1 { font-size: 2em } -h2{ +h2 { font-size: 1.7em; } + +.spacewalk-aside-content-layout { + /* override the grid row margin */ + margin-right: 0; + margin-left: 0; + aside { + background: #eeeeee; + border-right: 1px solid #d5d5d5; + height: auto; + min-height: 100%; + /* 100% height */ + margin-bottom: -9999px; + padding-bottom: 9999px; + /* erasing the predefined paddings in the columns */ + padding-right: 0; + padding-left: 0; + } + + /* fixing margins in the 1st and last columns */ + section { + padding-left:2em; + padding-right: 2em; + padding-bottom: 3em; + /* some animation */ + transition: width 2s, height 2s, transform 2s; + -webkit-transition: width 2s, height 2s, -webkit-transform 2s; + &:first-child { + padding-left:0; + } + &:last-child { + padding-right: 0 + } + } +} + /* glow and shadow for text */ -.glow-text{ +.glow-text { text-shadow: 1px 1px 1px #fff; } -.glow-text-deleted{ +.glow-text-deleted { text-shadow: 0 transparent; } -.shadow-text{ +.shadow-text { text-shadow: 1px 1px 1px #333; } -/* for the body div to make both columns the same size*/ -.row.body-container{ - overflow: hidden; - min-height: 100%; -} + /* fixing the footer to the bottom */ -.wrap{ +.wrap { overflow: hidden; margin-bottom: -80px; padding-bottom: 80px; @@ -83,7 +129,7 @@ h2{ min-height: 100% } /* style for the login page */ -.login-page{ +.login-page { width: 70%; text-align: center; margin-right: auto; @@ -99,83 +145,125 @@ i[class^="spacewalk-icon"] { } /* color for icon */ -.spacewalk-icon-green{ +.spacewalk-icon-green { color: @spacewalk-updates-green } -.spacewalk-icon-red{ +.spacewalk-icon-red { color: @spacewalk-security-red } -.spacewalk-icon-yellow{ +.spacewalk-icon-yellow { color: @spacewalk-bugs-yellow; } -.spacewalk-icon-blue{ +.spacewalk-icon-blue { color: @spacewalk-enhancement-blue } /* header style */ -header .row{ +header .row { margin: 0 1em } -header .row [class*="col-md"]{ - padding-right: 0; - padding-left: 0 -} -header .logo{ - padding-top: 1.4em; -} -header form{ - margin: .9em 0 1em 0 -} -header .nav-pills{ - display: inline-block; - border-radius: 0 0 4px 4px -} -header .nav-pills li > a{ - padding: .3em 1em; - font-size: .85em; - color: #fff; - font-weight: normal; - letter-spacing: normal; -} -header .nav-pills li > a:hover{ - background: none; - text-decoration: underline; -} -header ul.nav-pills:nth-child(1){ - background: #000; -} -header ul.nav-pills:nth-child(2){ - background: #333; -} -header ul.nav-pills:nth-child(3){ - background: #666; -} -header ul.nav-pills:nth-child(2) li{ - border-left: 1px #222 solid -} -header ul.nav-pills:nth-child(3) li{ - border-left: 1px #555 solid -} -header ul.nav-pills li:first-child { - border-left: 0 -} -header .navbar-nav > li > a{ - padding: .5em 1.2em; -} -header .navbar-nav > li:hover{ - background: @spacewalk-blue; - border-radius: 4px 4px 0 0 -} -header form input[type="search"]{ - padding: 0px 10px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -header .btn.btn-info.input-sm{ - padding-top: 4px +/* undo the padding the grid columns give */ +header { + &#spacewalk-header { + padding-right: 0; + padding-left: 0 + } + + .spacewalk-logo { + padding-top: 1.4em; + } + + .spacewalk-logo { + padding-top: 1.4em; + } + + header .nav-pills { + display: inline-block; + border-radius: 0 0 4px 4px + } + + .nav-pills li > a { + padding: .3em 1em; + font-size: .85em; + color: #fff; + font-weight: normal; + letter-spacing: normal; + } + + .nav-pills li > a:hover { + background: none; + text-decoration: underline; + } + + ul.nav-pills:nth-child(1) { + background: #000; + } + + ul.nav-pills:nth-child(2) { + background: #333; + } + + ul.nav-pills:nth-child(3) { + background: #666; + } + + ul.nav-pills:nth-child(2) li { + border-left: 1px #222 solid + } + + ul.nav-pills:nth-child(3) li { + border-left: 1px #555 solid + } + + ul.nav-pills li:first-child { + border-left: 0 + } + + .navbar-nav > li > a { + padding: .5em 1.2em; + + } + + .navbar-nav > li:hover { + background: @spacewalk-blue; + border-radius: 4px 4px 0 0 + } + + form input[type="search"] { + padding: 0px 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + .btn.btn-info.input-sm { + padding-top: 4px + } + + /* reseting navbar styles for the main menu */ + .spacewalk-main-nav { + margin: 0; + border-radius: 0 + } + + .navbar { + min-height: .5em; + } + + /* Systems selector inside the main menu in the header */ + #bar { + color: #fff; + } + #bar .spacewalk-bar { + padding: .5em 1.2em; + text-align: right; + } + #bar .spacewalk-bar .badge { + margin-right: .5em + } } + /* fixing margin issue in Bootstrap 3 */ @media (min-width: 768px) { @@ -184,53 +272,19 @@ header .btn.btn-info.input-sm{ margin-left: 0; } } -/* fixing margins in the 1st and last columns */ -section.col-md-10{ - padding-left:2em; - padding-right: 2em; - padding-bottom: 3em; - /* some animation */ - transition: width 2s, height 2s, transform 2s; - -webkit-transition: width 2s, height 2s, -webkit-transform 2s; -} -section [class*=col-md]:first-child{ - padding-left:0; -} -section [class*=col-md]:last-child{ - padding-right: 0 -} -/* reseting navbar styles for the main menu */ -header .spacewalk-main-nav{ - margin: 0; - border-radius: 0 -} -.spacewalk-main-nav{ + +.spacewalk-main-nav { border: 0 } -.spacewalk-main-nav:after{ +.spacewalk-main-nav:after { height: 4px; background: @spacewalk-blue ; width: 100% } -header .navbar{ - min-height: .5em; -} - -/* Systems selector inside the main menu in the header */ -header #bar{ - color: #fff; -} -header #bar .spacewalk-bar{ - padding: .5em 1.2em; - text-align: right; -} -header #bar .spacewalk-bar .badge{ - margin-right: .5em -} /* systems selector */ -.spacewalk-bar a.button:first-of-type{ +.spacewalk-bar a.button:first-of-type { color: #ffffff; background-color: #5bc0de; border-color: #46b8da; @@ -238,7 +292,7 @@ header #bar .spacewalk-bar .badge{ border-radius: 4px; margin: 0 .2em } -.spacewalk-bar a.button:last-of-type{ +.spacewalk-bar a.button:last-of-type { color: #333; background-color: #e2e2e2; border-color: #d4d4d4; @@ -246,91 +300,95 @@ header #bar .spacewalk-bar .badge{ border-radius: 4px } /* style for Menu in the left column */ -.nav-stacked > li + li{ +.nav-stacked > li + li { margin-top: 0; } -#sidenav a{ - color: #666; - .glow-text; -} -#sidenav a:before{ - content: "\f105 "; - font-family: 'FontAwesome'; - margin-right: .5em -} -#sidenav li{ - border-bottom: 1px solid #d8d8d8; + +#sidenav { + a { + color: #666; + .glow-text; + } + a:before { + content: "\f105 "; + font-family: 'FontAwesome'; + margin-right: .5em + } + li { + border-bottom: 1px solid #d8d8d8; + } + li.active > a, #sidenav li.active > a:hover { + color: @spacewalk-blue; + background: @spacewalk-list-menu-active; + } + li > a { + border-radius: 0 + } + ul li:last-child { + border-bottom: 1px solid #ccc; + -moz-box-shadow: 0px 1px 1px #fefefe; + -webkit-box-shadow: 0px 1px 1px #fefefe; + box-shadow: 0px 1px 1px #fefefe; + } + + /* ul-submenues */ + /* first submenu */ + ul>ul li { + padding: 0 0 0 1em !important; + margin: 0; + background: @spacewalk-list-first-submenu; + border-bottom: 1px solid #ccc; + } + ul>ul li.active, + ul>ul li.active:hover, + ul>ul li.active a, + ul>ul li.active a:hover { + background: @spacewalk-list-first-submenu-active; + .glow-text-deleted; + } + ul>ul li:hover, ul>ul li a:hover { + background: @spacewalk-list-first-submenu-hover; + } + ul>ul li:last-child { + border-bottom: 1px solid #c6c6c6; + } + /* second submenu */ + ul>ul>ul li { + padding: 0 0 0 1.5em !important; + margin: 0; + background: @spacewalk-list-second-submenu; + border-bottom: 1px solid #bbb; + } + ul>ul>ul li.active, + ul>ul>ul li.active:hover, + ul>ul>ul li.active a, + ul>ul>ul li.active a:hover { + background: @spacewalk-list-second-submenu-active; + .glow-text-deleted; + } + ul>ul>ul li:hover, ul>ul>ul li a:hover { + background: @spacewalk-list-second-submenu-hover; + } + ul>ul>ul li:last-child { + border-bottom: 1px solid #c4c4c4; + } } -#sidenav li.active > a, #sidenav li.active > a:hover{ - color: @spacewalk-blue; - background: @spacewalk-list-menu-active; -} -#sidenav li > a{ - border-radius: 0 -} -#sidenav ul li:last-child{ - border-bottom: 1px solid #ccc; - -moz-box-shadow: 0px 1px 1px #fefefe; - -webkit-box-shadow: 0px 1px 1px #fefefe; - box-shadow: 0px 1px 1px #fefefe; -} - -/* ul-submenues */ -/* first submenu */ -#sidenav ul>ul li{ - padding: 0 0 0 1em !important; - margin: 0; - background: @spacewalk-list-first-submenu; - border-bottom: 1px solid #ccc; -} -#sidenav ul>ul li.active, -#sidenav ul>ul li.active:hover, -#sidenav ul>ul li.active a, -#sidenav ul>ul li.active a:hover{ - background: @spacewalk-list-first-submenu-active; - .glow-text-deleted; -} -#sidenav ul>ul li:hover, #sidenav ul>ul li a:hover{ - background: @spacewalk-list-first-submenu-hover; -} -#sidenav ul>ul li:last-child{ - border-bottom: 1px solid #c6c6c6; -} -/* second submenu */ -#sidenav ul>ul>ul li{ - padding: 0 0 0 1.5em !important; - margin: 0; - background: @spacewalk-list-second-submenu; - border-bottom: 1px solid #bbb; -} -#sidenav ul>ul>ul li.active, -#sidenav ul>ul>ul li.active:hover, -#sidenav ul>ul>ul li.active a, -#sidenav ul>ul>ul li.active a:hover{ - background: @spacewalk-list-second-submenu-active; - .glow-text-deleted; -} -#sidenav ul>ul>ul li:hover, #sidenav ul>ul>ul li a:hover{ - background: @spacewalk-list-second-submenu-hover; -} -#sidenav ul>ul>ul li:last-child{ - border-bottom: 1px solid #c4c4c4; -} -aside ul > ul li{ + +aside ul > ul li { list-style: none; padding: 0 } -aside .nav > li > a{ +aside .nav > li > a { padding: .4em 1em } /* TABLES */ -.table > thead > tr.active > th{ +.table > thead > tr.active > th { background: @gray-lighter; } /* Icons Legend */ -aside .sideleg{ +aside .sideleg { background: lighten(@gray-lighter, 10%); width: 90%; padding: .5em 1em; @@ -338,25 +396,25 @@ aside .sideleg{ margin: 2em auto; font-size: .8em } -aside .sideleg:hover{ +aside .sideleg:hover { background: @spacewalk-blue; } -aside .sideleg:hover h4, aside .sideleg:hover li{ +aside .sideleg:hover h4, aside .sideleg:hover li { color: #fff } -aside .sideleg li{ +aside .sideleg li { list-style: none; margin: 1em 0; padding:0; } -aside .sideleg ul{ +aside .sideleg ul { margin: 0; padding: 0 } /* login form */ -#loginForm{ +#loginForm { border: 1px solid @gray-light; border-radius: @border-radius-base; background: @gray-lighter; @@ -364,55 +422,56 @@ aside .sideleg ul{ margin-bottom:2em; padding: 1.5em } -#loginForm label{ +#loginForm label { text-align: left; .Roboto-thin; color: @gray; font-size: 1.1em } -#loginForm+.col-md-6.col-md-offset-3.text-left{ + +#loginForm+.col-md-6.col-md-offset-3.text-left { font-size:.8em; margin-bottom:2em; } /* question symbol for help pop up*/ -h1 .icon-stack .icon-question{ +h1 .icon-stack .icon-question { font-size: .6em; } -h1 .icon-stack{ +h1 .icon-stack { width: 1em; height: 1em; line-height: .7em; } -.icon-stack .icon-stack-base.icon-circle{ +.icon-stack .icon-stack-base.icon-circle { font-size: .7em; color: @spacewalk-blue; } /* spacewalk toolbar */ -.spacewalk-toolbar{ +.spacewalk-toolbar { padding: .5em 1em } -.spacewalk-toolbar>a{ +.spacewalk-toolbar>a { border-right:1px solid @gray-light; padding: 0 .5em } -.spacewalk-toolbar>a:hover{ +.spacewalk-toolbar>a:hover { text-decoration: none; } -.spacewalk-toolbar>a:last-child{ +.spacewalk-toolbar>a:last-child { border-right:0 } /* systems selected tool*/ -.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i{ +.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i { cursor: pointer; } -.spacewalk-bar i{ +.spacewalk-bar i { padding: 0 .3em; } -#show-systems-bar{ +#show-systems-bar { padding: .5em 1.2em; background: #fff; border:1px solid #ccc; @@ -420,6 +479,6 @@ h1 .icon-stack{ } /* tab nav */ -.spacewalk-content-nav .nav.nav-tabs li.active a{ +.spacewalk-content-nav .nav.nav-tabs li.active a { background: #dddddd; } diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index 0eeca48..7e1625a 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -18,13 +18,13 @@ <header> <jsp:include page="/WEB-INF/includes/header.jsp" /> </header> - <div class="body-container row"> - <aside class="col-md-2"> + <div class="spacewalk-aside-content-layout"> + <aside id="spacewalk-aside"> <jsp:include page="/WEB-INF/includes/leftnav.jsp" /> <jsp:include page="/WEB-INF/includes/legends.jsp" /> <jsp:include page="/WEB-INF/includes/advertisements.jsp" /> </aside> - <section class="col-md-10"> + <section id="spacewalk-content">  <logic:messagesPresent> <div class="alert alert-info"> diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 0fe4ffe..899eb9c 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -9,8 +9,8 @@ <center><p><c:out value="${custom_header}" escapeXml="false"/></p></center> </c:if> -<div class="row"> - <div id="logo" class="col-md-3 logo"> +<div class="spacewalk-header-container"> + <div id="logo" class="spacewalk-logo"> <a href="<bean:message key="layout.jsp.vendor.website"/>" title="<bean:message key="layout.jsp.vendor.title"/>"> <img src="/img/logo_vendor.png" alt="<bean:message key="layout.jsp.vendor.name"/>" id="rhLogo" /> </a> @@ -18,7 +18,7 @@ <img src="/img/logo_product.png" alt="<bean:message key="layout.jsp.productname"/>" id="rhnLogo" accesskey="2"/> </a> </div> - <div class="col-md-9 text-right"> + <div class="spacewalk-header-links"> <rhn:require acl="user_authenticated()"> <ul class="nav nav-pills"> <li><a href="/rhn/account/LocalePreferences.do"><c:out value="${rhnActiveLang} "/>(<bean:message key="header.jsp.change"/>)</a></li> commit bef94a5854bea07cb2e9b6310d519f498a565e42 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 15 18:17:29 2013 +0200 enable less.js debug/error messages diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index b498cfb..d4bdabe 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -30,6 +30,7 @@ <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> + <script type="text/javascript">less = { env: 'development' };</script> <script src="/javascript/less.js"></script> <script src="/javascript/jquery.js"></script> <script src="/javascript/bootstrap.js"></script> commit 62745edd15f834ae5411e56d89fb811818934431 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 17:54:33 2013 +0200 Re-order javascript references diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 1939eee..b498cfb 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -30,12 +30,11 @@ <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> - <script src="/javascript/jquery.js"></script> <script src="/javascript/less.js"></script> + <script src="/javascript/jquery.js"></script> + <script src="/javascript/bootstrap.js"></script> + <script src="/javascript/spacewalk-essentials.js"></script> <script src="/rhn/dwr/engine.js"></script> <script src="/rhn/dwr/util.js"></script> <script src="/rhn/dwr/interface/DWRItemSelector.js"></script> - - <script src="/javascript/bootstrap.js"></script> - <script src="/javascript/spacewalk-essentials.js"></script> commit 9fc3864c6e523aa01158fd2a670f3c8492d9f10f Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 17:44:14 2013 +0200 Provide a static version of less version 1.4.1 diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 272e535..1939eee 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -31,7 +31,7 @@ <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> <script src="/javascript/jquery.js"></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/1.4.1/less.min.js"></script> + <script src="/javascript/less.js"></script> <script src="/rhn/dwr/engine.js"></script> <script src="/rhn/dwr/util.js"></script> diff --git a/web/html/javascript/less.js b/web/html/javascript/less.js new file mode 100644 index 0000000..5aaea85 --- /dev/null +++ b/web/html/javascript/less.js @@ -0,0 +1,11 @@ +/* + * LESS - Leaner CSS v1.4.1 + * http://lesscss.org + * + * Copyright (c) 2009-2013, Alexis Sellier + * Licensed under the Apache 2.0 License. + * + * @licence + */(function(e,t){function n(t){return e.less[t.split("/")[1]]}function f(){r.env==="development"?(r.optimization=0,r.watchTimer=setInterval(function(){r.watchMode&&g(function(e,t,n,i,s){e?k(e,i.href):t&&S(t.toCSS(r),i,s.lastModified)})},r.poll)):r.optimization=3}function m(){var e=document.getElementsByTagName("style");for(var t=0;t<e.length;t++)if(e[t].type.match(p)){var n=new r.tree.parseEnv(r);n.filename=document.location.href.replace(/#.*$/,""),(new r.Parser(n)).parse(e[t].innerHTML||"",function(n,i){if(n)return k(n,"inline");var s=i.toCSS(r),o=e[t];o.type="text/css",o.styleSheet?o.styleSheet.cssText=s:o.innerHTML=s})}}function g(e,t){for(var n=0;n<r.sheets.length;n++)w(r.sheets[n],e,t,r.sheets.length-(n+1))}function y(e,t){var n=b(e),r=b(t),i,s,o,u,a="";if(n.hostPart!==r.hostPart)return"";s=Math.max(r.directories.length,n.directories.length);for(i=0;i<s;i++)if(r.directories[i]!==n.directories[i])break;u=r.directories.slice(i),o=n.directories.slice(i);for(i=0;i<u.length -1;i++)a+="../";for(i=0;i<o.length-1;i++)a+=o[i]+"/";return a}function b(e,t){var n=/^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/,r=e.match(n),i={},s=[],o,u;if(!r)throw new Error("Could not parse sheet href - '"+e+"'");if(!r[1]||r[2]){u=t.match(n);if(!u)throw new Error("Could not parse page url - '"+t+"'");r[1]=r[1]||u[1]||"",r[2]||(r[3]=u[3]+r[3])}if(r[3]){s=r[3].replace("\\","/").split("/");for(o=0;o<s.length;o++)s[o]==="."&&(s.splice(o,1),o-=1);for(o=0;o<s.length;o++)s[o]===".."&&o>0&&(s.splice(o-1,2),o-=2)}return i.hostPart=r[1],i.directories=s,i.path=r[1]+s.join("/"),i.fileUrl=i.path+(r[4]||""),i.url=i.fileUrl+(r[5]||""),i}function w(t,n,i,s){var o=b(t.href,e.location.href),u=o.url,a=l&&l.getItem(u),f=l&&l.getItem(u+":timestamp"),c={css:a,timestamp:f},h,p={relativeUrls:r.relativeUrls,currentDirectory:o.path,filename:u};t instanceof r.tree.parseEnv?(h=new r.tree.parseEnv(t),p.entryPath=h.currentFileInfo.entryPath,p.rootpa th=h.currentFileInfo.rootpath,p.rootFilename=h.currentFileInfo.rootFilename):(h=new r.tree.parseEnv(r),h.mime=t.type,p.entryPath=o.path,p.rootpath=r.rootpath||o.path,p.rootFilename=u),h.relativeUrls&&(r.rootpath?p.rootpath=b(r.rootpath+y(o.path,p.entryPath)).path:p.rootpath=o.path),x(u,t.type,function(e,a){v+=e.replace(/@import .+?;/ig,"");if(!i&&c&&a&&(new Date(a)).valueOf()===(new Date(c.timestamp)).valueOf())S(c.css,t),n(null,null,e,t,{local:!0,remaining:s},u);else try{h.contents[u]=e,h.paths=[o.path],h.currentFileInfo=p,(new r.Parser(h)).parse(e,function(r,i){if(r)return n(r,null,null,t);try{n(r,i,e,t,{local:!1,lastModified:a,remaining:s},u),h.currentFileInfo.rootFilename===u&&N(document.getElementById("less-error-message:"+E(u)))}catch(r){n(r,null,null,t)}})}catch(f){n(f,null,null,t)}},function(e,r){n({type:"File",message:"'"+r+"' wasn't found ("+e+")"},null,null,t)})}function E(e){return e.replace(/^[a-z-]+:\/+?[^\/]+/,"").replace(/^\//,"").replace(/\.[a-zA-Z]+$/,"").r eplace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function S(e,t,n){var r=t.href||"",i="less:"+(t.title||E(r)),s=document.getElementById(i),o=!1,u=document.createElement("style");u.setAttribute("type","text/css"),t.media&&u.setAttribute("media",t.media),u.id=i;if(u.styleSheet)try{u.styleSheet.cssText=e}catch(a){throw new Error("Couldn't reassign styleSheet.cssText.")}else u.appendChild(document.createTextNode(e)),o=s!==null&&s.childNodes.length>0&&u.childNodes.length>0&&s.firstChild.nodeValue===u.firstChild.nodeValue;var f=document.getElementsByTagName("head")[0];if(s==null||o===!1){var c=t&&t.nextSibling||null;(c||document.getElementsByTagName("head")[0]).parentNode.insertBefore(u,c)}s&&o===!1&&f.removeChild(s);if(n&&l){C("saving "+r+" to cache.");try{l.setItem(r,e),l.setItem(r+":timestamp",n)}catch(a){C("failed to save")}}}function x(e,t,n,i){function a(t,n,r){t.status>=200&&t.status<300?n(t.responseText,t.getResponseHeader("Last-Modified")):typeof r=="function"&&r(t.status,e)}v ar s=T(),u=o?r.fileAsync:r.async;typeof s.overrideMimeType=="function"&&s.overrideMimeType("text/css"),s.open("GET",e,u),s.setRequestHeader("Accept",t||"text/x-less, text/css; q=0.9, */*; q=0.5"),s.send(null),o&&!r.fileAsync?s.status===0||s.status>=200&&s.status<300?n(s.responseText):i(s.status,e):u?s.onreadystatechange=function(){s.readyState==4&&a(s,n,i)}:a(s,n,i)}function T(){if(e.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(t){return C("browser doesn't support AJAX."),null}}function N(e){return e&&e.parentNode.removeChild(e)}function C(e){r.env=="development"&&typeof console!="undefined"&&console.log("less: "+e)}function k(e,n){var i="less-error-message:"+E(n||""),s='<li><label>{line}</label><pre class="{class}">{content}</pre></li>',o=document.createElement("div"),u,a,f=[],l=e.filename||n,c=l.match(/([^\/]+(\?.*)?)$/)[1];o.id=i,o.className="less-error-message",a="<h3>"+(e.type||"Syntax")+"Error: "+(e.message||"There i s an error in your .less file")+"</h3>"+'<p>in <a href="'+l+'">'+c+"</a> ";var h=function(e,n,r){e.extract[n]!=t&&f.push(s.replace(/\{line\}/,(parseInt(e.line)||0)+(n-1)).replace(/\{class\}/,r).replace(/\{content\}/,e.extract[n]))};e.extract?(h(e,0,""),h(e,1,"line"),h(e,2,""),a+="on line "+e.line+", column "+(e.column+1)+":</p>"+"<ul>"+f.join("")+"</ul>"):e.stack&&(a+="<br/>"+e.stack.split("\n").slice(1).join("<br/>")),o.innerHTML=a,S([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: # 10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),o.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),r.env=="development"&&(u=setInterval(function(){document.body&&(document.getElementById(i)?document.body.replaceChild(o,document.getElementById(i)):document.body.insertBefore(o,document.body.firstChild),clearInterval(u))},10))}var r,i,s;typeof environment=="object"&&{}.toString.call(environment)==="[object Environment]"?(typeof e=="undefined"?r={}:r=e.less={},i=r.tree={},r.mode="rhino"):typeof e=="undefined"?(r=exports,i=n("./tree"),r.mode="node"):(typeof e.less=="undefined"&&(e.less={}),r=e.less,i=e.less.tree={},r.mode="browser"),r.Parser=function(t){function m(){a=c[u], f=o,h=o}function g(){c[u]=a,o=f,h=o}function y(){o>h&&(c[u]=c[u].slice(o-h),h=o)}function b(e){var t=e.charCodeAt(0);return t===32||t===10||t===9}function w(e){var t,n,r,i,a;if(e instanceof Function)return e.call(p.parsers);if(typeof e=="string")t=s.charAt(o)===e?e:null,r=1,y();else{y();if(!(t=e.exec(c[u])))return null;r=t[0].length}if(t)return E(r),typeof t=="string"?t:t.length===1?t[0]:t}function E(e){var t=o,n=u,r=o+c[u].length,i=o+=e;while(o<r){if(!b(s.charAt(o)))break;o++}return c[u]=c[u].slice(e+(o-i)),h=o,c[u].length===0&&u<c.length-1&&u++,t!==o||n!==u}function S(e,t){var n=w(e);if(!!n)return n;x(t||(typeof e=="string"?"expected '"+e+"' got '"+s.charAt(o)+"'":"unexpected token"))}function x(e,t){var n=new Error(e);throw n.index=o,n.type=t||"Syntax",n}function T(e){return typeof e=="string"?s.charAt(o)===e:e.test(c[u])?!0:!1}function N(e,t){return e.filename&&t.currentFileInfo.filename&&e.filename!==t.currentFileInfo.filename?p.imports.contents[e.filename]:s}function C (e,t){for(var n=e,r=-1;n>=0&&t.charAt(n)!=="\n";n--)r++;return{line:typeof e=="number"?(t.slice(0,e).match(/\n/g)||"").length:null,column:r}}function k(e,t,i){var s=i.currentFileInfo.filename;return r.mode!=="browser"&&r.mode!=="rhino"&&(s=n("path").resolve(s)),{lineNumber:C(e,t).line+1,fileName:s}}function L(e,t){var n=N(e,t),r=C(e.index,n),i=r.line,s=r.column,o=n.split("\n");this.type=e.type||"Syntax",this.message=e.message,this.filename=e.filename||t.currentFileInfo.filename,this.index=e.index,this.line=typeof i=="number"?i+1:null,this.callLine=e.call&&C(e.call,n).line+1,this.callExtract=o[C(e.call,n).line],this.stack=e.stack,this.column=s,this.extract=[o[i-1],o[i],o[i+1]]}var s,o,u,a,f,l,c,h,p,d=this;t instanceof i.parseEnv||(t=new i.parseEnv(t));var v=this.imports={paths:t.paths||[],queue:[],files:t.files,contents:t.contents,mime:t.mime,error:null,push:function(e,n,i){var s=this;this.queue.push(e),r.Parser.importer(e,n,function(t,n,r){s.queue.splice(s.queue.indexOf(e),1 );var o=r in s.files;s.files[r]=n,t&&!s.error&&(s.error=t),i(t,n,o)},t)}};return L.prototype=new Error,L.prototype.constructor=L,this.env=t=t||{},this.optimization="optimization"in this.env?this.env.optimization:1,p={imports:v,parse:function(e,a){var f,d,v,m,g,y,b=[],E,S=null;o=u=h=l=0,s=e.replace(/\r\n/g,"\n"),s=s.replace(/^\uFEFF/,""),c=function(e){var n=0,r=/(?:@\{[\w-]+\}|[^"'`\{\}\/\\])+/g,i=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,o=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`]|\\.)*)`/g,u=0,a,f=e[0],l;for(var c=0,h,p;c<s.length;){r.lastIndex=c,(a=r.exec(s))&&a.index===c&&(c+=a[0].length,f.push(a[0])),h=s.charAt(c),i.lastIndex=o.lastIndex=c;if(a=o.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}if(!l&&h==="/"){p=s.charAt(c+1);if(p==="/"||p==="*")if(a=i.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}}switch(h){case"{":if(!l){u++,f.push(h);break};case"}":if(!l){u--,f.push(h),e[++n]=f=[];break};case"(":if(!l){l=!0,f.push(h);break} ;case")":if(l){l=!1,f.push(h);break};default:f.push(h)}c++}return u!=0&&(S=new L({index:c-1,type:"Parse",message:u>0?"missing closing `}`":"missing opening `{`",filename:t.currentFileInfo.filename},t)),e.map(function(e){return e.join("")})}([[]]);if(S)return a(new L(S,t));try{f=new i.Ruleset([],w(this.parsers.primary)),f.root=!0,f.firstRoot=!0}catch(x){return a(new L(x,t))}f.toCSS=function(e){var s,o,u;return function(s,o){s=s||{};var u,a=new i.evalEnv(s);typeof o=="object"&&!Array.isArray(o)&&(o=Object.keys(o).map(function(e){var t=o[e];return t instanceof i.Value||(t instanceof i.Expression||(t=new i.Expression([t])),t=new i.Value([t])),new i.Rule("@"+e,t,!1,0)}),a.frames=[new i.Ruleset(null,o)]);try{var f=e.call(this,a);(new i.joinSelectorVisitor).run(f),(new i.processExtendsVisitor).run(f);var l=f.toCSS({compress:Boolean(s.compress),dumpLineNumbers:t.dumpLineNumbers,strictUnits:Boolean(s.strictUnits)})}catch(c){throw new L(c,t)}return s.yuicompress&&r.mode==="node"?n("yc ssmin").cssmin(l,s.maxLineLen):s.compress?l.replace(/(\s)+/g,"$1"):l}}(f.eval);if(o<s.length-1){o=l,y=s.split("\n"),g=(s.slice(0,o).match(/\n/g)||"").length+1;for(var T=o,N=-1;T>=0&&s.charAt(T)!=="\n";T--)N++;S={type:"Parse",message:"Unrecognised input",index:o,filename:t.currentFileInfo.filename,line:g,column:N,extract:[y[g-2],y[g-1],y[g]]}}var C=function(e){e=S||e||p.imports.error,e?(e instanceof L||(e=new L(e,t)),a(e)):a(null,f)};t.processImports!==!1?(new i.importVisitor(this.imports,C)).run(f):C()},parsers:{primary:function(){var e,t=[];while((e=w(this.extendRule)||w(this.mixin.definition)||w(this.rule)||w(this.ruleset)||w(this.mixin.call)||w(this.comment)||w(this.directive))||w(/^[\s\n]+/)||w(/^;+/))e&&t.push(e);return t},comment:function(){var e;if(s.charAt(o)!=="/")return;if(s.charAt(o+1)==="/")return new i.Comment(w(/^\/\/.*/),!0);if(e=w(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new i.Comment(e)},entities:{quoted:function(){var e,n=o,r,u=o;s.charAt(n)==="~"&&(n++,r =!0);if(s.charAt(n)!=='"'&&s.charAt(n)!=="'")return;r&&w("~");if(e=w(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new i.Quoted(e[0],e[1]||e[2],r,u,t.currentFileInfo)},keyword:function(){var e;if(e=w(/^[_A-Za-z-][_A-Za-z0-9-]*/))return i.colors.hasOwnProperty(e)?new i.Color(i.colors[e].slice(1)):new i.Keyword(e)},call:function(){var e,n,r,s,a=o;if(!(e=/^([\w-]+|%|progid:[\w\.]+)$/.exec(c[u])))return;e=e[1],n=e.toLowerCase();if(n==="url")return null;o+=e.length;if(n==="alpha"){s=w(this.alpha);if(typeof s!="undefined")return s}w("("),r=w(this.entities.arguments);if(!w(")"))return;if(e)return new i.Call(e,r,a,t.currentFileInfo)},arguments:function(){var e=[],t;while(t=w(this.entities.assignment)||w(this.expression)){e.push(t);if(!w(","))break}return e},literal:function(){return w(this.entities.dimension)||w(this.entities.color)||w(this.entities.quoted)||w(this.entities.unicodeDescriptor)},assignment:function(){var e,t;if((e=w(/^\w+(?=\s?=)/i))&&w("=")&&(t=w(this.e ntity)))return new i.Assignment(e,t)},url:function(){var e;if(s.charAt(o)!=="u"||!w(/^url\(/))return;return e=w(this.entities.quoted)||w(this.entities.variable)||w(/^(?:(?:\\[\($'"])|[^'"])+/)||"",S(")"),new i.URL(e.value!=null||e instanceof i.Variable?e:new i.Anonymous(e),t.currentFileInfo)},variable:function(){var e,n=o;if(s.charAt(o)==="@"&&(e=w(/^@@?[\w-]+/)))return new i.Variable(e,n,t.currentFileInfo)},variableCurly:function(){var e,n,r=o;if(s.charAt(o)==="@"&&(n=w(/^@\{([\w-]+)\}/)))return new i.Variable("@"+n[1],r,t.currentFileInfo)},color:function(){var e;if(s.charAt(o)==="#"&&(e=w(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/)))return new i.Color(e[1])},dimension:function(){var e,t=s.charCodeAt(o);if(t>57||t<43||t===47||t==44)return;if(e=w(/^([+-]?\d*\.?\d+)(%|[a-z]+)?/))return new i.Dimension(e[1],e[2])},unicodeDescriptor:function(){var e;if(e=w(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/))return new i.UnicodeDescriptor(e[0])},javascript:function(){var e,t=o,n;s.charAt(t)=== "~"&&(t++,n=!0);if(s.charAt(t)!=="`")return;n&&w("~");if(e=w(/^`([^`]*)`/))return new i.JavaScript(e[1],o,n)}},variable:function(){var e;if(s.charAt(o)==="@"&&(e=w(/^(@[\w-]+)\s*:/)))return e[1]},extend:function(e){var t,n,r=o,s,u=[];if(!w(e?/^&:extend$/:/^:extend\(/))return;do{s=null,t=[];for(;;){s=w(/^(all)(?=\s*($|,))/);if(s)break;n=w(this.element);if(!n)break;t.push(n)}s=s&&s[1],u.push(new i.Extend(new i.Selector(t),s,r))}while(w(","));return S(/^\)/),e&&S(/^;/),u},extendRule:function(){return this.extend(!0)},mixin:{call:function(){var e=[],n,r,u,a,f,l=o,c=s.charAt(o),h=!1;if(c!=="."&&c!=="#")return;m();while(n=w(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/))e.push(new i.Element(r,n,o)),r=w(">");w("(")&&(u=this.mixin.args.call(this,!0).args,S(")")),u=u||[],w(this.important)&&(h=!0);if(e.length>0&&(w(";")||T("}")))return new i.mixin.Call(e,u,l,t.currentFileInfo,h);g()},args:function(e){var t=[],n=[],r,u=[],a,f,l,c,h,p={args:null,variadic:!1};for(;;){if(e)h=w (this.expression);else{w(this.comment);if(s.charAt(o)==="."&&w(/^\.{3}/)){p.variadic=!0,w(";")&&!r&&(r=!0),(r?n:u).push({variadic:!0});break}h=w(this.entities.variable)||w(this.entities.literal)||w(this.entities.keyword)}if(!h)break;l=null,h.throwAwayComments&&h.throwAwayComments(),c=h;var d=null;if(e){if(h.value.length==1)var d=h.value[0]}else d=h;if(d&&d instanceof i.Variable)if(w(":"))t.length>0&&(r&&x("Cannot mix ; and , as delimiter types"),a=!0),c=S(this.expression),l=f=d.name;else{if(!e&&w(/^\.{3}/)){p.variadic=!0,w(";")&&!r&&(r=!0),(r?n:u).push({name:h.name,variadic:!0});break}e||(f=l=d.name,c=null)}c&&t.push(c),u.push({name:l,value:c});if(w(","))continue;if(w(";")||r)a&&x("Cannot mix ; and , as delimiter types"),r=!0,t.length>1&&(c=new i.Value(t)),n.push({name:f,value:c}),f=null,t=[],a=!1}return p.args=r?n:u,p},definition:function(){var e,t=[],n,r,u,a,f,c=!1;if(s.charAt(o)!=="."&&s.charAt(o)!=="#"||T(/^[^{]*\}/))return;m();if(n=w(/^([#.](?:[\w-]|\$?:[A-Fa-f0-9]{1,6 } ?|[^A-Fa-f0-9]))+)\s*\(/)){e=n[1];var h=this.mixin.args.call(this,!1);t=h.args,c=h.variadic,w(")")||(l=o,g()),w(this.comment),w(/^when/)&&(f=S(this.conditions,"expected condition")),r=w(this.block);if(r)return new i.mixin.Definition(e,t,r,f,c);g()}}},entity:function(){return w(this.entities.literal)||w(this.entities.variable)||w(this.entities.url)||w(this.entities.call)||w(this.entities.keyword)||w(this.entities.javascript)||w(this.comment)},end:function(){return w(";")||T("}")},alpha:function(){var e;if(!w(/^\(opacity=/i))return;if(e=w(/^\d+/)||w(this.entities.variable))return S(")"),new i.Alpha(e)},element:function(){var e,t,n,r;n=w(this.combinator),e=w(/^(?:\d+\.\d+|\d+)%/)||w(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/)||w("*")||w("&")||w(this.attribute)||w(/^\([^()@]+$/)||w(/^[\.#](?=@)/)||w(this.entities.variableCurly),e||w("(")&&(r=w(this.selector))&&w(")")&&(e=new i.Paren(r));if(e)return new i.Element(n,e,o)},combinator:function(){ var e=s.charAt(o);if(e===">"||e==="+"||e==="~"||e==="|"){o++;while(s.charAt(o).match(/\s/))o++;return new i.Combinator(e)}return s.charAt(o-1).match(/\s/)?new i.Combinator(" "):new i.Combinator(null)},selector:function(){var e,t,n=[],r,u,a=[];while((u=w(this.extend))||(t=w(this.element))){u?a.push.apply(a,u):(a.length&&x("Extend can only be used at the end of selector"),r=s.charAt(o),n.push(t),t=null);if(r==="{"||r==="}"||r===";"||r===","||r===")")break}if(n.length>0)return new i.Selector(n,a);a.length&&x("Extend must be used to extend a selector, it cannot be used on its own")},attribute:function(){var e="",t,n,r;if(!w("["))return;(t=w(this.entities.variableCurly))||(t=S(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/));if(r=w(/^[|~*$^]?=/))n=w(this.entities.quoted)||w(/^[\w-]+/)||w(this.entities.variableCurly);return S("]"),new i.Attribute(t,r,n)},block:function(){var e;if(w("{")&&(e=w(this.primary))&&w("}"))return e},ruleset:function(){var e=[],n,r,u;m(),t.dumpLineNumber s&&(u=k(o,s,t));while(n=w(this.selector)){e.push(n),w(this.comment);if(!w(","))break;w(this.comment)}if(e.length>0&&(r=w(this.block))){var a=new i.Ruleset(e,r,t.strictImports);return t.dumpLineNumbers&&(a.debugInfo=u),a}l=o,g()},rule:function(e){var n,r,u=s.charAt(o),a;m();if(u==="."||u==="#"||u==="&")return;if(n=w(this.variable)||w(this.property)){r=!e&&(t.compress||n.charAt(0)==="@")?w(this.value)||w(this.anonymousValue):w(this.anonymousValue)||w(this.value),a=w(this.important);if(r&&w(this.end))return new i.Rule(n,r,a,f,t.currentFileInfo);l=o,g();if(r&&!e)return this.rule(!0)}},anonymousValue:function(){var e;if(e=/^([^@+\/'"*`(;{}-]*);/.exec(c[u]))return o+=e[0].length-1,new i.Anonymous(e[1])},"import":function(){var e,n,r=o;m();var s=w(/^@import?\s+/),u=(s?w(this.importOptions):null)||{};if(s&&(e=w(this.entities.quoted)||w(this.entities.url))){n=w(this.mediaFeatures);if(w(";"))return n=n&&new i.Value(n),new i.Import(e,n,u,r,t.currentFileInfo)}g()},importOptions:function (){var e,t={},n,r;if(!w("("))return null;do if(e=w(this.importOption)){n=e,r=!0;switch(n){case"css":n="less",r=!1;break;case"once":n="multiple",r=!1}t[n]=r;if(!w(","))break}while(e);return S(")"),t},importOption:function(){var e=w(/^(less|css|multiple|once)/);if(e)return e[1]},mediaFeature:function(){var e,n,r=[];do if(e=w(this.entities.keyword))r.push(e);else if(w("(")){n=w(this.property),e=w(this.value);if(!w(")"))return null;if(n&&e)r.push(new i.Paren(new i.Rule(n,e,null,o,t.currentFileInfo,!0)));else{if(!e)return null;r.push(new i.Paren(e))}}while(e);if(r.length>0)return new i.Expression(r)},mediaFeatures:function(){var e,t=[];do if(e=w(this.mediaFeature)){t.push(e);if(!w(","))break}else if(e=w(this.entities.variable)){t.push(e);if(!w(","))break}while(e);return t.length>0?t:null},media:function(){var e,n,r,u;t.dumpLineNumbers&&(u=k(o,s,t));if(w(/^(a)media/)){e=w(this.mediaFeatures);if(n=w(this.block))return r=new i.Media(n,e),t.dumpLineNumbers&&(r.debugInfo=u),r}},directiv e:function(){var e,n,r,u,a,f,l,c,h,p;if(s.charAt(o)!=="@")return;if(n=w(this["import"])||w(this.media))return n;m(),e=w(/^(a)[a-z-]+/);if(!e)return;l=e,e.charAt(1)=="-"&&e.indexOf("-",2)>0&&(l="@"+e.slice(e.indexOf("-",2)+1));switch(l){case"@font-face":c=!0;break;case"@viewport":case"@top-left":case"@top-left-corner":case"@top-center":case"@top-right":case"@top-right-corner":case"@bottom-left":case"@bottom-left-corner":case"@bottom-center":case"@bottom-right":case"@bottom-right-corner":case"@left-top":case"@left-middle":case"@left-bottom":case"@right-top":case"@right-middle":case"@right-bottom":c=!0;break;case"@page":case"@document":case"@supports":case"@keyframes":c=!0,h=!0;break;case"@namespace":p=!0}h&&(e+=" "+(w(/^[^{]+/)||"").trim());if(c){if(r=w(this.block))return new i.Directive(e,r)}else if((n=p?w(this.expression):w(this.entity))&&w(";")){var d=new i.Directive(e,n);return t.dumpLineNumbers&&(d.debugInfo=k(o,s,t)),d}g()},value:function(){var e,t=[],n;while(e=w(this.expr ession)){t.push(e);if(!w(","))break}if(t.length>0)return new i.Value(t)},important:function(){if(s.charAt(o)==="!")return w(/^! *important/)},sub:function(){var e,t;if(w("("))if(e=w(this.addition))return t=new i.Expression([e]),S(")"),t.parens=!0,t},multiplication:function(){var e,t,n,r,u,a=[];if(e=w(this.operand)){u=b(s.charAt(o-1));while(!T(/^\/[*\/]/)&&(n=w("/")||w("*"))){if(!(t=w(this.operand)))break;e.parensInOp=!0,t.parensInOp=!0,r=new i.Operation(n,[r||e,t],u),u=b(s.charAt(o-1))}return r||e}},addition:function(){var e,t,n,r,u;if(e=w(this.multiplication)){u=b(s.charAt(o-1));while((n=w(/^[-+]\s+/)||!u&&(w("+")||w("-")))&&(t=w(this.multiplication)))e.parensInOp=!0,t.parensInOp=!0,r=new i.Operation(n,[r||e,t],u),u=b(s.charAt(o-1));return r||e}},conditions:function(){var e,t,n=o,r;if(e=w(this.condition)){while(w(",")&&(t=w(this.condition)))r=new i.Condition("or",r||e,t,n);return r||e}},condition:function(){var e,t,n,r,s=o,u=!1;w(/^not/)&&(u=!0),S("(");if(e=w(this.addition) ||w(this.entities.keyword)||w(this.entities.quoted))return(r=w(/^(?:>=|=<|[<=>])/))?(t=w(this.addition)||w(this.entities.keyword)||w(this.entities.quoted))?n=new i.Condition(r,e,t,s,u):x("expected expression"):n=new i.Condition("=",e,new i.Keyword("true"),s,u),S(")"),w(/^and/)?new i.Condition("and",n,w(this.condition)):n},operand:function(){var e,t=s.charAt(o+1);s.charAt(o)==="-"&&(t==="@"||t==="(")&&(e=w("-"));var n=w(this.sub)||w(this.entities.dimension)||w(this.entities.color)||w(this.entities.variable)||w(this.entities.call);return e&&(n.parensInOp=!0,n=new i.Negative(n)),n},expression:function(){var e,t,n=[],r;while(e=w(this.addition)||w(this.entity))n.push(e),!T(/^\/[\/*]/)&&(t=w("/"))&&n.push(new i.Anonymous(t));if(n.length>0)return new i.Expression(n)},property:function(){var e;if(e=w(/^(\*?-?[_a-z0-9-]+)\s*:/))return e[1]}}}};if(r.mode==="browser"||r.mode==="rhino")r.Parser.importer=function(e,t,n,r){!/^([a-z-]+:)?\//.test(e)&&t.currentDirectory&&(e=t.currentDirecto ry+e);var i=r.toSheet(e);i.processImports=!1,i.currentFileInfo=t,w(i,function(e,t,r,i,s,o){n.call(null,e,t,o)},!0)};(function(r){function u(e){return r.functions.hsla(e.h,e.s,e.l,e.a)}function a(e,t){return e instanceof r.Dimension&&e.unit.is("%")?parseFloat(e.value*t/100):f(e)}function f(e){if(e instanceof r.Dimension)return parseFloat(e.unit.is("%")?e.value/100:e.value);if(typeof e=="number")return e;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function l(e){return Math.min(1,Math.max(0,e))}r.functions={rgb:function(e,t,n){return this.rgba(e,t,n,1)},rgba:function(e,t,n,i){var s=[e,t,n].map(function(e){return a(e,256)});return i=f(i),new r.Color(s,i)},hsl:function(e,t,n){return this.hsla(e,t,n,1)},hsla:function(e,t,n,r){function o(e){return e=e<0?e+1:e>1?e-1:e,e*6<1?s+(i-s)*e*6:e*2<1?i:e*3<2?s+(i-s)*(2/3-e)*6:s}e=f(e)%360/360,t=l(f(t)),n=l(f(n)),r=l(f(r));var i=n<=.5?n*(t+1):n+t-n*t,s=n*2-i;return this.rgba(o(e+1/3)*255,o(e)*255,o(e-1/3)* 255,r)},hsv:function(e,t,n){return this.hsva(e,t,n,1)},hsva:function(e,t,n,r){e=f(e)%360/360*360,t=f(t),n=f(n),r=f(r);var i,s;i=Math.floor(e/60%6),s=e/60-i;var o=[n,n*(1-t),n*(1-s*t),n*(1-(1-s)*t)],u=[[0,3,1],[2,0,1],[1,0,3],[1,2,0],[3,1,0],[0,1,2]];return this.rgba(o[u[i][0]]*255,o[u[i][1]]*255,o[u[i][2]]*255,r)},hue:function(e){return new r.Dimension(Math.round(e.toHSL().h))},saturation:function(e){return new r.Dimension(Math.round(e.toHSL().s*100),"%")},lightness:function(e){return new r.Dimension(Math.round(e.toHSL().l*100),"%")},hsvhue:function(e){return new r.Dimension(Math.round(e.toHSV().h))},hsvsaturation:function(e){return new r.Dimension(Math.round(e.toHSV().s*100),"%")},hsvvalue:function(e){return new r.Dimension(Math.round(e.toHSV().v*100),"%")},red:function(e){return new r.Dimension(e.rgb[0])},green:function(e){return new r.Dimension(e.rgb[1])},blue:function(e){return new r.Dimension(e.rgb[2])},alpha:function(e){return new r.Dimension(e.toHSL().a)},luma:functio n(e){return new r.Dimension(Math.round(e.luma()*e.alpha*100),"%")},saturate:function(e,t){var n=e.toHSL();return n.s+=t.value/100,n.s=l(n.s),u(n)},desaturate:function(e,t){var n=e.toHSL();return n.s-=t.value/100,n.s=l(n.s),u(n)},lighten:function(e,t){var n=e.toHSL();return n.l+=t.value/100,n.l=l(n.l),u(n)},darken:function(e,t){var n=e.toHSL();return n.l-=t.value/100,n.l=l(n.l),u(n)},fadein:function(e,t){var n=e.toHSL();return n.a+=t.value/100,n.a=l(n.a),u(n)},fadeout:function(e,t){var n=e.toHSL();return n.a-=t.value/100,n.a=l(n.a),u(n)},fade:function(e,t){var n=e.toHSL();return n.a=t.value/100,n.a=l(n.a),u(n)},spin:function(e,t){var n=e.toHSL(),r=(n.h+t.value)%360;return n.h=r<0?360+r:r,u(n)},mix:function(e,t,n){n||(n=new r.Dimension(50));var i=n.value/100,s=i*2-1,o=e.toHSL().a-t.toHSL().a,u=((s*o==-1?s:(s+o)/(1+s*o))+1)/2,a=1-u,f=[e.rgb[0]*u+t.rgb[0]*a,e.rgb[1]*u+t.rgb[1]*a,e.rgb[2]*u+t.rgb[2]*a],l=e.alpha*i+t.alpha*(1-i);return new r.Color(f,l)},greyscale:function(e){retur n this.desaturate(e,new r.Dimension(100))},contrast:function(e,t,n,r){if(!e.rgb)return null;typeof n=="undefined"&&(n=this.rgba(255,255,255,1)),typeof t=="undefined"&&(t=this.rgba(0,0,0,1));if(t.luma()>n.luma()){var i=n;n=t,t=i}return typeof r=="undefined"?r=.43:r=f(r),e.luma()*e.alpha<r?n:t},e:function(e){return new r.Anonymous(e instanceof r.JavaScript?e.evaluated:e)},escape:function(e){return new r.Anonymous(encodeURI(e.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/$/g,"%28").replace(/$/g,"%29"))},"%":function(e){var t=Array.prototype.slice.call(arguments,1),n=e.value;for(var i=0;i<t.length;i++)n=n.replace(/%[sda]/i,function(e){var n=e.match(/s/i)?t[i].value:t[i].toCSS();return e.match(/[A-Z]$/)?encodeURIComponent(n):n});return n=n.replace(/%%/g,"%"),new r.Quoted('"'+n+'"',n)},unit:function(e,t){return new r.Dimension(e.value,t?t.toCSS():"")},convert:function(e,t){return e.convertTo(t.value)},round:function(e,t){var n=ty peof t=="undefined"?0:t.value;return this._math(function(e){return e.toFixed(n)},null,e)},pi:function(){return new r.Dimension(Math.PI)},mod:function(e,t){return new r.Dimension(e.value%t.value,e.unit)},pow:function(e,t){if(typeof e=="number"&&typeof t=="number")e=new r.Dimension(e),t=new r.Dimension(t);else if(!(e instanceof r.Dimension)||!(t instanceof r.Dimension))throw{type:"Argument",message:"arguments must be numbers"};return new r.Dimension(Math.pow(e.value,t.value),e.unit)},_math:function(e,t,n){if(n instanceof r.Dimension)return new r.Dimension(e(parseFloat(n.value)),t==null?n.unit:t);if(typeof n=="number")return e(n);throw{type:"Argument",message:"argument must be a number"}},argb:function(e){return new r.Anonymous(e.toARGB())},percentage:function(e){return new r.Dimension(e.value*100,"%")},color:function(e){if(e instanceof r.Quoted)return new r.Color(e.value.slice(1));throw{type:"Argument",message:"argument must be a string"}},iscolor:function(e){return this._isa( e,r.Color)},isnumber:function(e){return this._isa(e,r.Dimension)},isstring:function(e){return this._isa(e,r.Quoted)},iskeyword:function(e){return this._isa(e,r.Keyword)},isurl:function(e){return this._isa(e,r.URL)},ispixel:function(e){return this.isunit(e,"px")},ispercentage:function(e){return this.isunit(e,"%")},isem:function(e){return this.isunit(e,"em")},isunit:function(e,t){return e instanceof r.Dimension&&e.unit.is(t.value||t)?r.True:r.False},_isa:function(e,t){return e instanceof t?r.True:r.False},multiply:function(e,t){var n=e.rgb[0]*t.rgb[0]/255,r=e.rgb[1]*t.rgb[1]/255,i=e.rgb[2]*t.rgb[2]/255;return this.rgb(n,r,i)},screen:function(e,t){var n=255-(255-e.rgb[0])*(255-t.rgb[0])/255,r=255-(255-e.rgb[1])*(255-t.rgb[1])/255,i=255-(255-e.rgb[2])*(255-t.rgb[2])/255;return this.rgb(n,r,i)},overlay:function(e,t){var n=e.rgb[0]<128?2*e.rgb[0]*t.rgb[0]/255:255-2*(255-e.rgb[0])*(255-t.rgb[0])/255,r=e.rgb[1]<128?2*e.rgb[1]*t.rgb[1]/255:255-2*(255-e.rgb[1])*(255-t.rgb[1])/255,i=e. rgb[2]<128?2*e.rgb[2]*t.rgb[2]/255:255-2*(255-e.rgb[2])*(255-t.rgb[2])/255;return this.rgb(n,r,i)},softlight:function(e,t){var n=t.rgb[0]*e.rgb[0]/255,r=n+e.rgb[0]*(255-(255-e.rgb[0])*(255-t.rgb[0])/255-n)/255;n=t.rgb[1]*e.rgb[1]/255;var i=n+e.rgb[1]*(255-(255-e.rgb[1])*(255-t.rgb[1])/255-n)/255;n=t.rgb[2]*e.rgb[2]/255;var s=n+e.rgb[2]*(255-(255-e.rgb[2])*(255-t.rgb[2])/255-n)/255;return this.rgb(r,i,s)},hardlight:function(e,t){var n=t.rgb[0]<128?2*t.rgb[0]*e.rgb[0]/255:255-2*(255-t.rgb[0])*(255-e.rgb[0])/255,r=t.rgb[1]<128?2*t.rgb[1]*e.rgb[1]/255:255-2*(255-t.rgb[1])*(255-e.rgb[1])/255,i=t.rgb[2]<128?2*t.rgb[2]*e.rgb[2]/255:255-2*(255-t.rgb[2])*(255-e.rgb[2])/255;return this.rgb(n,r,i)},difference:function(e,t){var n=Math.abs(e.rgb[0]-t.rgb[0]),r=Math.abs(e.rgb[1]-t.rgb[1]),i=Math.abs(e.rgb[2]-t.rgb[2]);return this.rgb(n,r,i)},exclusion:function(e,t){var n=e.rgb[0]+t.rgb[0]*(255-e.rgb[0]-e.rgb[0])/255,r=e.rgb[1]+t.rgb[1]*(255-e.rgb[1]-e.rgb[1])/255,i=e.rgb[2]+t.rgb[2]*(255- e.rgb[2]-e.rgb[2])/255;return this.rgb(n,r,i)},average:function(e,t){var n=(e.rgb[0]+t.rgb[0])/2,r=(e.rgb[1]+t.rgb[1])/2,i=(e.rgb[2]+t.rgb[2])/2;return this.rgb(n,r,i)},negation:function(e,t){var n=255-Math.abs(255-t.rgb[0]-e.rgb[0]),r=255-Math.abs(255-t.rgb[1]-e.rgb[1]),i=255-Math.abs(255-t.rgb[2]-e.rgb[2]);return this.rgb(n,r,i)},tint:function(e,t){return this.mix(this.rgb(255,255,255),e,t)},shade:function(e,t){return this.mix(this.rgb(0,0,0),e,t)},extract:function(e,t){return t=t.value-1,e.value[t]},"data-uri":function(t,i){if(typeof e!="undefined")return(new r.URL(i||t,this.currentFileInfo)).eval(this.env);var s=t.value,o=i&&i.value,u=n("fs"),a=n("path"),f=!1;arguments.length<2&&(o=s),this.env.isPathRelative(o)&&(this.currentFileInfo.relativeUrls?o=a.join(this.currentFileInfo.currentDirectory,o):o=a.join(this.currentFileInfo.entryPath,o));if(arguments.length<2){var l;try{l=n("mime")}catch(c){l=r._mime}s=l.lookup(o);var h=l.charsets.lookup(s);f=["US-ASCII","UTF-8"].indexO f(h)<0,f&&(s+=";base64")}else f=/;base64$/.test(s);var p=u.readFileSync(o),d=32,v=parseInt(p.length/1024,10);if(v>=d){if(this.env.ieCompat!==!1)return this.env.silent||console.warn("Skipped data-uri embedding of %s because its size (%dKB) exceeds IE8-safe %dKB!",o,v,d),(new r.URL(i||t,this.currentFileInfo)).eval(this.env);this.env.silent||console.warn("WARNING: Embedding %s (%dKB) exceeds IE8's data-uri size limit of %dKB!",o,v,d)}p=f?p.toString("base64"):encodeURIComponent(p);var m="'data:"+s+","+p+"'";return new r.URL(new r.Anonymous(m))}},r._mime={_types:{".htm":"text/html",".html":"text/html",".gif":"image/gif",".jpg":"image/jpeg",".jpeg":"image/jpeg",".png":"image/png"},lookup:function(e){var i=n("path").extname(e),s=r._mime._types[i];if(s===t)throw new Error('Optional dependency "mime" is required for '+i);return s},charsets:{lookup:function(e){return e&&/^text\//.test(e)?"UTF-8":""}}};var i=[{name:"ceil"},{name:"floor"},{name:"sqrt"},{name:"abs"},{name:"tan",unit:""}, {name:"sin",unit:""},{name:"cos",unit:""},{name:"atan",unit:"rad"},{name:"asin",unit:"rad"},{name:"acos",unit:"rad"}],s=function(e,t){return function(n){return t!=null&&(n=n.unify()),this._math(Math[e],t,n)}};for(var o=0;o<i.length;o++)r.functions[i[o].name]=s(i[o].name,i[o].unit);r.functionCall=function(e,t){this.env=e,this.currentFileInfo=t},r.functionCall.prototype=r.functions})(n("./tree")),function(e){e.colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta +:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2a a",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460 ",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"}}(n("./tree")),function(e){e.Alpha=function(e){this.value=e},e.Alpha.prototype={type:"Alpha",accept:function(e){this.value=e.visit(this.value)},eval:function(e){return this.value.eval&&(this.value=this.value.eval(e)),this},toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"}}}(n("../tree")),function(e){e.Anonymous=function(e){this.value=e.value||e},e.Anonymous.prototype={type:"Anonymous",toCSS:function(){return this.value},eval:function(){return this},compare:function(e){if(!e.toCSS)return-1;var t=this.toCSS(),n=e.toCSS();return t===n?0:t<n ?-1:1}}}(n("../tree")),function(e){e.Assignment=function(e,t){this.key=e,this.value=t},e.Assignment.prototype={type:"Assignment",accept:function(e){this.value=e.visit(this.value)},toCSS:function(){return this.key+"="+(this.value.toCSS?this.value.toCSS():this.value)},eval:function(t){return this.value.eval?new e.Assignment(this.key,this.value.eval(t)):this}}}(n("../tree")),function(e){e.Call=function(e,t,n,r){this.name=e,this.args=t,this.index=n,this.currentFileInfo=r},e.Call.prototype={type:"Call",accept:function(e){this.args=e.visit(this.args)},eval:function(t){var n=this.args.map(function(e){return e.eval(t)}),r=this.name.toLowerCase(),i,s;if(r in e.functions)try{s=new e.functionCall(t,this.currentFileInfo),i=s[r].apply(s,n);if(i!=null)return i}catch(o){throw{type:o.type||"Runtime",message:"error evaluating function `"+this.name+"`"+(o.message?": "+o.message:""),index:this.index,filename:this.currentFileInfo.filename}}return new e.Anonymous(this.name+"("+n.map(function(e){ return e.toCSS(t)}).join(", ")+")")},toCSS:function(e){return this.eval(e).toCSS()}}}(n("../tree")),function(e){e.Color=function(e,t){Array.isArray(e)?this.rgb=e:e.length==6?this.rgb=e.match(/.{2}/g).map(function(e){return parseInt(e,16)}):this.rgb=e.split("").map(function(e){return parseInt(e+e,16)}),this.alpha=typeof t=="number"?t:1},e.Color.prototype={type:"Color",eval:function(){return this},luma:function(){return.2126*this.rgb[0]/255+.7152*this.rgb[1]/255+.0722*this.rgb[2]/255},toCSS:function(e,t){var n=e&&e.compress&&!t;if(this.alpha<1)return"rgba("+this.rgb.map(function(e){return Math.round(e)}).concat(this.alpha).join(","+(n?"":" "))+")";var r=this.rgb.map(function(e){return e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("");return n&&(r=r.split(""),r[0]==r[1]&&r[2]==r[3]&&r[4]==r[5]?r=r[0]+r[2]+r[4]:r=r.join("")),"#"+r},operate:function(t,n,r){var i=[];r instanceof e.Color||(r=r.toColor());for(var s=0;s<3;s++)i[s]=e.operate(t,n,this.r gb[s],r.rgb[s]);return new e.Color(i,this.alpha+r.alpha)},toHSL:function(){var e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=(i+s)/2,f=i-s;if(i===s)o=u=0;else{u=a>.5?f/(2-i-s):f/(i+s);switch(i){case e:o=(t-n)/f+(t<n?6:0);break;case t:o=(n-e)/f+2;break;case n:o=(e-t)/f+4}o/=6}return{h:o*360,s:u,l:a,a:r}},toHSV:function(){var e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=i,f=i-s;i===0?u=0:u=f/i;if(i===s)o=0;else{switch(i){case e:o=(t-n)/f+(t<n?6:0);break;case t:o=(n-e)/f+2;break;case n:o=(e-t)/f+4}o/=6}return{h:o*360,s:u,v:a,a:r}},toARGB:function(){var e=[Math.round(this.alpha*255)].concat(this.rgb);return"#"+e.map(function(e){return e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},compare:function(e){return e.rgb?e.rgb[0]===this.rgb[0]&&e.rgb[1]===this.rgb[1]&&e.rgb[2]===this.rgb[2]&&e.alpha===this.alpha?0:-1:-1}}}(n( "../tree")),function(e){e.Comment=function(e,t){this.value=e,this.silent=!!t},e.Comment.prototype={type:"Comment",toCSS:function(e){return e.compress?"":this.value},eval:function(){return this}}}(n("../tree")),function(e){e.Condition=function(e,t,n,r,i){this.op=e.trim(),this.lvalue=t,this.rvalue=n,this.index=r,this.negate=i},e.Condition.prototype={type:"Condition",accept:function(e){this.lvalue=e.visit(this.lvalue),this.rvalue=e.visit(this.rvalue)},eval:function(e){var t=this.lvalue.eval(e),n=this.rvalue.eval(e),r=this.index,i,i=function(e){switch(e){case"and":return t&&n;case"or":return t||n;default:if(t.compare)i=t.compare(n);else{if(!n.compare)throw{type:"Type",message:"Unable to perform comparison",index:r};i=n.compare(t)}switch(i){case-1:return e==="<"||e==="=<";case 0:return e==="="||e===">="||e==="=<";case 1:return e===">"||e===">="}}}(this.op);return this.negate?!i:i}}}(n("../tree")),function(e){e.Dimension=function(n,r){this.value=parseFloat(n),this.unit=r&&r instan ceof e.Unit?r:new e.Unit(r?[r]:t)},e.Dimension.prototype={type:"Dimension",accept:function(e){this.unit=e.visit(this.unit)},eval:function(e){return this},toColor:function(){return new e.Color([this.value,this.value,this.value])},toCSS:function(e){if(e&&e.strictUnits&&!this.unit.isSingular())throw new Error("Multiple units in dimension. Correct the units or use the unit function. Bad unit: "+this.unit.toString());var t=this.value,n=String(t);t!==0&&t<1e-6&&t>-0.000001&&(n=t.toFixed(20).replace(/0+$/,""));if(e&&e.compress){if(t===0&&!this.unit.isAngle())return n;t>0&&t<1&&(n=n.substr(1))}return n+this.unit.toCSS(e)},operate:function(t,n,r){var i=e.operate(t,n,this.value,r.value),s=this.unit.clone();if(n==="+"||n==="-"){if(s.numerator.length===0&&s.denominator.length===0)s.numerator=r.unit.numerator.slice(0),s.denominator=r.unit.denominator.slice(0);else if(r.unit.numerator.length!=0||s.denominator.length!=0){r=r.convertTo(this.unit.usedUnits());if(t.strictUnits&&r.unit.toStrin g()!==s.toString())throw new Error("Incompatible units. Change the units or use the unit function. Bad units: '"+s.toString()+"' and '"+r.unit.toString()+"'.");i=e.operate(t,n,this.value,r.value)}}else n==="*"?(s.numerator=s.numerator.concat(r.unit.numerator).sort(),s.denominator=s.denominator.concat(r.unit.denominator).sort(),s.cancel()):n==="/"&&(s.numerator=s.numerator.concat(r.unit.denominator).sort(),s.denominator=s.denominator.concat(r.unit.numerator).sort(),s.cancel());return new e.Dimension(i,s)},compare:function(t){if(t instanceof e.Dimension){var n=this.unify(),r=t.unify(),i=n.value,s=r.value;return s>i?-1:s<i?1:!r.unit.isEmpty()&&n.unit.compare(r.unit)!==0?-1:0}return-1},unify:function(){return this.convertTo({length:"m",duration:"s",angle:"rad"})},convertTo:function(t){var n=this.value,r=this.unit.clone(),i,s,o,u,a,f={};if(typeof t=="string"){for(i in e.UnitConversions)e.UnitConversions[i].hasOwnProperty(t)&&(f={},f[i]=t);t=f}for(s in t)t.hasOwnProperty(s)&&(a=t[ s],o=e.UnitConversions[s],r.map(function(e,t){return o.hasOwnProperty(e)?(t?n/=o[e]/o[a]:n*=o[e]/o[a],a):e}));return r.cancel(),new e.Dimension(n,r)}},e.UnitConversions={length:{m:1,cm:.01,mm:.001,"in":.0254,pt:.0254/72,pc:.0254/72*12},duration:{s:1,ms:.001},angle:{rad:1/(2*Math.PI),deg:1/360,grad:.0025,turn:1}},e.Unit=function(e,t,n){this.numerator=e?e.slice(0).sort():[],this.denominator=t?t.slice(0).sort():[],this.backupUnit=n},e.Unit.prototype={type:"Unit",clone:function(){return new e.Unit(this.numerator.slice(0),this.denominator.slice(0),this.backupUnit)},toCSS:function(e){return this.numerator.length>=1?this.numerator[0]:this.denominator.length>=1?this.denominator[0]:(!e||!e.strictUnits)&&this.backupUnit?this.backupUnit:""},toString:function(){var e,t=this.numerator.join("*");for(e=0;e<this.denominator.length;e++)t+="/"+this.denominator[e];return t},compare:function(e){return this.is(e.toString())?0:-1},is:function(e){return this.toString()===e},isAngle:function(){retu rn e.UnitConversions.angle.hasOwnProperty(this.toCSS())},isEmpty:function(){return this.numerator.length==0&&this.denominator.length==0},isSingular:function(){return this.numerator.length<=1&&this.denominator.length==0},map:function(e){var t;for(t=0;t<this.numerator.length;t++)this.numerator[t]=e(this.numerator[t],!1);for(t=0;t<this.denominator.length;t++)this.denominator[t]=e(this.denominator[t],!0)},usedUnits:function(){var t,n,r={};for(n in e.UnitConversions)e.UnitConversions.hasOwnProperty(n)&&(t=e.UnitConversions[n],this.map(function(e){return t.hasOwnProperty(e)&&!r[n]&&(r[n]=e),e}));return r},cancel:function(){var e={},t,n,r;for(n=0;n<this.numerator.length;n++)t=this.numerator[n],r||(r=t),e[t]=(e[t]||0)+1;for(n=0;n<this.denominator.length;n++)t=this.denominator[n],r||(r=t),e[t]=(e[t]||0)-1;this.numerator=[],this.denominator=[];for(t in e)if(e.hasOwnProperty(t)){var i=e[t];if(i>0)for(n=0;n<i;n++)this.numerator.push(t);else if(i<0)for(n=0;n<-i;n++)this.denominator.push( t)}this.numerator.length===0&&this.denominator.length===0&&r&&(this.backupUnit=r),this.numerator.sort(),this.denominator.sort()}}}(n("../tree")),function(e){e.Directive=function(t,n){this.name=t,Array.isArray(n)?(this.ruleset=new e.Ruleset([],n),this.ruleset.allowImports=!0):this.value=n},e.Directive.prototype={type:"Directive",accept:function(e){this.ruleset=e.visit(this.ruleset),this.value=e.visit(this.value)},toCSS:function(e){return this.ruleset?(this.ruleset.root=!0,this.name+(e.compress?"{":" {\n ")+this.ruleset.toCSS(e).trim().replace(/\n/g,"\n ")+(e.compress?"}":"\n}\n")):this.name+" "+this.value.toCSS()+";\n"},eval:function(t){var n=this;return this.ruleset&&(t.frames.unshift(this),n=new e.Directive(this.name),n.ruleset=this.ruleset.eval(t),t.frames.shift()),n},variable:function(t){return e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return e.Ruleset.prototype.r ulesets.apply(this.ruleset)}}}(n("../tree")),function(e){e.Element=function(t,n,r){this.combinator=t instanceof e.Combinator?t:new e.Combinator(t),typeof n=="string"?this.value=n.trim():n?this.value=n:this.value="",this.index=r},e.Element.prototype={type:"Element",accept:function(e){this.combinator=e.visit(this.combinator),this.value=e.visit(this.value)},eval:function(t){return new e.Element(this.combinator,this.value.eval?this.value.eval(t):this.value,this.index)},toCSS:function(e){var t=this.value.toCSS?this.value.toCSS(e):this.value;return t==""&&this.combinator.value.charAt(0)=="&"?"":this.combinator.toCSS(e||{})+t}},e.Attribute=function(e,t,n){this.key=e,this.op=t,this.value=n},e.Attribute.prototype={type:"Attribute",accept:function(e){this.value=e.visit(this.value)},eval:function(t){return new e.Attribute(this.key.eval?this.key.eval(t):this.key,this.op,this.value&&this.value.eval?this.value.eval(t):this.value)},toCSS:function(e){var t=this.key.toCSS?this.key.toCSS(e):t his.key;return this.op&&(t+=this.op,t+=this.value.toCSS?this.value.toCSS(e):this.value),"["+t+"]"}},e.Combinator=function(e){e===" "?this.value=" ":this.value=e?e.trim():""},e.Combinator.prototype={type:"Combinator",toCSS:function(e){return{"":""," ":" ",":":" :","+":e.compress?"+":" + ","~":e.compress?"~":" ~ ",">":e.compress?">":" > ","|":e.compress?"|":" | "}[this.value]}}}(n("../tree")),function(e){e.Expression=function(e){this.value=e},e.Expression.prototype={type:"Expression",accept:function(e){this.value=e.visit(this.value)},eval:function(t){var n,r=this.parens&&!this.parensInOp,i=!1;return r&&t.inParenthesis(),this.value.length>1?n=new e.Expression(this.value.map(function(e){return e.eval(t)})):this.value.length===1?(this.value[0].parens&&!this.value[0].parensInOp&&(i=!0),n=this.value[0].eval(t)):n=this,r&&t.outOfParenthesis(),this.parens&&this.parensInOp&&!t.isMathOn()&&!i&&(n=new e.Paren(n)),n},toCSS:function(e){return this.value.map(function(t){return t.toCSS?t.to CSS(e):""}).join(" ")},throwAwayComments:function(){this.value=this.value.filter(function(t){return!(t instanceof e.Comment)})}}}(n("../tree")),function(e){e.Extend=function(t,n,r){this.selector=t,this.option=n,this.index=r;switch(n){case"all":this.allowBefore=!0,this.allowAfter=!0;break;default:this.allowBefore=!1,this.allowAfter=!1}},e.Extend.prototype={type:"Extend",accept:function(e){this.selector=e.visit(this.selector)},eval:function(t){return new e.Extend(this.selector.eval(t),this.option,this.index)},clone:function(t){return new e.Extend(this.selector,this.option,this.index)},findSelfSelectors:function(e){var t=[],n;for(n=0;n<e.length;n++)t=t.concat(e[n].elements);this.selfSelectors=[{elements:t}]}}}(n("../tree")),function(e){e.Import=function(e,n,r,i,s){var o=this;this.options=r,this.index=i,this.path=e,this.features=n,this.currentFileInfo=s;if(this.options.less!==t)this.css=!this.options.less;else{var u=this.getPath();u&&/css([\?;].*)?$/.test(u)&&(this.css=!0)}},e.I mport.prototype={type:"Import",accept:function(e){this.features=e.visit(this.features),this.path=e.visit(this.path),this.root=e.visit(this.root)},toCSS:function(e){var t=this.features?" "+this.features.toCSS(e):"";return this.css?"@import "+this.path.toCSS()+t+";\n":""},getPath:function(){if(this.path instanceof e.Quoted){var n=this.path.value;return this.css!==t||/(\.[a-z]*$)|([\?;].*)$/.test(n)?n:n+".less"}return this.path instanceof e.URL?this.path.value.value:null},evalForImport:function(t){return new e.Import(this.path.eval(t),this.features,this.options,this.index,this.currentFileInfo)},evalPath:function(t){var n=this.path.eval(t),r=this.currentFileInfo&&this.currentFileInfo.rootpath;if(r&&!(n instanceof e.URL)){var i=n.value;i&&t.isPathRelative(i)&&(n.value=r+i)}return n},eval:function(t){var n,r=this.features&&this.features.eval(t);if(this.skip)return[];if(this.css){var i=new e.Import(this.evalPath(t),r,this.options,this.index);if(!i.css&&this.error)throw this.error;r eturn i}return n=new e.Ruleset([],this.root.rules.slice(0)),n.evalImports(t),this.features?new e.Media(n.rules,this.features.value):n.rules}}}(n("../tree")),function(e){e.JavaScript=function(e,t,n){this.escaped=n,this.expression=e,this.index=t},e.JavaScript.prototype={type:"JavaScript",eval:function(t){var n,r=this,i={},s=this.expression.replace(/@\{([\w-]+)\}/g,function(n,i){return e.jsify((new e.Variable("@"+i,r.index)).eval(t))});try{s=new Function("return ("+s+")")}catch(o){throw{message:"JavaScript evaluation error: `"+s+"`",index:this.index}}for(var u in t.frames[0].variables())i[u.slice(1)]={value:t.frames[0].variables()[u].value,toJS:function(){return this.value.eval(t).toCSS()}};try{n=s.call(i)}catch(o){throw{message:"JavaScript evaluation error: '"+o.name+": "+o.message+"'",index:this.index}}return typeof n=="string"?new e.Quoted('"'+n+'"',n,this.escaped,this.index):Array.isArray(n)?new e.Anonymous(n.join(", ")):new e.Anonymous(n)}}}(n("../tree")),function(e){e.Key word=function(e){this.value=e},e.Keyword.prototype={type:"Keyword",eval:function(){return this},toCSS:function(){return this.value},compare:function(t){return t instanceof e.Keyword?t.value===this.value?0:1:-1}},e.True=new e.Keyword("true"),e.False=new e.Keyword("false")}(n("../tree")),function(e){e.Media=function(t,n){var r=this.emptySelectors();this.features=new e.Value(n),this.ruleset=new e.Ruleset(r,t),this.ruleset.allowImports=!0},e.Media.prototype={type:"Media",accept:function(e){this.features=e.visit(this.features),this.ruleset=e.visit(this.ruleset)},toCSS:function(e){var t=this.features.toCSS(e);return"@media "+t+(e.compress?"{":" {\n ")+this.ruleset.toCSS(e).trim().replace(/\n/g,"\n ")+(e.compress?"}":"\n}\n")},eval:function(t){t.mediaBlocks||(t.mediaBlocks=[],t.mediaPath=[]);var n=new e.Media([],[]);this.debugInfo&&(this.ruleset.debugInfo=this.debugInfo,n.debugInfo=this.debugInfo);var r=!1;t.strictMath||(r=!0,t.strictMath=!0);try{n.features=this.features.eval(t)} finally{r&&(t.strictMath=!1)}return t.mediaPath.push(n),t.mediaBlocks.push(n),t.frames.unshift(this.ruleset),n.ruleset=this.ruleset.eval(t),t.frames.shift(),t.mediaPath.pop(),t.mediaPath.length===0?n.evalTop(t):n.evalNested(t)},variable:function(t){return e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return e.Ruleset.prototype.rulesets.apply(this.ruleset)},emptySelectors:function(){var t=new e.Element("","&",0);return[new e.Selector([t])]},evalTop:function(t){var n=this;if(t.mediaBlocks.length>1){var r=this.emptySelectors();n=new e.Ruleset(r,t.mediaBlocks),n.multiMedia=!0}return delete t.mediaBlocks,delete t.mediaPath,n},evalNested:function(t){var n,r,i=t.mediaPath.concat([this]);for(n=0;n<i.length;n++)r=i[n].features instanceof e.Value?i[n].features.value:i[n].features,i[n]=Array.isArray(r)?r:[r];return this.features=new e.Value(this.permute(i).map(function(t){t=t.map(fun ction(t){return t.toCSS?t:new e.Anonymous(t)});for(n=t.length-1;n>0;n--)t.splice(n,0,new e.Anonymous("and"));return new e.Expression(t)})),new e.Ruleset([],[])},permute:function(e){if(e.length===0)return[];if(e.length===1)return e[0];var t=[],n=this.permute(e.slice(1));for(var r=0;r<n.length;r++)for(var i=0;i<e[0].length;i++)t.push([e[0][i]].concat(n[r]));return t},bubbleSelectors:function(t){this.ruleset=new e.Ruleset(t.slice(0),[this.ruleset])}}}(n("../tree")),function(e){e.mixin={},e.mixin.Call=function(t,n,r,i,s){this.selector=new e.Selector(t),this.arguments=n,this.index=r,this.currentFileInfo=i,this.important=s},e.mixin.Call.prototype={type:"MixinCall",accept:function(e){this.selector=e.visit(this.selector),this.arguments=e.visit(this.arguments)},eval:function(t){var n,r,i,s=[],o=!1,u,a,f,l,c;i=this.arguments&&this.arguments.map(function(e){return{name:e.name,value:e.value.eval(t)}});for(u=0;u<t.frames.length;u++)if((n=t.frames[u].find(this.selector)).length>0){c=!0;fo r(a=0;a<n.length;a++){r=n[a],l=!1;for(f=0;f<t.frames.length;f++)if(!(r instanceof e.mixin.Definition)&&r===(t.frames[f].originalRuleset||t.frames[f])){l=!0;break}if(l)continue;if(r.matchArgs(i,t)){if(!r.matchCondition||r.matchCondition(i,t))try{Array.prototype.push.apply(s,r.eval(t,i,this.important).rules)}catch(h){throw{message:h.message,index:this.index,filename:this.currentFileInfo.filename,stack:h.stack}}o=!0}}if(o)return s}throw c?{type:"Runtime",message:"No matching definition was found for `"+this.selector.toCSS().trim()+"("+(i?i.map(function(e){var t="";return e.name&&(t+=e.name+":"),e.value.toCSS?t+=e.value.toCSS():t+="???",t}).join(", "):"")+")`",index:this.index,filename:this.currentFileInfo.filename}:{type:"Name",message:this.selector.toCSS().trim()+" is undefined",index:this.index,filename:this.currentFileInfo.filename}}},e.mixin.Definition=function(t,n,r,i,s){this.name=t,this.selectors=[new e.Selector([new e.Element(null,t)])],this.params=n,this.condition=i,thi s.variadic=s,this.arity=n.length,this.rules=r,this._lookups={},this.required=n.reduce(function(e,t){return!t.name||t.name&&!t.value?e+1:e},0),this.parent=e.Ruleset.prototype,this.frames=[]},e.mixin.Definition.prototype={type:"MixinDefinition",accept:function(e){this.params=e.visit(this.params),this.rules=e.visit(this.rules),this.condition=e.visit(this.condition)},toCSS:function(){return""},variable:function(e){return this.parent.variable.call(this,e)},variables:function(){return this.parent.variables.call(this)},find:function(){return this.parent.find.apply(this,arguments)},rulesets:function(){return this.parent.rulesets.apply(this)},evalParams:function(t,n,r,i){var s=new e.Ruleset(null,[]),o,u,a=this.params.slice(0),f,l,c,h,p,d;n=new e.evalEnv(n,[s].concat(n.frames));if(r){r=r.slice(0);for(f=0;f<r.length;f++){u=r[f];if(h=u&&u.name){p=!1;for(l=0;l<a.length;l++)if(!i[l]&&h===a[l].name){i[l]=u.value.eval(t),s.rules.unshift(new e.Rule(h,u.value.eval(t))),p=!0;break}if(p){r.spli ce(f,1),f--;continue}throw{type:"Runtime",message:"Named argument for "+this.name+" "+r[f].name+" not found"}}}}d=0;for(f=0;f<a.length;f++){if(i[f])continue;u=r&&r[d];if(h=a[f].name)if(a[f].variadic&&r){o=[];for(l=d;l<r.length;l++)o.push(r[l].value.eval(t));s.rules.unshift(new e.Rule(h,(new e.Expression(o)).eval(t)))}else{c=u&&u.value;if(c)c=c.eval(t);else{if(!a[f].value)throw{type:"Runtime",message:"wrong number of arguments for "+this.name+" ("+r.length+" for "+this.arity+")"};c=a[f].value.eval(n),s.resetCache()}s.rules.unshift(new e.Rule(h,c)),i[f]=c}if(a[f].variadic&&r)for(l=d;l<r.length;l++)i[l]=r[l].value.eval(t);d++}return s},eval:function(t,n,r){var i=[],s=this.frames.concat(t.frames),o=this.evalParams(t,new e.evalEnv(t,s),n,i),u,a,f,l;return o.rules.unshift(new e.Rule("@arguments",(new e.Expression(i)).eval(t))),a=r?this.parent.makeImportant.apply(this).rules:this.rules.slice(0),l=(new e.Ruleset(null,a)).eval(new e.evalEnv(t,[this,o].concat(s))),l.originalRuleset=th is,l},matchCondition:function(t,n){return this.condition&&!this.condition.eval(new e.evalEnv(n,[this.evalParams(n,new e.evalEnv(n,this.frames.concat(n.frames)),t,[])].concat(n.frames)))?!1:!0},matchArgs:function(e,t){var n=e&&e.length||0,r,i;if(!this.variadic){if(n<this.required)return!1;if(n>this.params.length)return!1;if(this.required>0&&n>this.params.length)return!1}r=Math.min(n,this.arity);for(var s=0;s<r;s++)if(!this.params[s].name&&!this.params[s].variadic&&e[s].value.eval(t).toCSS()!=this.params[s].value.eval(t).toCSS())return!1;return!0}}}(n("../tree")),function(e){e.Negative=function(e){this.value=e},e.Negative.prototype={type:"Negative",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){return"-"+this.value.toCSS(e)},eval:function(t){return t.isMathOn()?(new e.Operation("*",[new e.Dimension(-1),this.value])).eval(t):new e.Negative(this.value.eval(t))}}}(n("../tree")),function(e){e.Operation=function(e,t,n){this.op=e.trim(),this.operands=t,this.isS paced=n},e.Operation.prototype={type:"Operation",accept:function(e){this.operands=e.visit(this.operands)},eval:function(t){var n=this.operands[0].eval(t),r=this.operands[1].eval(t),i;if(t.isMathOn()){if(n instanceof e.Dimension&&r instanceof e.Color){if(this.op!=="*"&&this.op!=="+")throw{type:"Operation",message:"Can't substract or divide a color from a number"};i=r,r=n,n=i}if(!n.operate)throw{type:"Operation",message:"Operation on an invalid type"};return n.operate(t,this.op,r)}return new e.Operation(this.op,[n,r],this.isSpaced)},toCSS:function(e){var t=this.isSpaced?" ":"";return this.operands[0].toCSS()+t+this.op+t+this.operands[1].toCSS()}},e.operate=function(e,t,n,r){switch(t){case"+":return n+r;case"-":return n-r;case"*":return n*r;case"/":return n/r}}}(n("../tree")),function(e){e.Paren=function(e){this.value=e},e.Paren.prototype={type:"Paren",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){return"("+this.value.toCSS(e).trim()+")"},eval:function(t) {return new e.Paren(this.value.eval(t))}}}(n("../tree")),function(e){e.Quoted=function(e,t,n,r,i){this.escaped=n,this.value=t||"",this.quote=e.charAt(0),this.index=r,this.currentFileInfo=i},e.Quoted.prototype={type:"Quoted",toCSS:function(){return this.escaped?this.value:this.quote+this.value+this.quote},eval:function(t){var n=this,r=this.value.replace(/`([^`]+)`/g,function(r,i){return(new e.JavaScript(i,n.index,!0)).eval(t).value}).replace(/@\{([\w-]+)\}/g,function(r,i){var s=(new e.Variable("@"+i,n.index,n.currentFileInfo)).eval(t,!0);return s instanceof e.Quoted?s.value:s.toCSS()});return new e.Quoted(this.quote+r+this.quote,r,this.escaped,this.index)},compare:function(e){if(!e.toCSS)return-1;var t=this.toCSS(),n=e.toCSS();return t===n?0:t<n?-1:1}}}(n("../tree")),function(e){e.Rule=function(t,n,r,i,s,o){this.name=t,this.value=n instanceof e.Value?n:new e.Value([n]),this.important=r?" "+r.trim():"",this.index=i,this.currentFileInfo=s,this.inline=o||!1,t.charAt(0)==="@"?thi s.variable=!0:this.variable=!1},e.Rule.prototype={type:"Rule",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){if(this.variable)return"";try{return this.name+(e.compress?":":": ")+this.value.toCSS(e)+this.important+(this.inline?"":";")}catch(t){throw t.index=this.index,t.filename=this.currentFileInfo.filename,t}},eval:function(t){var n=!1;this.name==="font"&&t.strictMath===!1&&(n=!0,t.strictMath=!0);try{return new e.Rule(this.name,this.value.eval(t),this.important,this.index,this.currentFileInfo,this.inline)}finally{n&&(t.strictMath=!1)}},makeImportant:function(){return new e.Rule(this.name,this.value,"!important",this.index,this.currentFileInfo,this.inline)}}}(n("../tree")),function(e){e.Ruleset=function(e,t,n){this.selectors=e,this.rules=t,this._lookups={},this.strictImports=n},e.Ruleset.prototype={type:"Ruleset",accept:function(e){this.selectors=e.visit(this.selectors),this.rules=e.visit(this.rules)},eval:function(t){var n=this.selectors&&this.selector s.map(function(e){return e.eval(t)}),r=new e.Ruleset(n,this.rules.slice(0),this.strictImports),i;r.originalRuleset=this,r.root=this.root,r.firstRoot=this.firstRoot,r.allowImports=this.allowImports,this.debugInfo&&(r.debugInfo=this.debugInfo),t.frames.unshift(r),t.selectors||(t.selectors=[]),t.selectors.unshift(this.selectors),(r.root||r.allowImports||!r.strictImports)&&r.evalImports(t);for(var s=0;s<r.rules.length;s++)r.rules[s]instanceof e.mixin.Definition&&(r.rules[s].frames=t.frames.slice(0));var o=t.mediaBlocks&&t.mediaBlocks.length||0;for(var s=0;s<r.rules.length;s++)r.rules[s]instanceof e.mixin.Call&&(i=r.rules[s].eval(t).filter(function(t){return t instanceof e.Rule&&t.variable?!r.variable(t.name):!0}),r.rules.splice.apply(r.rules,[s,1].concat(i)),s+=i.length-1,r.resetCache());for(var s=0,u;s<r.rules.length;s++)u=r.rules[s],u instanceof e.mixin.Definition||(r.rules[s]=u.eval?u.eval(t):u);t.frames.shift(),t.selectors.shift();if(t.mediaBlocks)for(var s=o;s<t.mediaBlocks .length;s++)t.mediaBlocks[s].bubbleSelectors(n);return r},evalImports:function(t){var n,r;for(n=0;n<this.rules.length;n++)this.rules[n]instanceof e.Import&&(r=this.rules[n].eval(t),typeof r.length=="number"?(this.rules.splice.apply(this.rules,[n,1].concat(r)),n+=r.length-1):this.rules.splice(n,1,r),this.resetCache())},makeImportant:function(){return new e.Ruleset(this.selectors,this.rules.map(function(e){return e.makeImportant?e.makeImportant():e}),this.strictImports)},matchArgs:function(e){return!e||e.length===0},resetCache:function(){this._rulesets=null,this._variables=null,this._lookups={}},variables:function(){return this._variables?this._variables:this._variables=this.rules.reduce(function(t,n){return n instanceof e.Rule&&n.variable===!0&&(t[n.name]=n),t},{})},variable:function(e){return this.variables()[e]},rulesets:function(){return this.rules.filter(function(t){return t instanceof e.Ruleset||t instanceof e.mixin.Definition})},find:function(t,n){n=n||this;var r=[],i,s ,o=t.toCSS();return o in this._lookups?this._lookups[o]:(this.rulesets().forEach(function(i){if(i!==n)for(var o=0;o<i.selectors.length;o++)if(s=t.match(i.selectors[o])){t.elements.length>i.selectors[o].elements.length?Array.prototype.push.apply(r,i.find(new e.Selector(t.elements.slice(1)),n)):r.push(i);break}}),this._lookups[o]=r)},toCSS:function(t){var n=[],r=[],i=[],s=[],o,u,a;for(var f=0;f<this.rules.length;f++){a=this.rules[f];if(a.rules||a instanceof e.Media)s.push(a.toCSS(t));else if(a instanceof e.Directive){var l=a.toCSS(t);if(a.name==="@charset"){if(t.charset){a.debugInfo&&(s.push(e.debugInfo(t,a)),s.push((new e.Comment("/* "+l.replace(/\n/g,"")+" */\n")).toCSS(t)));continue}t.charset=!0}s.push(l)}else if(a instanceof e.Comment)a.silent||(this.root?s.push(a.toCSS(t)):r.push(a.toCSS(t)));else if(a.toCSS&&!a.variable){if(this.firstRoot&&a instanceof e.Rule)throw{message:"properties must be inside selector blocks, they cannot be in the root.",index:a.index,filename:a.c urrentFileInfo?a.currentFileInfo.filename:null};r.push(a.toCSS(t))}else a.value&&!a.variable&&r.push(a.value.toString())}t.compress&&r.length&&(a=r[r.length-1],a.charAt(a.length-1)===";"&&(r[r.length-1]=a.substring(0,a.length-1))),s=s.join("");if(this.root)n.push(r.join(t.compress?"":"\n"));else if(r.length>0){u=e.debugInfo(t,this),o=this.paths.map(function(e){return e.map(function(e){return e.toCSS(t)}).join("").trim()}).join(t.compress?",":",\n");for(var f=r.length-1;f>=0;f--)(r[f].slice(0,2)==="/*"||i.indexOf(r[f])===-1)&&i.unshift(r[f]);r=i,n.push(u+o+(t.compress?"{":" {\n ")+r.join(t.compress?"":"\n ")+(t.compress?"}":"\n}\n"))}return n.push(s),n.join("")+(t.compress?"\n":"")},joinSelectors:function(e,t,n){for(var r=0;r<n.length;r++)this.joinSelector(e,t,n[r])},joinSelector:function(t,n,r){var i,s,o,u,a,f,l,c,h,p,d,v,m,g,y;for(i=0;i<r.elements.length;i++)f=r.elements[i],f.value==="&"&&(u=!0);if(!u){if(n.length>0)for(i=0;i<n.length;i++)t.push(n[i].concat(r));else t.pus h([r]);return}g=[],a=[[]];for(i=0;i<r.elements.length;i++){f=r.elements[i];if(f.value!=="&")g.push(f);else{y=[],g.length>0&&this.mergeElementsOnToSelectors(g,a);for(s=0;s<a.length;s++){l=a[s];if(n.length==0)l.length>0&&(l[0].elements=l[0].elements.slice(0),l[0].elements.push(new e.Element(f.combinator,"",0))),y.push(l);else for(o=0;o<n.length;o++)c=n[o],h=[],p=[],v=!0,l.length>0?(h=l.slice(0),m=h.pop(),d=new e.Selector(m.elements.slice(0),r.extendList),v=!1):d=new e.Selector([],r.extendList),c.length>1&&(p=p.concat(c.slice(1))),c.length>0&&(v=!1,d.elements.push(new e.Element(f.combinator,c[0].elements[0].value,0)),d.elements=d.elements.concat(c[0].elements.slice(1))),v||h.push(d),h=h.concat(p),y.push(h)}a=y,g=[]}}g.length>0&&this.mergeElementsOnToSelectors(g,a);for(i=0;i<a.length;i++)a[i].length>0&&t.push(a[i])},mergeElementsOnToSelectors:function(t,n){var r,i,s;if(n.length==0){n.push([new e.Selector(t)]);return}for(r=0;r<n.length;r++)i=n[r],i.length>0?i[i.length-1]=new e.Se lector(i[i.length-1].elements.concat(t),i[i.length-1].extendList):i.push(new e.Selector(t))}}}(n("../tree")),function(e){e.Selector=function(e,t){this.elements=e,this.extendList=t||[]},e.Selector.prototype={type:"Selector",accept:function(e){this.elements=e.visit(this.elements),this.extendList=e.visit(this.extendList)},match:function(e){var t=this.elements,n=t.length,r,i,s,o;r=e.elements.slice(e.elements.length&&e.elements[0].value==="&"?1:0),i=r.length,s=Math.min(n,i);if(i===0||n<i)return!1;for(o=0;o<s;o++)if(t[o].value!==r[o].value)return!1;return!0},eval:function(t){return new e.Selector(this.elements.map(function(e){return e.eval(t)}),this.extendList.map(function(e){return e.eval(t)}))},toCSS:function(e){return this._css?this._css:(this.elements[0].combinator.value===""?this._css=" ":this._css="",this._css+=this.elements.map(function(t){return typeof t=="string"?" "+t.trim():t.toCSS(e)}).join(""),this._css)}}}(n("../tree")),function(e){e.UnicodeDescriptor=function(e){thi s.value=e},e.UnicodeDescriptor.prototype={type:"UnicodeDescriptor",toCSS:function(e){return this.value},eval:function(){return this} +}}(n("../tree")),function(e){e.URL=function(e,t){this.value=e,this.currentFileInfo=t},e.URL.prototype={type:"Url",accept:function(e){this.value=e.visit(this.value)},toCSS:function(){return"url("+this.value.toCSS()+")"},eval:function(t){var n=this.value.eval(t),r;return r=this.currentFileInfo&&this.currentFileInfo.rootpath,r&&typeof n.value=="string"&&t.isPathRelative(n.value)&&(n.quote||(r=r.replace(/['"\s]/g,function(e){return"\\"+e})),n.value=r+n.value),new e.URL(n,null)}}}(n("../tree")),function(e){e.Value=function(e){this.value=e},e.Value.prototype={type:"Value",accept:function(e){this.value=e.visit(this.value)},eval:function(t){return this.value.length===1?this.value[0].eval(t):new e.Value(this.value.map(function(e){return e.eval(t)}))},toCSS:function(e){return this.value.map(function(t){return t.toCSS(e)}).join(e.compress?",":", ")}}}(n("../tree")),function(e){e.Variable=function(e,t,n){this.name=e,this.index=t,this.currentFileInfo=n},e.Variable.prototype={type:"Va riable",eval:function(t){var n,r,i=this.name;i.indexOf("@@")==0&&(i="@"+(new e.Variable(i.slice(1))).eval(t).value);if(this.evaluating)throw{type:"Name",message:"Recursive variable definition for "+i,filename:this.currentFileInfo.file,index:this.index};this.evaluating=!0;if(n=e.find(t.frames,function(e){if(r=e.variable(i))return r.value.eval(t)}))return this.evaluating=!1,n;throw{type:"Name",message:"variable "+i+" is undefined",filename:this.currentFileInfo.filename,index:this.index}}}}(n("../tree")),function(e){e.debugInfo=function(t,n){var r="";if(t.dumpLineNumbers&&!t.compress)switch(t.dumpLineNumbers){case"comments":r=e.debugInfo.asComment(n);break;case"mediaquery":r=e.debugInfo.asMediaQuery(n);break;case"all":r=e.debugInfo.asComment(n)+e.debugInfo.asMediaQuery(n)}return r},e.debugInfo.asComment=function(e){return"/* line "+e.debugInfo.lineNumber+", "+e.debugInfo.fileName+" */\n"},e.debugInfo.asMediaQuery=function(e){return"@media -sass-debug-info{filename{font-family:" +("file://"+e.debugInfo.fileName).replace(/([.:/\\])/g,function(e){return e=="\\"&&(e="/"),"\\"+e})+"}line{font-family:\\00003"+e.debugInfo.lineNumber+"}}\n"},e.find=function(e,t){for(var n=0,r;n<e.length;n++)if(r=t.call(e,e[n]))return r;return null},e.jsify=function(e){return Array.isArray(e.value)&&e.value.length>1?"["+e.value.map(function(e){return e.toCSS(!1)}).join(", ")+"]":e.toCSS(!1)}}(n("./tree")),function(e){var t=["paths","optimization","files","contents","relativeUrls","strictImports","dumpLineNumbers","compress","processImports","syncImport","mime","currentFileInfo"];e.parseEnv=function(e){r(e,this,t),this.contents||(this.contents={}),this.files||(this.files={});if(!this.currentFileInfo){var n=e&&e.filename||"input",i=n.replace(/[^\/\\]*$/,"");e&&(e.filename=null),this.currentFileInfo={filename:n,relativeUrls:this.relativeUrls,rootpath:e&&e.rootpath||"",currentDirectory:i,entryPath:i,rootFilename:n}}},e.parseEnv.prototype.toSheet=function(t){var n=new e.parseEnv (this);return n.href=t,n.type=this.mime,n};var n=["silent","verbose","compress","yuicompress","ieCompat","strictMath","strictUnits"];e.evalEnv=function(e,t){r(e,this,n),this.frames=t||[]},e.evalEnv.prototype.inParenthesis=function(){this.parensStack||(this.parensStack=[]),this.parensStack.push(!0)},e.evalEnv.prototype.outOfParenthesis=function(){this.parensStack.pop()},e.evalEnv.prototype.isMathOn=function(){return this.strictMath?this.parensStack&&this.parensStack.length:!0},e.evalEnv.prototype.isPathRelative=function(e){return!/^(?:[a-z-]+:|\/)/.test(e)};var r=function(e,t,n){if(!e)return;for(var r=0;r<n.length;r++)e.hasOwnProperty(n[r])&&(t[n[r]]=e[n[r]])}}(n("./tree")),function(e){e.visitor=function(e){this._implementation=e},e.visitor.prototype={visit:function(e){if(e instanceof Array)return this.visitArray(e);if(!e||!e.type)return e;var t="visit"+e.type,n=this._implementation[t],r,i;return n&&(r={visitDeeper:!0},i=n.call(this._implementation,e,r),this._implementation.i sReplacing&&(e=i)),(!r||r.visitDeeper)&&e&&e.accept&&e.accept(this),t+="Out",this._implementation[t]&&this._implementation[t](e),e},visitArray:function(e){var t,n=[];for(t=0;t<e.length;t++){var r=this.visit(e[t]);r instanceof Array?n=n.concat(r):n.push(r)}return this._implementation.isReplacing?n:e}}}(n("./tree")),function(e){e.importVisitor=function(t,n,r){this._visitor=new e.visitor(this),this._importer=t,this._finish=n,this.env=r||new e.evalEnv,this.importCount=0},e.importVisitor.prototype={isReplacing:!0,run:function(e){var t;try{this._visitor.visit(e)}catch(n){t=n}this.isFinished=!0,this.importCount===0&&this._finish(t)},visitImport:function(t,n){var r=this,i;if(!t.css){try{i=t.evalForImport(this.env)}catch(s){s.filename||(s.index=t.index,s.filename=t.currentFileInfo.filename),t.css=!0,t.error=s}if(i&&!i.css){t=i,this.importCount++;var o=new e.evalEnv(this.env,this.env.frames.slice(0));this._importer.push(t.getPath(),t.currentFileInfo,function(n,i,s){n&&!n.filename&&(n. index=t.index,n.filename=t.currentFileInfo.filename),s&&!t.options.multiple&&(t.skip=s);var u=function(e){r.importCount--,r.importCount===0&&r.isFinished&&r._finish(e)};i?(t.root=i,(new e.importVisitor(r._importer,u,o)).run(i)):u()})}}return n.visitDeeper=!1,t},visitRule:function(e,t){return t.visitDeeper=!1,e},visitDirective:function(e,t){return this.env.frames.unshift(e),e},visitDirectiveOut:function(e){this.env.frames.shift()},visitMixinDefinition:function(e,t){return this.env.frames.unshift(e),e},visitMixinDefinitionOut:function(e){this.env.frames.shift()},visitRuleset:function(e,t){return this.env.frames.unshift(e),e},visitRulesetOut:function(e){this.env.frames.shift()},visitMedia:function(e,t){return this.env.frames.unshift(e.ruleset),e},visitMediaOut:function(e){this.env.frames.shift()}}}(n("./tree")),function(e){e.joinSelectorVisitor=function(){this.contexts=[[]],this._visitor=new e.visitor(this)},e.joinSelectorVisitor.prototype={run:function(e){return this._visitor. visit(e)},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitRuleset:function(e,t){var n=this.contexts[this.contexts.length-1],r=[];this.contexts.push(r),e.root||(e.joinSelectors(r,n,e.selectors),e.paths=r)},visitRulesetOut:function(e){this.contexts.length=this.contexts.length-1},visitMedia:function(e,t){var n=this.contexts[this.contexts.length-1];e.ruleset.root=n.length===0||n[0].multiMedia}}}(n("./tree")),function(e){e.extendFinderVisitor=function(){this._visitor=new e.visitor(this),this.contexts=[],this.allExtendsStack=[[]]},e.extendFinderVisitor.prototype={run:function(e){return e=this._visitor.visit(e),e.allExtends=this.allExtendsStack[0],e},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitRuleset:function(t,n){if(t.root)return;var r,i,s,o=[],u;for(r=0;r<t.rules.length;r++)t.rules[r]instanceof e.Extend&&o.push(t.rules[r]);for(r=0;r<t.paths.length;r++){var a=t.paths[r],f=a [a.length-1];u=f.extendList.slice(0).concat(o).map(function(e){return e.clone()});for(i=0;i<u.length;i++)this.foundExtends=!0,s=u[i],s.findSelfSelectors(a),s.ruleset=t,i===0&&(s.firstExtendOnThisSelectorPath=!0),this.allExtendsStack[this.allExtendsStack.length-1].push(s)}this.contexts.push(t.selectors)},visitRulesetOut:function(e){e.root||(this.contexts.length=this.contexts.length-1)},visitMedia:function(e,t){e.allExtends=[],this.allExtendsStack.push(e.allExtends)},visitMediaOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1},visitDirective:function(e,t){e.allExtends=[],this.allExtendsStack.push(e.allExtends)},visitDirectiveOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1}},e.processExtendsVisitor=function(){this._visitor=new e.visitor(this)},e.processExtendsVisitor.prototype={run:function(t){var n=new e.extendFinderVisitor;return n.run(t),n.foundExtends?(t.allExtends=t.allExtends.concat(this.doExtendChaining(t.allExtends,t.all Extends)),this.allExtendsStack=[t.allExtends],this._visitor.visit(t)):t},doExtendChaining:function(t,n,r){var i,s,o,u=[],a,f=this,l,c,h,p;r=r||0;for(i=0;i<t.length;i++)for(s=0;s<n.length;s++){c=t[i],h=n[s];if(this.inInheritanceChain(h,c))continue;l=[h.selfSelectors[0]],o=f.findMatch(c,l),o.length&&c.selfSelectors.forEach(function(t){a=f.extendSelector(o,l,t),p=new e.Extend(h.selector,h.option,0),p.selfSelectors=a,a[a.length-1].extendList=[p],u.push(p),p.ruleset=h.ruleset,p.parents=[h,c],h.firstExtendOnThisSelectorPath&&(p.firstExtendOnThisSelectorPath=!0,h.ruleset.paths.push(a))})}if(u.length){this.extendChainCount++;if(r>100){var d="{unable to calculate}",v="{unable to calculate}";try{d=u[0].selfSelectors[0].toCSS(),v=u[0].selector.toCSS()}catch(m){}throw{message:"extend circular reference detected. One of the circular extends is currently:"+d+":extend("+v+")"}}return u.concat(f.doExtendChaining(u,n,r+1))}return u},inInheritanceChain:function(e,t){if(e===t)return!0;if(t.par ents){if(this.inInheritanceChain(e,t.parents[0]))return!0;if(this.inInheritanceChain(e,t.parents[1]))return!0}return!1},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitSelector:function(e,t){t.visitDeeper=!1},visitRuleset:function(e,t){if(e.root)return;var n,r,i,s=this.allExtendsStack[this.allExtendsStack.length-1],o=[],u=this,a;for(i=0;i<s.length;i++)for(r=0;r<e.paths.length;r++){a=e.paths[r];if(a[a.length-1].extendList.length)continue;n=this.findMatch(s[i],a),n.length&&s[i].selfSelectors.forEach(function(e){o.push(u.extendSelector(n,a,e))})}e.paths=e.paths.concat(o)},findMatch:function(e,t){var n,r,i,s,o,u,a=this,f=e.selector.elements,l=[],c,h=[];for(n=0;n<t.length;n++){r=t[n];for(i=0;i<r.elements.length;i++){s=r.elements[i],(e.allowBefore||n==0&&i==0)&&l.push({pathIndex:n,index:i,matched:0,initialCombinator:s.combinator});for(u=0;u<l.length;u++)c=l[u],o=s.combinator.value,o==""&&i===0&&(o=" "),!a.isElementValuesEqual(f[c .matched].value,s.value)||c.matched>0&&f[c.matched].combinator.value!==o?c=null:c.matched++,c&&(c.finished=c.matched===f.length,c.finished&&!e.allowAfter&&(i+1<r.elements.length||n+1<t.length)&&(c=null)),c?c.finished&&(c.length=f.length,c.endPathIndex=n,c.endPathElementIndex=i+1,l.length=0,h.push(c)):(l.splice(u,1),u--)}}return h},isElementValuesEqual:function(t,n){if(typeof t=="string"||typeof n=="string")return t===n;if(t instanceof e.Attribute)return t.op!==n.op||t.key!==n.key?!1:!t.value||!n.value?t.value||n.value?!1:!0:(t=t.value.value||t.value,n=n.value.value||n.value,t===n);return!1},extendSelector:function(t,n,r){var i=0,s=0,o=[],u,a,f,l;for(u=0;u<t.length;u++)l=t[u],a=n[l.pathIndex],f=new e.Element(l.initialCombinator,r.elements[0].value,r.elements[0].index),l.pathIndex>i&&s>0&&(o[o.length-1].elements=o[o.length-1].elements.concat(n[i].elements.slice(s)),s=0,i++),o=o.concat(n.slice(i,l.pathIndex)),o.push(new e.Selector(a.elements.slice(s,l.index).concat([f]).concat( r.elements.slice(1)))),i=l.endPathIndex,s=l.endPathElementIndex,s>=a.elements.length&&(s=0,i++);return i<n.length&&s>0&&(o[o.length-1].elements=o[o.length-1].elements.concat(n[i].elements.slice(s)),s=0,i++),o=o.concat(n.slice(i,n.length)),o},visitRulesetOut:function(e){},visitMedia:function(e,t){var n=e.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length-1]);n=n.concat(this.doExtendChaining(n,e.allExtends)),this.allExtendsStack.push(n)},visitMediaOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1},visitDirective:function(e,t){var n=e.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length-1]);n=n.concat(this.doExtendChaining(n,e.allExtends)),this.allExtendsStack.push(n)},visitDirectiveOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1}}}(n("./tree"));var o=/^(file|chrome(-extension)?|resource|qrc|app):/.test(location.protocol);r.env=r.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||lo cation.hostname=="localhost"||location.port.length>0||o?"development":"production"),r.async=r.async||!1,r.fileAsync=r.fileAsync||!1,r.poll=r.poll||(o?1e3:1500);if(r.functions)for(var u in r.functions)r.tree.functions[u]=r.functions[u];var a=/!dumpLineNumbers:(comments|mediaquery|all)/.exec(location.hash);a&&(r.dumpLineNumbers=a[1]),r.watch=function(){return r.watchMode||(r.env="development",f()),this.watchMode=!0},r.unwatch=function(){return clearInterval(r.watchTimer),this.watchMode=!1},/!watch/.test(location.hash)&&r.watch();var l=null;if(r.env!="development")try{l=typeof e.localStorage=="undefined"?null:e.localStorage}catch(c){}var h=document.getElementsByTagName("link"),p=/^text\/(x-)?less$/;r.sheets=[];for(var d=0;d<h.length;d++)(h[d].rel==="stylesheet/less"||h[d].rel.match(/stylesheet/)&&h[d].type.match(p))&&r.sheets.push(h[d]);var v="";r.modifyVars=function(e){var t=v;for(var n in e)t+=(n.slice(0,1)==="@"?"":"@")+n+": "+(e[n].slice(-1)===";"?e[n]:e[n]+";");(new r.Pars er(new r.tree.parseEnv(r))).parse(t,function(e,t){e?k(e,"session_cache"):S(t.toCSS(r),r.sheets[r.sheets.length-1])})},r.refresh=function(e){var t,n;t=n=new Date,g(function(e,i,s,o,u){if(e)return k(e,o.href);u.local?C("loading "+o.href+" from cache."):(C("parsed "+o.href+" successfully."),S(i.toCSS(r),o,u.lastModified)),C("css for "+o.href+" generated in "+(new Date-n)+"ms"),u.remaining===0&&C("css generated in "+(new Date-t)+"ms"),n=new Date},e),m()},r.refreshStyles=m,r.refresh(r.env==="development"),typeof define=="function"&&define.amd&&define(function(){return r})})(window); \ No newline at end of file commit fa8752b4da7d639a05bcbcf9e9e0cada4c55afcc Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 15 17:05:55 2013 +0200 TB3: Admin/ISS Configuraion (all) diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp index e192eca..622049e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp @@ -3,47 +3,35 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> - - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> - <bean:message key="iss.confirmmasterremove.jsp.toolbar" /> - </rhn:toolbar> - - <p> - <bean:message key="iss.confirmmasterremove.jsp.areyousure" /> - </p> - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <c:set var="pageList" value="${requestScope.all}" /> - - <h2> - <bean:message key="iss.confirmmasterremove.jsp.header2" /> - </h2> - - <rl:listset name="issMasterListSet"> - <rhn:csrf /> - <rhn:submitted /> - <rl:list dataset="pageList" name="issMasterList" - emptykey="iss.slave.jsp.nomasters"> - <rl:column sortable="true" headerkey="iss.master.label" sortattr="label"> - <html:link href="/rhn/admin/iss/EditMaster.do?mid=${current.id}"> - <c:out value="${current.label}" /> - </html:link> - </rl:column> - </rl:list> - <c:if test="${not empty requestScope.all}"> - <div align="right"> - <rhn:submitted /> - <hr /> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.confirm.remove.masters"/>' /> - </div> - </c:if> - </rl:listset> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <bean:message key="iss.confirmmasterremove.jsp.toolbar" /> + </rhn:toolbar> + <p><bean:message key="iss.confirmmasterremove.jsp.areyousure" /></p> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <c:set var="pageList" value="${requestScope.all}" /> + <h2><bean:message key="iss.confirmmasterremove.jsp.header2" /></h2> + <rl:listset name="issMasterListSet"> + <rhn:csrf /> + <rhn:submitted /> + <rl:list dataset="pageList" name="issMasterList" + emptykey="iss.slave.jsp.nomasters"> + <rl:column sortable="true" headerkey="iss.master.label" sortattr="label"> + <html:link href="/rhn/admin/iss/EditMaster.do?mid=${current.id}"> + <c:out value="${current.label}" /> + </html:link> + </rl:column> + </rl:list> + <c:if test="${not empty requestScope.all}"> + <div align="right"> + <rhn:submitted /> + <input type="submit" name="dispatch" class="btn btn-success" + value='<bean:message key="iss.confirm.remove.masters"/>' /> + </div> + </c:if> + </rl:listset> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index 94390f2..4699a13 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -3,73 +3,61 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> - - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> - <bean:message key="iss.confirmslaveremove.jsp.toolbar" /> - </rhn:toolbar> - - <p> - <bean:message key="iss.confirmslaveremove.jsp.areyousure" /> - </p> - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <c:set var="pageList" value="${requestScope.all}" /> - - <h2> - <bean:message key="iss.confirmslaveremove.jsp.header2" /> - </h2> - - <rl:listset name="issSlaveListSet"> - <rhn:csrf /> - <rhn:submitted /> - <rl:list dataset="pageList" name="issSlaveList" - emptykey="iss.confirmslaveremove.jsp.nomasters"> - <rl:column sortable="true" headerkey="iss.slave.name" sortattr="slave"> - <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}"> - <c:out value="${current.slave}" /> - </html:link> - </rl:column> - <rl:column bound="false" headerkey="iss.slave.isEnabled" - sortattr="enabled"> - <c:if test="${current.enabled == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.enabled"/>" - title="<bean:message key="iss.slave.enabled"/>" /> - </c:if> - <c:if test="${current.enabled != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.disabled"/>" - title="<bean:message key="iss.slave.disabled"/>" /> - </c:if> - </rl:column> - <rl:column bound="false" headerkey="iss.slave.toAll" - sortattr="allOrgs"> - <c:if test="${current.allowAllOrgs == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.all"/>" - title="<bean:message key="iss.slave.all"/>" /> - </c:if> - <c:if test="${current.allowAllOrgs != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.notAll"/>" - title="<bean:message key="iss.slave.notAll"/>" /> - </c:if> - </rl:column> - </rl:list> - <c:if test="${not empty requestScope.all}"> - <div align="right"> - <rhn:submitted /> - <hr /> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.confirm.remove.slaves"/>' /> - </div> - </c:if> - </rl:listset> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <bean:message key="iss.confirmslaveremove.jsp.toolbar" /> + </rhn:toolbar> + <p><bean:message key="iss.confirmslaveremove.jsp.areyousure" /></p> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <c:set var="pageList" value="${requestScope.all}" /> + <h2><bean:message key="iss.confirmslaveremove.jsp.header2" /></h2> + <rl:listset name="issSlaveListSet"> + <rhn:csrf /> + <rhn:submitted /> + <rl:list dataset="pageList" name="issSlaveList" + emptykey="iss.confirmslaveremove.jsp.nomasters"> + <rl:column sortable="true" headerkey="iss.slave.name" sortattr="slave"> + <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}"> + <c:out value="${current.slave}" /> + </html:link> + </rl:column> + <rl:column bound="false" headerkey="iss.slave.isEnabled" + sortattr="enabled"> + <c:if test="${current.enabled == 'Y'}"> + <img src="/img/rhn-listicon-checked.gif" + alt="<bean:message key="iss.slave.enabled"/>" + title="<bean:message key="iss.slave.enabled"/>" /> + </c:if> + <c:if test="${current.enabled != 'Y'}"> + <img src="/img/rhn-listicon-unchecked.gif" + alt="<bean:message key="iss.slave.disabled"/>" + title="<bean:message key="iss.slave.disabled"/>" /> + </c:if> + </rl:column> + <rl:column bound="false" headerkey="iss.slave.toAll" + sortattr="allOrgs"> + <c:if test="${current.allowAllOrgs == 'Y'}"> + <img src="/img/rhn-listicon-checked.gif" + alt="<bean:message key="iss.slave.all"/>" + title="<bean:message key="iss.slave.all"/>" /> + </c:if> + <c:if test="${current.allowAllOrgs != 'Y'}"> + <img src="/img/rhn-listicon-unchecked.gif" + alt="<bean:message key="iss.slave.notAll"/>" + title="<bean:message key="iss.slave.notAll"/>" /> + </c:if> + </rl:column> + </rl:list> + <c:if test="${not empty requestScope.all}"> + <div align="right"> + <rhn:submitted /> + <input type="submit" name="dispatch" class="btn btn-success" + value='<bean:message key="iss.confirm.remove.slaves"/>' /> + </div> + </c:if> + </rl:listset> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp index 24ec437..1831564 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp @@ -3,128 +3,126 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> +<html:html> + <body> + <c:choose> + <c:when test="${requestScope.id > 0}"> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}" + deletionType="master" deletionAcl="user_role(satellite_admin)"> + <bean:message key="iss.editmaster.jsp.toolbar" /> + </rhn:toolbar> + </c:when> + <c:otherwise> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <bean:message key="iss.editmaster.jsp.toolbar" /> + </rhn:toolbar> + </c:otherwise> + </c:choose> + <p><bean:message key="iss.editmaster.jsp.explanation" /></p> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <html:form action="/admin/iss/UpdateMaster.do" styleClass="form-horizontal"> + <rhn:csrf /> + <html:hidden property="id" /> + <rhn:submitted /> + <h2> + <c:choose> + <c:when test="${requestScope.id > 0}"> + <bean:message key="iss.editmaster.jsp.details.header" arg0="${requestScope.master}" /> + </c:when> + <c:otherwise> + <bean:message key="iss.editmaster.jsp.newmaster.details.header" /> + </c:otherwise> + </c:choose> + </h2> + <c:choose> + <c:when test="${empty requestScope.id or requestScope.id < 0}"> + <div class="form-group"> + <label class="col-lg-3 control-label" for="label"> + <rhn:required-field key="iss.master.label" />: + </label> + <div class="col-lg-6"> + <html:text property="label" styleId="label" styleClass="form-control" /> + </div> + </div> + </c:when> + <c:otherwise> + <html:hidden property="label" /> + </c:otherwise> + </c:choose> - <c:choose> - <c:when test="${requestScope.id > 0}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" - deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}" - deletionType="master" deletionAcl="user_role(satellite_admin)"> - <bean:message key="iss.editmaster.jsp.toolbar" /> - </rhn:toolbar> - </c:when> - <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> - <bean:message key="iss.editmaster.jsp.toolbar" /> - </rhn:toolbar> - </c:otherwise> - </c:choose> + <div class="form-group"> + <label for="caCert" class="col-lg-3 control-label"> + <bean:message key="iss.master.cacert" /> + </label> + <div class="col-lg-6"> + <html:text property="caCert" styleId="caCert" maxlength="1024" size="50" styleClass="form-control" /> + <span class="help-block"> + <bean:message key="iss.master.cacert.note"/> + </span> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="defaultMaster" + styleId="defaultMaster" /> + <bean:message key="iss.master.isDefault" /> + </label> + </div> + </div> + </div> - <p> - <bean:message key="iss.editmaster.jsp.explanation" /> - </p> - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - <html:form action="/admin/iss/UpdateMaster.do"> - <rhn:csrf /> - <html:hidden property="id" /> - <rhn:submitted /> - <h2> - <c:choose> - <c:when test="${requestScope.id > 0}"> - <bean:message key="iss.editmaster.jsp.details.header" arg0="${requestScope.master}" /> - </c:when> - <c:otherwise> - <bean:message key="iss.editmaster.jsp.newmaster.details.header" /> - </c:otherwise> - </c:choose> - </h2> - <table class="details" align="center"> - <c:choose> - <c:when test="${empty requestScope.id or requestScope.id < 0}"> - <tr> - <th><label for="label"><rhn:required-field key="iss.master.label" /></label></th> - <td><html:text property="label" styleId="label" /></td> - </tr> - </c:when> - <c:otherwise> - <html:hidden property="label" /> - </c:otherwise> - </c:choose> - - <tr> - <th><label for="defaultMaster"> - <bean:message key="iss.master.isDefault" /></label></th> - <td><html:checkbox property="defaultMaster" - styleId="defaultMaster" /></td> - </tr> - <tr> - <th><label for="caCert"><bean:message - key="iss.master.cacert" /></label></th> - <td><html:text property="caCert" styleId="caCert" maxlength="1024" size="50" /> - <div> - </div> - <span class="small-text"> - <bean:message key="iss.master.cacert.note"/> - </span> - </div> - </td> - </tr> - </table> - - <c:choose> - <c:when test="${requestScope.id > 0}"> - <h2> - <bean:message key="iss.editmaster.jsp.maporgs.header" arg0="${requestScope.master}" /> - </h2> - <p> - <bean:message key="iss.editmaster.jsp.maporgs.explanation" /> - </p> - <rl:listset name="issMasterListSet"> - <rl:list dataset="all" name="issMasterList" - emptykey="iss.editmaster.jsp.nomasterorgs"> - <rl:column sortable="true" headerkey="iss.master.org.name" - sortattr="sourceOrgName"> - <c:out value="${current.masterOrgName}" /> - </rl:column> - <rl:column headerkey="iss.slave.orgs" styleclass="center" - headerclass="center"> - <select name="${current.id}"> - <c:forEach var="localOrg" items="${requestScope.slave_org_list}"> - <c:choose> - <c:when test="${localOrg.id == current.localOrg.id}"> - <option value="${localOrg.id}" selected> - </c:when> - <c:otherwise> - <option value="${localOrg.id}"> - </c:otherwise> - </c:choose> - <c:out value="${localOrg.name}" /> - </option> - </c:forEach> - </select> - </rl:column> - </rl:list> - - <div align="right"> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.master.update"/>' /> - </div> - </rl:listset> - </c:when> - <c:otherwise> - <div align="right"> - <hr /> - <html:submit><bean:message key="iss.master.create" /></html:submit> - </div> - </c:otherwise> - </c:choose> - - </html:form> -</body> + <c:choose> + <c:when test="${requestScope.id > 0}"> + <h2><bean:message key="iss.editmaster.jsp.maporgs.header" arg0="${requestScope.master}" /></h2> + <p><bean:message key="iss.editmaster.jsp.maporgs.explanation" /></p> + <rl:listset name="issMasterListSet"> + <rl:list dataset="all" name="issMasterList" + emptykey="iss.editmaster.jsp.nomasterorgs"> + <rl:column sortable="true" headerkey="iss.master.org.name" + sortattr="sourceOrgName"> + <c:out value="${current.masterOrgName}" /> + </rl:column> + <rl:column headerkey="iss.slave.orgs" styleclass="center" + headerclass="center"> + <select name="${current.id}" class="form-control"> + <c:forEach var="localOrg" items="${requestScope.slave_org_list}"> + <c:choose> + <c:when test="${localOrg.id == current.localOrg.id}"> + <option value="${localOrg.id}" selected> + </c:when> + <c:otherwise> + <option value="${localOrg.id}"> + </c:otherwise> + </c:choose> + <c:out value="${localOrg.name}" /> + </option> + </c:forEach> + </select> + </rl:column> + </rl:list> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <input type="submit" name="dispatch" class="btn btn-success" + value='<bean:message key="iss.master.update"/>' /> + </div> + </div> + </rl:listset> + </c:when> + <c:otherwise> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="iss.master.create" /> + </html:submit> + </div> + </div> + </c:otherwise> + </c:choose> + </html:form> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp index 967af9e..30821e3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp @@ -3,97 +3,100 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> +<html:html> + <body> + <c:choose> + <c:when test="${requestScope.sid > 0}"> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}" + deletionType="slave" deletionAcl="user_role(satellite_admin)"> + <bean:message key="iss.editslave.jsp.toolbar" /> + </rhn:toolbar> + </c:when> + <c:otherwise> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> + <bean:message key="iss.editslave.jsp.toolbar" /> + </rhn:toolbar> + </c:otherwise> + </c:choose> + <p><bean:message key="iss.editslave.jsp.explanation" /></p> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="iss.editslave.jsp.header2" /></h2> + <html:form action="/admin/iss/UpdateSlave" styleClass="form-horizontal" > + <rhn:csrf /> + <html:hidden property="submitted" value="true" /> + <html:hidden property="id" /> + <div class="form-group"> + <label for="slave" class="col-lg-3 control-label"> + <rhn:required-field key="iss.slave.name" /> + </label> + <div class="col-lg-6"> + <html:text property="slave" size="45" maxlength="256" + styleId="slave" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="enabled" styleId="enabled" /> + <bean:message key="iss.slave.isEnabled" /> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="allowAllOrgs" + styleId="allowAllOrgs" /> + <bean:message key="iss.slave.toAll" /> + </label> + </div> + </div> + </div> - <c:choose> - <c:when test="${requestScope.sid > 0}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" - deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}" - deletionType="slave" deletionAcl="user_role(satellite_admin)"> - <bean:message key="iss.editslave.jsp.toolbar" /> - </rhn:toolbar> - </c:when> - <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> - <bean:message key="iss.editslave.jsp.toolbar" /> - </rhn:toolbar> - </c:otherwise> - </c:choose> - - <p> - <bean:message key="iss.editslave.jsp.explanation" /> - </p> - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - <h2> - <bean:message key="iss.editslave.jsp.header2" /> - </h2> - - <html:form action="/admin/iss/UpdateSlave"> - <rhn:csrf /> - <html:hidden property="submitted" value="true" /> - <html:hidden property="id" /> - <table class="details" align="center"> - <tr> - <th><label for="slave"><rhn:required-field key="iss.slave.name" /></label></th> - <td><html:text property="slave" size="45" maxlength="256" - styleId="slave" /></td> - </tr> - <tr> - <th><label for="enabled"><bean:message key="iss.slave.isEnabled" /></label> - </th> - <td><html:checkbox property="enabled" styleId="enabled" /></td> - </tr> - <tr> - <th><label for="allowAllOrgs"><bean:message key="iss.slave.toAll" /></label></th> - <td><html:checkbox property="allowAllOrgs" - styleId="allowAllOrgs" /> </td> - </tr> - </table> - <div align="right"> - - <html:submit> - <c:choose> - <c:when test="${requestScope.sid > 0}"> - <bean:message key="iss.slave.edit" /> - </c:when> - <c:otherwise> - <bean:message key="iss.slave.create" /> - </c:otherwise> - </c:choose> - </html:submit> - </div> - - </html:form> - <c:if test="${requestScope.sid > 0}"> - <h2> - <bean:message key="iss.editslave.jsp.allowed.orgs.header" /> - </h2> - <rl:listset name="localOrgsListSet"> - <rhn:csrf /> - <rhn:submitted /> - <rl:list dataset="localOrgsList" name="localOrgsList" - emptykey="editslave.jsp.nolocalorgs"> - <rl:decorator name="SelectableDecorator" /> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" /> - <rl:column sortable="true" headerkey="iss.localorg.name" sortattr="name"> - <c:out value="${current.name}" /> - </rl:column> - </rl:list> - <div align="right"> - <rhn:submitted /> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.slave.associate"/>' /> - </div> - </rl:listset> - </c:if> - -</body> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <c:choose> + <c:when test="${requestScope.sid > 0}"> + <bean:message key="iss.slave.edit" /> + </c:when> + <c:otherwise> + <bean:message key="iss.slave.create" /> + </c:otherwise> + </c:choose> + </html:submit> + </div> + </div> + </html:form> + <c:if test="${requestScope.sid > 0}"> + <h2><bean:message key="iss.editslave.jsp.allowed.orgs.header" /></h2> + <rl:listset name="localOrgsListSet"> + <rhn:csrf /> + <rhn:submitted /> + <rl:list dataset="localOrgsList" name="localOrgsList" + emptykey="editslave.jsp.nolocalorgs"> + <rl:decorator name="SelectableDecorator" /> + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" /> + <rl:column sortable="true" headerkey="iss.localorg.name" sortattr="name"> + <c:out value="${current.name}" /> + </rl:column> + </rl:list> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <rhn:submitted /> + <input type="submit" name="dispatch" class="btn btn-success" + value='<bean:message key="iss.slave.associate"/>' /> + </div> + </div> + </rl:listset> + </c:if> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index 043ddea..14bca4d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -3,88 +3,86 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> +<html:html> + <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" - creationUrl="/rhn/admin/iss/EditSlave.do" creationType="slave" - creationAcl="user_role(satellite_admin)"> - <bean:message key="iss.master.jsp.toolbar" /> - </rhn:toolbar> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + creationUrl="/rhn/admin/iss/EditSlave.do" creationType="slave" + creationAcl="user_role(satellite_admin)"> + <bean:message key="iss.master.jsp.toolbar" /> + </rhn:toolbar> -<p><bean:message key="iss.master.jsp.explanation" /></p> + <p><bean:message key="iss.master.jsp.explanation" /></p> - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <c:set var="pageList" value="${requestScope.all}" /> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <c:set var="pageList" value="${requestScope.all}" /> - <h2> - <bean:message key="iss.master.jsp.header2" /> - </h2> + <h2> + <bean:message key="iss.master.jsp.header2" /> + </h2> - <rl:listset name="issSlaveListSet"> - <rhn:csrf /> - <rhn:submitted /> - <rl:list dataset="pageList" name="issSlaveList" - emptykey="iss.master.jsp.noslaves"> - <rl:decorator name="SelectableDecorator" /> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" /> - <rl:column sortable="true" headerkey="iss.slave.name" sortattr="slave"> - <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}"> - <c:out value="${current.slave}" /> - </html:link> - </rl:column> - <rl:column bound="false" headerkey="iss.slave.isEnabled" - sortattr="enabled" styleclass="center" headerclass="center"> - <c:if test="${current.enabled == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.enabled"/>" - title="<bean:message key="iss.slave.enabled"/>" /> - </c:if> - <c:if test="${current.enabled != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.disabled"/>" - title="<bean:message key="iss.slave.disabled"/>" /> - </c:if> - </rl:column> - <rl:column bound="false" headerkey="iss.slave.toAll" - sortattr="allOrgs" styleclass="center" headerclass="center"> - <c:if test="${current.allowAllOrgs == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.all"/>" - title="<bean:message key="iss.slave.all"/>" /> - </c:if> - <c:if test="${current.allowAllOrgs != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.notAll"/>" - title="<bean:message key="iss.slave.notAll"/>" /> - </c:if> - </rl:column> - <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" - styleclass="center" headerclass="center"> - <c:if test="${current.enabled != 'Y'}"> - <bean:message key="iss.slave.disabled"/> - </c:if> - <c:if test="${current.enabled == 'Y' && current.allowAllOrgs == 'Y'}"> - <bean:message key="iss.slave.all-allowed"/> - </c:if> - <c:if test="${current.enabled == 'Y' && current.allowAllOrgs != 'Y'}"> - <c:out value="${current.numAllowedOrgs}" /> - </c:if> - </rl:column> + <rl:listset name="issSlaveListSet"> + <rhn:csrf /> + <rhn:submitted /> + <rl:list dataset="pageList" name="issSlaveList" + emptykey="iss.master.jsp.noslaves"> + <rl:decorator name="SelectableDecorator" /> + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" /> + <rl:column sortable="true" headerkey="iss.slave.name" sortattr="slave"> + <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}"> + <c:out value="${current.slave}" /> + </html:link> + </rl:column> + <rl:column bound="false" headerkey="iss.slave.isEnabled" + sortattr="enabled" styleclass="center" headerclass="center"> + <c:if test="${current.enabled == 'Y'}"> + <img src="/img/rhn-listicon-checked.gif" + alt="<bean:message key="iss.slave.enabled"/>" + title="<bean:message key="iss.slave.enabled"/>" /> + </c:if> + <c:if test="${current.enabled != 'Y'}"> + <img src="/img/rhn-listicon-unchecked.gif" + alt="<bean:message key="iss.slave.disabled"/>" + title="<bean:message key="iss.slave.disabled"/>" /> + </c:if> + </rl:column> + <rl:column bound="false" headerkey="iss.slave.toAll" + sortattr="allOrgs" styleclass="center" headerclass="center"> + <c:if test="${current.allowAllOrgs == 'Y'}"> + <img src="/img/rhn-listicon-checked.gif" + alt="<bean:message key="iss.slave.all"/>" + title="<bean:message key="iss.slave.all"/>" /> + </c:if> + <c:if test="${current.allowAllOrgs != 'Y'}"> + <img src="/img/rhn-listicon-unchecked.gif" + alt="<bean:message key="iss.slave.notAll"/>" + title="<bean:message key="iss.slave.notAll"/>" /> + </c:if> + </rl:column> + <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" + styleclass="center" headerclass="center"> + <c:if test="${current.enabled != 'Y'}"> + <bean:message key="iss.slave.disabled"/> + </c:if> + <c:if test="${current.enabled == 'Y' && current.allowAllOrgs == 'Y'}"> + <bean:message key="iss.slave.all-allowed"/> + </c:if> + <c:if test="${current.enabled == 'Y' && current.allowAllOrgs != 'Y'}"> + <c:out value="${current.numAllowedOrgs}" /> + </c:if> + </rl:column> - </rl:list> - <c:if test="${not empty requestScope.all}"> - <div align="right"> - <rhn:submitted /> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.slave.remove"/>' /> - </div> - </c:if> - </rl:listset> - -</body> + </rl:list> + <c:if test="${not empty requestScope.all}"> + <div align="right"> + <rhn:submitted /> + <input type="submit" name="dispatch" class="btn btn-default" + value='<bean:message key="iss.slave.remove"/>' /> + </div> + </c:if> + </rl:listset> + </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index 445eff3..f726814 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -3,68 +3,59 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:html xhtml="true"> -<body> - - <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" - creationUrl="/rhn/admin/iss/EditMaster.do" creationType="master" - creationAcl="user_role(satellite_admin)"> - <bean:message key="iss.slave.jsp.toolbar" /> - </rhn:toolbar> - -<p><bean:message key="iss.slave.jsp.explanation" /></p> - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/iss_config.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <c:set var="pageList" value="${requestScope.all}" /> - - <h2> - <bean:message key="iss.slave.jsp.header2" /> - </h2> - - <rl:listset name="issMasterListSet"> - <rhn:csrf /> - <rhn:submitted /> - <rl:list dataset="pageList" name="issMasterList" - emptykey="iss.slave.jsp.nomasters"> - <rl:decorator name="SelectableDecorator" /> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" /> - <rl:column sortable="true" headerkey="iss.master.label" sortattr="label"> - <html:link href="/rhn/admin/iss/EditMaster.do?id=${current.id}"> - <c:out value="${current.label}" /> - </html:link> - </rl:column> - <rl:column bound="false" headerkey="iss.master.isDefault" - styleclass="center" headerclass="center"> - <c:if test="${current.defaultMaster}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.master.isDefault"/>" - title="<bean:message key="iss.master.isDefault"/>" /> - </c:if> - <c:if test="${not current.defaultMaster}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.master.notDefault"/>" - title="<bean:message key="iss.master.notDefault"/>" /> - </c:if> - </rl:column> - <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> - <c:out value="${current.numMasterOrgs}" /> - </rl:column> - <rl:column headerkey="iss.num.unmapped.orgs" styleclass="center" headerclass="center"> - <c:out value="${current.numMasterOrgs - current.numMappedMasterOrgs}" /> - </rl:column> - </rl:list> - <c:if test="${not empty requestScope.all}"> - <div align="right"> - <rhn:submitted /> - <hr /> - <input type="submit" name="dispatch" - value='<bean:message key="iss.master.remove"/>' /> - </div> - </c:if> - </rl:listset> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" + creationUrl="/rhn/admin/iss/EditMaster.do" creationType="master" + creationAcl="user_role(satellite_admin)"> + <bean:message key="iss.slave.jsp.toolbar" /> + </rhn:toolbar> + <p><bean:message key="iss.slave.jsp.explanation" /></p> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/iss_config.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <c:set var="pageList" value="${requestScope.all}" /> + <h2><bean:message key="iss.slave.jsp.header2" /></h2> + <rl:listset name="issMasterListSet"> + <rhn:csrf /> + <rhn:submitted /> + <rl:list dataset="pageList" name="issMasterList" + emptykey="iss.slave.jsp.nomasters"> + <rl:decorator name="SelectableDecorator" /> + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" /> + <rl:column sortable="true" headerkey="iss.master.label" sortattr="label"> + <html:link href="/rhn/admin/iss/EditMaster.do?id=${current.id}"> + <c:out value="${current.label}" /> + </html:link> + </rl:column> + <rl:column bound="false" headerkey="iss.master.isDefault" + styleclass="center" headerclass="center"> + <c:if test="${current.defaultMaster}"> + <img src="/img/rhn-listicon-checked.gif" + alt="<bean:message key="iss.master.isDefault"/>" + title="<bean:message key="iss.master.isDefault"/>" /> + </c:if> + <c:if test="${not current.defaultMaster}"> + <img src="/img/rhn-listicon-unchecked.gif" + alt="<bean:message key="iss.master.notDefault"/>" + title="<bean:message key="iss.master.notDefault"/>" /> + </c:if> + </rl:column> + <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> + <c:out value="${current.numMasterOrgs}" /> + </rl:column> + <rl:column headerkey="iss.num.unmapped.orgs" styleclass="center" headerclass="center"> + <c:out value="${current.numMasterOrgs - current.numMappedMasterOrgs}" /> + </rl:column> + </rl:list> + <c:if test="${not empty requestScope.all}"> + <div align="right"> + <rhn:submitted /> + <input type="submit" name="dispatch" class="btn btn-default" + value='<bean:message key="iss.master.remove"/>' /> + </div> + </c:if> + </rl:listset> + </body> </html:html> commit 2e0c0e51abbb1d3d35d35709f7b470a513fd455b Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 15 16:39:24 2013 +0200 Systems Selected Toolbar function to hide the tooldbar when there is no systems selected diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index e693ab0..5cd6ef4 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -1,27 +1,43 @@ $(document).on("ready", function(){ - /* Menu in the left column - actions to hide submenu and create animation when a - menu only has submenues and doesnt have a URL */ - $("#sidenav ul>ul").hide(); + /* Menu in the left column - actions to hide submenu and create animation when a + menu only has submenues and doesnt have a URL */ + $("#sidenav ul>ul").hide(); - $("#sidenav li.active").each(function() { - $(this).next("ul").show(300); - }); + $("#sidenav li.active").each(function() { + $(this).next("ul").show(300); + }); - /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when - no system is selected */ - $("#clearbtn").click(hidesystemtool); - function hidesystemtool(){ - $(".spacewalk-bar").animate({ - "right": "-=50px", - "opacity": "0"}, - 300, function() { - /* after animation is complete we hide the element */ - $(this).hide(); - }); - } -}); + /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when + no system is selected */ + $("#clearbtn").click(hidesystemtool); + function hidesystemtool(){ + $(".spacewalk-bar").animate({ + "right": "-=50px", + "opacity": "0"}, + 300, function() { + /* after animation is complete we hide the element */ + $(this).hide(); + }); + } + // See if there is a system selected + ssmToolbar(); + $("#spacewalk-ssm-counter").on("change", ssmToolbar); + function ssmToolbar(){ + console.log("entro"); + var systemsSpan = $("#spacewalk-ssm-counter").text(); + if (systemsSpan == 0){ + $(".spacewalk-bar").animate({"opacity": "0"}, 300, function() { + /* stuff to do after animation is complete */ + //$(this).hide(); + }); + }else{ + (".spacewalk-bar").animate({"opacity":"100"}, 300); + } + } +}); +/* Getting the screen size to create a fixed padding-bottom in the Section tag to make both columns the same size */ // On window load $(window).load(function () { columnHeight(); @@ -29,35 +45,33 @@ $(window).load(function () { // On window resize $(window).resize( function () { - $("section.col-md-10").css("padding-bottom", ""); - columnHeight(); + $("section.col-md-10").css("padding-bottom", ""); + columnHeight(); }); // Make columns 100% in height function columnHeight() { //Only if the screen size is higher than the max-width set up in the Variables.less under the definition @screen-md: //PLEASE: update this if you change the content of @screen-md - //if ($(document).width()>992) { - var sectionHeight = $("section.col-md-10").outerHeight(); - var heightDoc = $(document).height(); - // Column heights should equal the document height minus the header height and footer height - var newHeight = heightDoc - 160 - sectionHeight + "px"; - $("section.col-md-10").animate({ - "padding-bottom": newHeight}, - 200); - //}; + if ($(document).width()>992) { + var sectionHeight = $("section.col-md-10").outerHeight(); + var heightDoc = $(document).height(); + // Column heights should equal the document height minus the header height and footer height + var newHeight = heightDoc - 160 - sectionHeight + "px"; + $("section.col-md-10").css("padding-bottom", newHeight); + }; }; // Render page fragments loaded via DWR function makeAjaxCallback(divId, debug) { - cb = function(text) { - if (debug) { - alert(text); - } - $('#' + divId).html(text); - $('#' + divId).fadeIn(); - columnHeight(); - }; - return cb; + cb = function(text) { + if (debug) { + alert(text); + } + $('#' + divId).html(text); + $('#' + divId).fadeIn(); + columnHeight(); + }; + return cb; } commit 829a5dfaea20df63c757dddae50d8d2077efce86 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 15 16:38:16 2013 +0200 spacewalk-bar pushed to the right diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index d5d9867..0fe4ffe 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -80,7 +80,7 @@ </rhn:require> <rhn:require acl="user_authenticated()"> <div id="bar"> - <div class="spacewalk-bar"> + <div class="spacewalk-bar pull-right"> <span id="header_selcount"> <rhn:setdisplay user="${requestScope.session.user}" /> </span> commit 7babf831d133584dcd7529f8322fae4e52c4e8c7 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 15 16:27:28 2013 +0200 Roboto loaded locally diff --git a/branding/css/mixins.less b/branding/css/mixins.less index e0daa17..1347e24 100644 --- a/branding/css/mixins.less +++ b/branding/css/mixins.less @@ -1,10 +1,8 @@ .Roboto-thin{ - font-family: @roboto-font; - font-weight: 300; + font-family: @roboto-light; } .Roboto-strong{ - font-family: @roboto-font; - font-weight: 700; + font-family: @roboto-bold; } /* Mixings */ diff --git a/branding/css/roboto.less b/branding/css/roboto.less new file mode 100644 index 0000000..ee4a6ac --- /dev/null +++ b/branding/css/roboto.less @@ -0,0 +1,14 @@ +@font-face { + font-family: 'Roboto Light'; + font-style: normal; + font-weight: 300; + //src: url('Roboto/Roboto-Light.eot'); + src: local('Roboto Light'), local('RobotoLight'), url('../fonts/Roboto/Roboto-Light.ttf') format('truetype'); +} +@font-face { + font-family: 'Roboto Bold'; + font-style: normal; + font-weight: 300; + //src: url('Roboto/Roboto-Light.eot'); + src: local('Roboto Bold'), local('RobotoBold'), url('../fonts/Roboto/Roboto-Bold.ttf') format('truetype'); +} \ No newline at end of file diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index a4f797b..12482b7 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -3,8 +3,8 @@ /* Here begins the spacewalk css theme */ -/* Import of Roboto font */ -@import url(http://fonts.googleapis.com/css?family=Roboto:300,700); +/* Roboto font */ +@import url(roboto.less); /* Spacewalk variables */ @import url(variables.less); /* Spacewalk mixins */ diff --git a/branding/css/variables.less b/branding/css/variables.less index fbda6a6..112839e 100644 --- a/branding/css/variables.less +++ b/branding/css/variables.less @@ -8,7 +8,7 @@ @gray-light: lighten(#000, 80%); // #999 @gray-lighter: lighten(#000, 95%); // #eee -@spacewalk-blue: #00aad4; +@spacewalk-blue: #00aad4; @spacewalk-updates-green: #7ac142; @spacewalk-security-red: #a81a1a; @@ -28,4 +28,5 @@ @spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%); /* Roboto variable: font variable to be applied in different text elements*/ -@roboto-font: 'Roboto', sans-serif; \ No newline at end of file +@roboto-light: 'Roboto Light', sans-serif; +@roboto-bold: 'Roboto Bold', sans-serif; \ No newline at end of file diff --git a/branding/fonts/Roboto/LICENSE.txt b/branding/fonts/Roboto/LICENSE.txt new file mode 100755 index 0000000..d645695 --- /dev/null +++ b/branding/fonts/Roboto/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/branding/fonts/Roboto/Roboto-Bold.ttf b/branding/fonts/Roboto/Roboto-Bold.ttf new file mode 100755 index 0000000..aaf374d Binary files /dev/null and b/branding/fonts/Roboto/Roboto-Bold.ttf differ diff --git a/branding/fonts/Roboto/Roboto-Light.ttf b/branding/fonts/Roboto/Roboto-Light.ttf new file mode 100755 index 0000000..664e1b2 Binary files /dev/null and b/branding/fonts/Roboto/Roboto-Light.ttf differ commit a1c9db750f7ecc4f3b001e8b346ee0f1356b3418 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 15 15:40:32 2013 +0200 TB3: Admin/Config/Boostrap form diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp index 1e33640..f2efc48 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp @@ -3,108 +3,110 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> - <bean:message key="bootstrap.jsp.toolbar"/> -</rhn:toolbar> - -<div class="page-summary"> - <p> - <bean:message key="bootstrap.jsp.summary"/> - </p> -</div> - - -<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="bootstrap.jsp.header2"/></h2> - -<div> -<html:form action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}" enctype="multipart/form-data"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <label for="hostname"><rhn:required-field key="bootstrap.jsp.hostname"/>:</label> - </th> - <td> - <html:text size="32" property="hostname" styleId="hostname" /> - </td> - </tr> - <tr> - <th> - <label for="ssl-cert"><rhn:required-field key="bootstrap.jsp.ssl-cert"/>:</label> - </th> - <td> - <html:text size="32" property="ssl-cert" styleId="ssl-cert" /> - </td> - </tr> - <tr> - <th> - <label for="ssl"><bean:message key="bootstrap.jsp.ssl"/></label> - </th> - <td> - <html:checkbox property="ssl" styleId="ssl" /> - </td> - </tr> - <tr> - <th> - <label for="gpg"><bean:message key="bootstrap.jsp.gpg"/></label> - </th> - <td> - <html:checkbox property="gpg" styleId="gpg" /> - </td> - </tr> - <tr> - <th> - <label for="allow-config-actions"><bean:message key="bootstrap.jsp.allow-config-actions"/></label> - </th> - <td> - <html:checkbox property="allow-config-actions" styleId="allow-config-actions"/> - </td> - </tr> - <tr> - <th> - <label for="allow-remote-commands"><bean:message key="bootstrap.jsp.allow-remote-commands"/></label> - </th> - <td> - <html:checkbox property="allow-remote-commands" styleId="allow-remote-commands" /> - </td> - </tr> - <tr> - <th> - <label for="http-proxy"><bean:message key="bootstrap.jsp.http-proxy"/></label> - </th> - <td> - <html:text size="32" property="http-proxy" styleId="http-proxy" /> - </td> - </tr> - <tr> - <th> - <label for="http-proxy-username"><bean:message key="bootstrap.jsp.http-proxy-username"/></label> - </th> - <td> - <html:text size="32" property="http-proxy-username" styleId="http-proxy-username" /> - </td> - </tr> - <tr> - <th> - <label for="http-proxy-password"><bean:message key="bootstrap.jsp.http-proxy-password"/></label> - </th> - <td> - <html:text size="32" property="http-proxy-password" styleId="http-proxy-password" /> - </td> - </tr> - - </table> - <hr/> - <div align="right"><html:submit><bean:message key="config.update"/></html:submit></div> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> -</html:form> -</div> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <bean:message key="bootstrap.jsp.toolbar"/> + </rhn:toolbar> + <div class="page-summary"> + <p><bean:message key="bootstrap.jsp.summary"/></p> + </div> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="bootstrap.jsp.header2"/></h2> + <html:form action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}" + styleClass="form-horizontal" + enctype="multipart/form-data"> + <rhn:csrf /> + <div class="form-group"> + <label for="hostname" class="col-lg-3 control-label"> + <rhn:required-field key="bootstrap.jsp.hostname"/>: + </label> + <div class="col-lg-6"> + <html:text size="32" property="hostname" styleId="hostname" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="ssl-cert"> + <rhn:required-field key="bootstrap.jsp.ssl-cert"/>: + </label> + <div class="col-lg-6"> + <html:text size="32" property="ssl-cert" styleId="ssl-cert" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="ssl" styleId="ssl" /> + <bean:message key="bootstrap.jsp.ssl"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="gpg" styleId="gpg" /> + <bean:message key="bootstrap.jsp.gpg"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="allow-config-actions" styleId="allow-config-actions"/> + <bean:message key="bootstrap.jsp.allow-config-actions"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="allow-remote-commands" styleId="allow-remote-commands" /> + <bean:message key="bootstrap.jsp.allow-remote-commands"/> + </label> + </div> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="http-proxy"> + <bean:message key="bootstrap.jsp.http-proxy"/> + </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy" styleId="http-proxy" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <label for="http-proxy-username" class="col-lg-3 control-label"> + <bean:message key="bootstrap.jsp.http-proxy-username"/> + </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy-username" styleClass="form-control" styleId="http-proxy-username" /> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="http-proxy-password"> + <bean:message key="bootstrap.jsp.http-proxy-password"/> + </label> + <div class="col-lg-6"> + <html:text size="32" property="http-proxy-password" styleId="http-proxy-password" styleClass="form-control" /> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="config.update"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> + </body> </html:html> commit 4de5cd6c6c1647bae17aee58befa694f285fb983 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 14:36:12 2013 +0200 Remove obsolete inline script (replaced by code in spacewalk-login.js) diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp index 784c6af..f850de8 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -7,16 +7,8 @@ <meta name="decorator" content="layout_c" /> <script src="/javascript/focus.js"></script> <script src="/javascript/spacewalk-login.js"></script> - <script> - // Remove the aside to center the login - function setupLogin() { - $$("aside").invoke("remove"); - $$("section").invoke("removeClassName", "col-md-10"); - $$("section").invoke("addClassName", "col-md-8 col-md-offset-2"); - } - </script> </head> -<body onLoad="formFocus('loginForm', 'username');setupLogin();"> +<body onLoad="formFocus('loginForm', 'username');"> <c:if test="${schemaUpgradeRequired == 'true'}"> <div class="site-alert"> diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp index 0d07a47..a3d0131 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -6,16 +6,8 @@ <head> <script src="/javascript/focus.js"></script> <script src="/javascript/spacewalk-login.js"></script> - <script> - // Remove the aside to center the login - function setupLogin() { - $$("aside").invoke("remove"); - $$("section").invoke("removeClassName", "col-md-10"); - $$("section").invoke("addClassName", "col-md-8 col-md-offset-2"); - } - </script> </head> -<body onLoad="formFocus('loginForm', 'username');setupLogin();"> +<body onLoad="formFocus('loginForm', 'username');"> <c:if test="${schemaUpgradeRequired == 'true'}"> <div class="site-alert"> commit 73969c6826ace5650a6693c32742e1025694694a Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 15 13:57:43 2013 +0200 TB3: Admin/Configuration/Certificate form diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp index 70a7891..0297362 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp @@ -3,51 +3,47 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> -<body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> - <bean:message key="certificate.jsp.toolbar"/> -</rhn:toolbar> - -<div class="page-summary"> - <p> - <bean:message key="certificate.jsp.summary"/> - </p> -</div> - - -<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="certificate.jsp.header2"/></h2> - -<div> -<html:form action="/admin/config/CertificateConfig?csrf_token=${csrfToken}" enctype="multipart/form-data"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <rhn:required-field key="certificate.jsp.cert_file"/> - </th> - <td> - <html:file property="cert_file"/> - </td> - </tr> - <tr> - <th> - <rhn:required-field key="certificate.jsp.cert_text"/> - </th> - <td> - <html:textarea cols="80" rows="24" property="cert_text" /> - </td> - </tr> - </table> - <hr/> - <div align="right"><html:submit><bean:message key="config.update"/></html:submit></div> - <html:hidden property="suite_id" value="${probeSuite.id}"/> - <html:hidden property="submitted" value="true"/> -</html:form> -</div> - -</body> +<html:html> + <body> + <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img"> + <bean:message key="certificate.jsp.toolbar"/> + </rhn:toolbar> + + <div class="page-summary"> + <p><bean:message key="certificate.jsp.summary"/></p> + </div> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/sat_config.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="certificate.jsp.header2"/></h2> + <html:form action="/admin/config/CertificateConfig?csrf_token=${csrfToken}" + styleClass="form-horizontal" + enctype="multipart/form-data"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label" for="certfile"> + <rhn:required-field key="certificate.jsp.cert_file"/> + </label> + <div class="col-lg-6"> + <html:file property="cert_file" styleId="certfile" styleClass="form-control"/> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="certtext"> + <rhn:required-field key="certificate.jsp.cert_text"/> + </label> + <div class="col-lg-6"> + <html:textarea cols="80" rows="24" property="cert_text" styleClass="form-control"/> + </div> + </div> + + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="config.update"/> + </html:submit> + </div> + </div> + <html:hidden property="suite_id" value="${probeSuite.id}"/> + <html:hidden property="submitted" value="true"/> + </html:form> + </body> </html:html> -

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.31-1'
by Michael Mraka 21 Oct '13

21 Oct '13

Tag 'spacewalk-backend-2.1.31-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-21 08:59 +0000 Tagging package [spacewalk-backend] version [2.1.31-1] in directory [backend/]. Changes since spacewalk-backend-2.1.30-1: Michael Mraka (6): fixed pylint: Unused argument 'args' fixed pylint: Using global for 'EMAIL_LOG' but no assignment is done fixed pylint: unnecessary semicolon fixed pylint: Operator not preceded by a space fixed pylint: Unused variable 'args' Automatic commit of package [spacewalk-backend] release [2.1.31-1]. --- backend/satellite_tools/satComputePkgHeaders.py | 14 +++++++------- backend/satellite_tools/syncLib.py | 2 -- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) ---

1 0

6 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 21 Oct '13

21 Oct '13

backend/satellite_tools/satComputePkgHeaders.py | 14 +++++++------- backend/satellite_tools/syncLib.py | 2 -- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) New commits: commit 59052643394a851234728409ff523a0ac5c7c76d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 21 10:59:56 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.31-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index cb46590..296a62f 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.30 +Version: 2.1.31 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Mon Oct 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.31-1 +- fixed pylint warnings and errors + * Mon Oct 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.30-1 - python oracle tests: better integration with nosetest - python pgsql driver: behave like the oracle one diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 18910d5..2853561 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.30-1 backend/ +2.1.31-1 backend/ commit 28860a3a9ba01df0d6d6b57039cbc762c8f237c1 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 31 12:01:18 2012 +0200 fixed pylint: Unused variable 'args' diff --git a/backend/satellite_tools/satComputePkgHeaders.py b/backend/satellite_tools/satComputePkgHeaders.py index 4f2c02e..7699cae 100644 --- a/backend/satellite_tools/satComputePkgHeaders.py +++ b/backend/satellite_tools/satComputePkgHeaders.py @@ -71,7 +71,7 @@ class Runner: def main(self): parser = OptionParser(option_list=options_table) - (self.options, args) = parser.parse_args() + (self.options, _args) = parser.parse_args() rhnSQL.initDB() commit 71fffa59207e64edc963057305b5e9904895bc54 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 31 12:00:41 2012 +0200 fixed pylint: Operator not preceded by a space diff --git a/backend/satellite_tools/satComputePkgHeaders.py b/backend/satellite_tools/satComputePkgHeaders.py index e238e6c..4f2c02e 100644 --- a/backend/satellite_tools/satComputePkgHeaders.py +++ b/backend/satellite_tools/satComputePkgHeaders.py @@ -39,7 +39,7 @@ table = None config_tree = None server_root = None mpm_query = None -exists_config_define=None +exists_config_define = None OK = 1 commit 41f0bd3982c4516e38862edc8ae0ad1b18acdfe8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 31 12:00:03 2012 +0200 fixed pylint: unnecessary semicolon diff --git a/backend/satellite_tools/satComputePkgHeaders.py b/backend/satellite_tools/satComputePkgHeaders.py index 5765a34..e238e6c 100644 --- a/backend/satellite_tools/satComputePkgHeaders.py +++ b/backend/satellite_tools/satComputePkgHeaders.py @@ -193,7 +193,7 @@ class Runner: continue try: - (header_start, header_end) = rhn_rpm.get_header_byte_range(p_file); + (header_start, header_end) = rhn_rpm.get_header_byte_range(p_file) except Exception, e: print "Error reading header size from file %s: %s" % (path, e) commit 3760d33ebc6fe53de09371f210c40319d66005df Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 31 11:55:52 2012 +0200 fixed pylint: Using global for 'EMAIL_LOG' but no assignment is done diff --git a/backend/satellite_tools/syncLib.py b/backend/satellite_tools/syncLib.py index 05f9753..9472f59 100644 --- a/backend/satellite_tools/syncLib.py +++ b/backend/satellite_tools/syncLib.py @@ -35,7 +35,6 @@ def initEMAIL_LOG(reinit=0): EMAIL_LOG = StringIO() def dumpEMAIL_LOG(): - global EMAIL_LOG if EMAIL_LOG is not None: return EMAIL_LOG.getvalue() return None @@ -115,7 +114,6 @@ def log2email(level, msg, cleanYN=0, notimeYN=0): """ Log to the email log. Arguments: see def _prepLogMsg(...) above. """ - global EMAIL_LOG if EMAIL_LOG is not None: log2stream(level, msg, cleanYN, notimeYN, EMAIL_LOG) commit e97a447d436437117578a1a1a6014e23552214b8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 21 10:54:09 2013 +0200 fixed pylint: Unused argument 'args' diff --git a/backend/satellite_tools/satComputePkgHeaders.py b/backend/satellite_tools/satComputePkgHeaders.py index 7e34a34..5765a34 100644 --- a/backend/satellite_tools/satComputePkgHeaders.py +++ b/backend/satellite_tools/satComputePkgHeaders.py @@ -22,16 +22,16 @@ from optparse import OptionParser, Option SERVER_RETURN = 0 -def log_error(*args): +def log_error(*_args): pass -def make_table(*args): +def make_table(*_args): pass -def parse_qs(*args): +def parse_qs(*_args): pass -def parse_qsl(*args): +def parse_qsl(*_args): pass status = None

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.30-1'
by Michael Mraka 21 Oct '13

21 Oct '13

Tag 'spacewalk-backend-2.1.30-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-21 08:23 +0000 Tagging package [spacewalk-backend] version [2.1.30-1] in directory [backend/]. Changes since spacewalk-java-2.1.58-1: Flavio Castelli (4): python oracle tests: fixed import statements python oracle tests: moved connection settings to configuration file python pgsql driver: behave like the oracle one python oracle tests: better integration with nosetest Michael Mraka (2): removed dead test Automatic commit of package [spacewalk-backend] release [2.1.30-1]. --- backend/server/handlers/app/test/test_channel.py | 272 ----------------------- backend/server/rhnSQL/driver_postgresql.py | 4 backend/spacewalk-backend.spec | 9 backend/test/db_settings.ini | 4 backend/test/non-unit/server/rhnSQL/dbtests.py | 40 --- backend/test/runtests-oracle.py | 56 +++- rel-eng/packages/spacewalk-backend | 2 7 files changed, 64 insertions(+), 323 deletions(-) ---

1 0

6 commits - backend/server backend/spacewalk-backend.spec backend/test rel-eng/packages
by Michael Mraka 21 Oct '13

21 Oct '13

backend/server/handlers/app/test/test_channel.py | 272 ----------------------- backend/server/rhnSQL/driver_postgresql.py | 4 backend/spacewalk-backend.spec | 9 backend/test/db_settings.ini | 4 backend/test/non-unit/server/rhnSQL/dbtests.py | 40 --- backend/test/runtests-oracle.py | 56 +++- rel-eng/packages/spacewalk-backend | 2 7 files changed, 64 insertions(+), 323 deletions(-) New commits: commit 2d855013f49045c11883af8cd64e542ebe1af5ce Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 21 10:23:48 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.30-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 438aace..cb46590 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.29 +Version: 2.1.30 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,13 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Mon Oct 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.30-1 +- python oracle tests: better integration with nosetest +- python pgsql driver: behave like the oracle one +- python oracle tests: moved connection settings to configuration file +- python oracle tests: fixed import statements +- removed dead test + * Fri Oct 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 - include stringutils into package - replace encode/decode with to_string/to_unicode diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index b8c4508..18910d5 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.29-1 backend/ +2.1.30-1 backend/ commit d4420c0a54089f9a8e12632ff5b451a10e0aa3cb Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 18 15:20:49 2013 +0200 python oracle tests: better integration with nosetest Made easier to run python oracle tests using nosetest. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index fd7fa93..101f48f 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -199,41 +199,3 @@ class RhnSQLDatabaseTests(unittest.TestCase): # ret = sp(5) # self.assertEquals(5, ret) - - -class OracleDatabaseTests(RhnSQLDatabaseTests): - QUERY_CREATE_TABLE = """ - CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2)) - """ - - SIMPLE_PROCEDURE = """ -CREATE OR REPLACE FUNCTION - return_int(returnme in integer) -RETURN INTEGER AS -BEGIN - RETURN returnme; -END; - """ - - def setUp(self): - self.set_temp_table() - create_table_query = self.QUERY_CREATE_TABLE % self.temp_table - cursor = rhnSQL.prepare(create_table_query) - cursor.execute() - - RhnSQLDatabaseTests.setUp(self) - - cursor = rhnSQL.prepare(self.SIMPLE_PROCEDURE) - cursor.execute() - - def tearDown(self): - cursor = rhnSQL.prepare("DROP FUNCTION return_int") - cursor.execute() - - RhnSQLDatabaseTests.tearDown(self) - -def oracle_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(OracleDatabaseTests)) - return suite - diff --git a/backend/test/runtests-oracle.py b/backend/test/runtests-oracle.py index 75fada2..25bee4e 100755 --- a/backend/test/runtests-oracle.py +++ b/backend/test/runtests-oracle.py @@ -47,11 +47,42 @@ rhnSQL.initDB(backend="oracle", username=USER, rhnSQL.initDB(backend="oracle", username=USER, password=PASSWORD, database=DATABASE) +class OracleDatabaseTests(dbtests.RhnSQLDatabaseTests): + QUERY_CREATE_TABLE = """ + CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2)) + """ + + SIMPLE_PROCEDURE = """ +CREATE OR REPLACE FUNCTION + return_int(returnme in integer) +RETURN INTEGER AS +BEGIN + RETURN returnme; +END; + """ + + def setUp(self): + self.set_temp_table() + create_table_query = self.QUERY_CREATE_TABLE % self.temp_table + cursor = rhnSQL.prepare(create_table_query) + cursor.execute() + + dbtests.RhnSQLDatabaseTests.setUp(self) + + cursor = rhnSQL.prepare(self.SIMPLE_PROCEDURE) + cursor.execute() + + def tearDown(self): + cursor = rhnSQL.prepare("DROP FUNCTION return_int") + cursor.execute() + + dbtests.RhnSQLDatabaseTests.tearDown(self) + def suite(): + s = unittest.TestSuite() + s.addTest(unittest.makeSuite(OracleDatabaseTests)) # Append all test suites here: - return unittest.TestSuite(( - dbtests.oracle_suite(), - )) + return unittest.TestSuite(s) if __name__ == "__main__": try: commit 71b80f5d69bcd18677cb40882bf8764fe664dab2 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 18 15:20:48 2013 +0200 python pgsql driver: behave like the oracle one Ensure the PostgreSQL driver raises a `sql_base.SQLError` when a cursor executes a query which has unbound variables. This makes the behaviour of the PostgreSQL driver consistent with the Oracle one. diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index c284ca0..caa5e25 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -18,6 +18,7 @@ # import sys +import string import re import psycopg2 @@ -279,6 +280,9 @@ class Cursor(sql_base.Cursor): raise sql_base.SQLSchemaError(error_code, e.pgerror, e) except psycopg2.ProgrammingError, e: raise sql_base.SQLStatementPrepareError(self.dbh, e.pgerror, self.sql) + except KeyError, e: + raise sql_base.SQLError("Unable to bound the following variable(s): %s" + % (string.join(e.args, " "))) return retval def _execute_(self, args, kwargs): diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index 0fa703a..fd7fa93 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -66,7 +66,7 @@ class RhnSQLDatabaseTests(unittest.TestCase): query = "INSERT INTO %s(id, name) VALUES(:id, :name)" % \ self.temp_table cursor = rhnSQL.prepare(query) - self.assertRaises(KeyError, cursor.execute, name="Blah") + self.assertRaises(sql_base.SQLError, cursor.execute, name="Blah") def test_statement_prepare_error(self): rhnSQL.transaction("test_statement_prepare_error") commit 34c4ec9078c058cdb61e10a3f0e64a16faf0a66b Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 18 15:20:47 2013 +0200 python oracle tests: moved connection settings to configuration file Moved all the Oracle connection settings to the db_settings.ini file (like we already do with the PostgreSQL's values). diff --git a/backend/test/db_settings.ini b/backend/test/db_settings.ini index 10e417f..79b7f0b 100644 --- a/backend/test/db_settings.ini +++ b/backend/test/db_settings.ini @@ -3,3 +3,7 @@ host: localhost user: dgoodwin password: spacewalk database: spacewalk +[oracle] +user: spacewalk +password: spacewalk +database: xe diff --git a/backend/test/runtests-oracle.py b/backend/test/runtests-oracle.py index c13f70f..75fada2 100755 --- a/backend/test/runtests-oracle.py +++ b/backend/test/runtests-oracle.py @@ -23,6 +23,7 @@ import os import sys import unittest +from ConfigParser import ConfigParser from spacewalk.server import rhnSQL # Import all test modules here: @@ -32,9 +33,12 @@ sys.path.insert( ) import dbtests -USER = "spacewalk" -PASSWORD = "spacewalk" -DATABASE = "xe" +config = ConfigParser() +config.read(os.path.dirname(os.path.abspath(__file__)) + "/db_settings.ini") + +USER = config.get('oracle', 'user') +PASSWORD = config.get('oracle', 'password') +DATABASE = config.get('oracle', 'database') rhnSQL.initDB(backend="oracle", username=USER, password=PASSWORD, database=DATABASE) commit b0a0165e3c16e3fa6849b9349a48f406b7d920c5 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 18 15:20:46 2013 +0200 python oracle tests: fixed import statements Fixed the import statements. This makes possible to run the test suite. diff --git a/backend/test/runtests-oracle.py b/backend/test/runtests-oracle.py index cb5f97a..c13f70f 100755 --- a/backend/test/runtests-oracle.py +++ b/backend/test/runtests-oracle.py @@ -19,16 +19,17 @@ Non-pure tests requiring connectivity to an Oracle server configured below. """ +import os import sys import unittest -sys.path.insert(0, '../') -sys.path.insert(0, './suites') -sys.path.insert(0, '../../client/rhel/rhnlib') - from spacewalk.server import rhnSQL # Import all test modules here: +sys.path.insert( + 0, + os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../non-unit/server/rhnSQL/")) +) import dbtests USER = "spacewalk" commit 433b2086a26bcb0fafb412c9b86d1e3373fcebec Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 12 12:58:46 2012 +0200 removed dead test app/channel.py has been removed in 1c1faa908c7bf2754c7338895fc567e832f963b9 diff --git a/backend/server/handlers/app/test/test_channel.py b/backend/server/handlers/app/test/test_channel.py deleted file mode 100644 index 1e787e3..0000000 --- a/backend/server/handlers/app/test/test_channel.py +++ /dev/null @@ -1,272 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2008--2013 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -import unittest -from spacewalk.server import rhnSQL -from spacewalk.common.rhnException import rhnFault -from spacewalk.server.handlers.app import channel - -#setup -db = 'webdev' -username = 'praddb' -password = 'password' -channel = channel.Channel() -commit = True -options = {'verbose': None, 'family': 'prad-channel', 'manage': None, - 'dist_release': '1.0', 'update_only': None, 'subscribe': None, - 'summary': 'none', 'create': True, 'end_of_life': None, 'label': 'yy', - 'csv': None, 'username': 'praddb', 'description': None, 'parent': None, - 'revoke_manage': None, 'update': None, 'password': 'password', - 'arch': 'channel-ia32', 'gpg_key_id': None, 'gpg_key_url': None, - 'name': 'xx', 'gpg_key_fp': None, 'list': None, - 'server': 'rhnxml.back-webdev.redhat.com', 'orgId': None, - 'revoke_subscribe': None, 'delete': None} - -version = options['dist_release'] - -kargs = { - 'channel_id' : 217, - 'channel_arch_id' : 500, - 'release' : version - } - -class ChannelTestCase(unittest.TestCase): - - def setUp(self): - rhnSQL.initDB() - - def tearDown(self): - rhnSQL.rollback() - - def testauth(self): - try: - channel._auth(username, password) - except rhnFault, f: - None - - def testcreatechannel(self): - params = {'gpg_key_url': '', 'channel_arch_id': 500, 'name': 'xx', - 'gpg_key_fp': '', 'basedir': '/', 'org_id': '', - 'end_of_life': '', 'label': 'yy', 'parent_channel': '', - 'summary': 'none', 'id': 255, 'gpg_key_id': '', 'description': ''} - - ret = channel.createChannel(params, commit, username, password) - - h = rhnSQL.prepare("""select * from rhnChannel where label = : label""") - h.execute(label = params['label']) - - ret = h.fetchone_dict() or [] - - self.assertEqual(ret, []) - - - def testlistchannel(self): - ret = channel.listChannel(username, password) - - self.assertNotEqual(ret, []) - - assert type(ret) == type([]) - - def testupdatechannel(self): - params = {'gpg_key_url': '', 'channel_arch_id': 500, 'name': 'xx-update', 'gpg_key_fp': '', - 'basedir': '/', 'org_id': '', 'end_of_life': '', 'label': 'yy', - 'parent_channel': '', 'summary': 'none', 'id': 255, 'gpg_key_id': '', - 'description': ''} - - h = rhnSQL.prepare("""select id from rhnChannel where label = : label""") - h.execute(label = params['label']) - - ret = h.fetchone_dict() or [] - - channel_id = ret['id'] - - old_channel_family_id = 107 - new_channel_family_id = 109 - - ret = channel.updateChannel(params, channel_id, old_channel_family_id, - new_channel_family_id, commit, username, password) - - h = rhnSQL.prepare("""select name from rhnChannel where label = : label""") - h.execute(label = params['label']) - - ret = h.fetchone_dict() or [] - #Errors if the name field is not updated. - self.assertEqual(ret['name'], params['name']) - - - def testdeletechannel(self): - channel_id = 5294 - ret = channel.deleteChannel( channel_id, commit, username, password) - - h = rhnSQL.prepare("""select * from rhnChannel where id = : cid""") - h.execute(cid = channel_id) - - ret = h.fetchone_dict() or [] - - self.assertEqual(ret, []) - - - def testlistchannelfororg(self): - orgId = 1 - ret = channel.listChannelForOrg(orgId, username, password) - - assert type(ret) == type([]) - - def testlookupchannel(self): - label = 'aa' - ret = channel.lookupChannel( label, username, password) - if ret: - assert type(ret) == type([]) - - def testlookupchannelarch(self): - label = 'aa' - test_arch = channel.lookupChannelArch(label, username, password) - assert type(test_arch) == type(1) - - def testlookuporgId(self): - org_id =1 - ret = channel.lookupOrgId(org_id, username, password) - if ret: - assert type(ret) == type(1) - - def testupdateChannelMembership(self): - channel_id = 5497 - channel_family_id = 109 - ret = channel.updateChannelMembership(channel_id, channel_family_id, kargs, commit, - username, password) - - h = rhnSQL.prepare("""select * from rhnChannelFamilyMembers where channel_id = : cid """) - - h.execute(cid = channel_id) - - ret = h.fetchone_dict() or [] - - self.assertNotEqual(ret, []) - - - def testmoveChannelDownloads(self): - channel_id = 5497 - old_channel_family_id = 107 - new_channel_family_id = 109 - ret = channel.moveChannelDownloads(channel_id, old_channel_family_id, - new_channel_family_id, username, password) - - self.assertEqual(ret, 1) - - def testdeleteDist(self): - channel_id = 505 - ret = channel.deleteDist(channel_id, username, password) - - h = rhnSQL.prepare("""select * - from rhnDistChannelMap - where channel_id = : cid """) - - h.execute(cid = channel_id) - - ret = h.fetchone_dict() or [] - - self.assertEqual(ret, []) - - def testupdateDist(self): - version = options['dist_release'] - kargs = { - 'channel_id' : 217, - 'channel_arch_id' : 500, - 'release' : version - } - ret = channel.updateDist(kargs, username, password) - h = rhnSQL.prepare("""select * - from rhnDistChannelMap - where channel_id = : cid """) - - h.execute(cid = kargs['channel_id']) - - ret = h.fetchone_dict() or [] - self.assertNotEqual(ret, []) - - def testchannelManagePermission(self): - ret1 = channel.channelManagePermission(options['label'], 'manage', commit, - username, password) - - ret2 = channel.channelManagePermission(options['label'], 'subscribe', commit, - username, password) - - h = rhnSQL.prepare("""select id from rhnchannel where label = :label""") - h.execute(label = options['label']) - - ret = h.fetchone_dict() or [] - - h2 = rhnSQL.prepare(""" - select cpr.label - from rhnchannelpermission cp, - rhnchannelpermissionrole cpr - where cp.channel_id = :cid - and cpr.id = cp.role_id - """) - h2.execute(cid = ret['id']) - - ret2 = h2.fetchone_dict() or [] - if ret2: - assert ret2['label'] in ['manage', 'subscribe'] - - def testrevokemanageChannelPermission(self): - ret = channel.revokeChannelPermission(options['label'], 'manage', commit, - username, password) - - h = rhnSQL.prepare("""select id from rhnchannel where label = :label""") - h.execute(label = options['label']) - - ret = h.fetchone_dict() or [] - - h2 = rhnSQL.prepare(""" - select cpr.label - from rhnchannelpermission cp, - rhnchannelpermissionrole cpr - where cp.channel_id = :cid - and cpr.id = cp.role_id - """) - h2.execute(cid = ret['id']) - - ret2 = h2.fetchone_dict() or [] - if ret2: - assert ret2['label'] != 'manage' - - - def testrevokesubscribeChannelPermission(self): - ret = channel.revokeChannelPermission(options['label'], 'subscribe', commit, - username, password) - h = rhnSQL.prepare("""select id from rhnchannel where label = :label""") - h.execute(label = options['label']) - - ret = h.fetchone_dict() or [] - - h2 = rhnSQL.prepare(""" - select cpr.label - from rhnchannelpermission cp, - rhnchannelpermissionrole cpr - where cpr.id = cp.role_id - and cp.channel_id = :cid - """) - h2.execute(cid = ret['id']) - - ret2 = h2.fetchone_dict() or [] - if ret2: - assert ret2['label'] != 'subscribe' - - -if __name__ == "__main__": - unittest.main() - rhnSQL.rollback()

1 0

Changes to 'refs/tags/spacewalk-java-2.1.58-1'
by StephenHerr 18 Oct '13

18 Oct '13

Tag 'spacewalk-java-2.1.58-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-18 20:23 +0000 Tagging package [spacewalk-java] version [2.1.58-1] in directory [java/]. Changes since spacewalk-backend-2.1.29-1: Stephen Herr (2): 1020497 - fixing a bug and adding a unit test for ordering kickstarts Automatic commit of package [spacewalk-java] release [2.1.58-1]. --- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java | 46 ------- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptsSetupActionTest.java | 46 +++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 64 ++++++++++ java/spacewalk-java.spec | 7 - rel-eng/packages/spacewalk-java | 2 7 files changed, 129 insertions(+), 51 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by StephenHerr 18 Oct '13

18 Oct '13

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 1f7474ccec701b10cc5ebab90a7c9df024472ae0 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Oct 18 16:23:55 2013 -0400 Automatic commit of package [spacewalk-java] release [2.1.58-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4db8b11..c9a63ad 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.57 +Version: 2.1.58 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Oct 18 2013 Stephen Herr <sherr(a)redhat.com> 2.1.58-1 +- 1020497 - fixing a bug and adding a unit test for ordering kickstarts +- Cobbler tests: added missing return +- Update ScriptSetupActionTest for new attribute name + * Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.57-1 - 1020497 - re-applying fix from 122418187 that got missed in the merge in c821c7ee2 diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 174f34e..a352366 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.57-1 java/ +2.1.58-1 java/

1 0

java/code
by StephenHerr 18 Oct '13

18 Oct '13

java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java | 46 ------- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptsSetupActionTest.java | 46 +++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 64 ++++++++++ 5 files changed, 122 insertions(+), 49 deletions(-) New commits: commit 6c888d530ac6141d4b3cc30649fcf51a57d20995 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Oct 18 16:22:49 2013 -0400 1020497 - fixing a bug and adding a unit test for ordering kickstarts diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java index ef6c008..b220917 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java @@ -196,7 +196,9 @@ public class KickstartScriptOrderAction extends RhnLookupDispatchAction { // update scripts with the appropriate priorities for (KickstartScript script : scripts) { script.setPosition(oldToNew.get(fakeToOld.get(script.getPosition()))); + HibernateFactory.getSession().save(script); } + KickstartFactory.saveKickstartData(ksdata); getStrutsDelegate().saveMessage("kickstart.script.order.success", request); return getStrutsDelegate().forwardParam(mapping.findForward("success"), diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java deleted file mode 100644 index 8563b6d..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (c) 2009--2012 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.action.kickstart.test; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; -import com.redhat.rhn.frontend.action.kickstart.ScriptsSetupAction; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; -import com.redhat.rhn.testing.UserTestUtils; - -/** - * KickstartsSetupActionTest - * @version $Rev: 1 $ - */ -public class ScriptSetupActionTest extends RhnMockStrutsTestCase { - - public void testKickstartList() throws Exception { - // Create a kickstart and the defaults so the list - // will return something. - UserTestUtils.addProvisioning(user.getOrg()); - KickstartData k = KickstartDataTest.createTestKickstartData(user.getOrg()); - setRequestPathInfo("/kickstart/Scripts"); - addRequestParameter(RequestContext.KICKSTART_ID, k.getId().toString()); - actionPerform(); - DataResult dr = (DataResult) request.getAttribute(ScriptsSetupAction.LIST_NAME); - assertNotNull(dr); - assertTrue(dr.size() > 0); - - } - -} - diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptsSetupActionTest.java new file mode 100644 index 0000000..cc52ea5 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptsSetupActionTest.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2009--2012 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.kickstart.test; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.frontend.action.kickstart.ScriptsSetupAction; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.UserTestUtils; + +/** + * KickstartsSetupActionTest + * @version $Rev: 1 $ + */ +public class ScriptsSetupActionTest extends RhnMockStrutsTestCase { + + public void testKickstartList() throws Exception { + // Create a kickstart and the defaults so the list + // will return something. + UserTestUtils.addProvisioning(user.getOrg()); + KickstartData k = KickstartDataTest.createTestKickstartData(user.getOrg()); + setRequestPathInfo("/kickstart/Scripts"); + addRequestParameter(RequestContext.KICKSTART_ID, k.getId().toString()); + actionPerform(); + DataResult dr = (DataResult) request.getAttribute(ScriptsSetupAction.LIST_NAME); + assertNotNull(dr); + assertTrue(dr.size() > 0); + + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index e1e6f14..4f16b34 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -511,17 +511,24 @@ public class ProfileHandler extends BaseHandler { Long nextPosition = 1L; Long nextNegativePosition = -1L; for (Integer id : preScripts) { - idToScript.get(id).setPosition(nextPosition); + KickstartScript script = idToScript.get(id); + script.setPosition(nextPosition); nextPosition += 1; + HibernateFactory.getSession().save(script); } for (Integer id : postScriptsBeforeRegistration) { - idToScript.get(id).setPosition(nextNegativePosition); + KickstartScript script = idToScript.get(id); + script.setPosition(nextNegativePosition); nextNegativePosition -= 1; + HibernateFactory.getSession().save(script); } for (Integer id : postScriptsAfterRegistration) { - idToScript.get(id).setPosition(nextPosition); + KickstartScript script = idToScript.get(id); + script.setPosition(nextPosition); nextPosition += 1; + HibernateFactory.getSession().save(script); } + KickstartFactory.saveKickstartData(data); return 1; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java index bda9ff8..bb12aa3 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java @@ -169,6 +169,70 @@ public class ProfileHandlerTest extends BaseHandlerTestCase { assertTrue(found); } + public void testOrderScripts() throws Exception { + KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg()); + // delete kickstart scripts that are already there + List<KickstartScript> scripts = handler.listScripts(adminKey, ks.getLabel()); + for (KickstartScript script : scripts) { + handler.removeScript(adminKey, ks.getLabel(), script.getId().intValue()); + } + ks = (KickstartData) HibernateFactory.reload(ks); + + int idPost1 = + handler.addScript(adminKey, ks.getLabel(), "myPost1", "This is a script", + "", "post", true); + int idPost2 = + handler.addScript(adminKey, ks.getLabel(), "myPost2", "This is a script", + "", "post", true); + int idPostNochroot1 = + handler.addScript(adminKey, ks.getLabel(), "myPostNochroot1", + "This is a script", "", "post", false); + int idPostNochroot2 = + handler.addScript(adminKey, ks.getLabel(), "myPostNochroot2", + "This is a script", "", "post", false); + int idPre1 = + handler.addScript(adminKey, ks.getLabel(), "myPre1", "This is a script", + "", "pre", false); + int idPre2 = + handler.addScript(adminKey, ks.getLabel(), "myPre2", "This is a script", + "", "pre", false); + ks = (KickstartData) HibernateFactory.reload(ks); + + // make sure they're in the proper order initially + scripts = handler.listScripts(adminKey, ks.getLabel()); + assertNotNull(scripts); + assertEquals(6, scripts.size()); + assertEquals(idPre1, scripts.get(0).getId().intValue()); + assertEquals(scripts.get(1).getId().intValue(), idPre2); + assertEquals(scripts.get(2).getId().intValue(), idPostNochroot1); + assertEquals(scripts.get(3).getId().intValue(), idPostNochroot2); + assertEquals(scripts.get(4).getId().intValue(), idPost1); + assertEquals(scripts.get(5).getId().intValue(), idPost2); + + List<Integer> orderedPre = new ArrayList<Integer>(); + List<Integer> orderedPostBefore = new ArrayList<Integer>(); + List<Integer> orderedPostAfter = new ArrayList<Integer>(); + orderedPre.add(idPre2); + orderedPre.add(idPre1); + orderedPostBefore.add(idPost1); + orderedPostBefore.add(idPostNochroot1); + orderedPostAfter.add(idPost2); + orderedPostAfter.add(idPostNochroot2); + + //make the acutal call + handler.orderScripts(adminKey, ks.getLabel(), orderedPre, orderedPostBefore, + orderedPostAfter); + + //test results + scripts = handler.listScripts(adminKey, ks.getLabel()); + assertTrue(scripts.get(0).getId().intValue() == idPre2); + assertTrue(scripts.get(1).getId().intValue() == idPre1); + assertTrue(scripts.get(2).getId().intValue() == idPost1); + assertTrue(scripts.get(3).getId().intValue() == idPostNochroot1); + assertTrue(scripts.get(4).getId().intValue() == idPost2); + assertTrue(scripts.get(5).getId().intValue() == idPostNochroot2); + } + public void testAddScript() throws Exception { KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg()); int id = handler.addScript(adminKey, ks.getLabel(), "sample",

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.29-1'
by Michael Mraka 18 Oct '13

18 Oct '13

Tag 'spacewalk-backend-2.1.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-18 15:49 +0000 Tagging package [spacewalk-backend] version [2.1.29-1] in directory [backend/]. Changes since spacewalk-schema-2.1.21-1: Michael Mraka (5): 891880 - make sure we put strings to fd.write() 891880 - reuse stringutils functions replace encode/decode with to_string/to_unicode include stringutils into package Automatic commit of package [spacewalk-backend] release [2.1.29-1]. Milan Zazrivec (1): 1020910 - use sha1 to compare checksums Silvio Moioli (2): Update ScriptSetupActionTest for new attribute name Cobbler tests: added missing return --- backend/common/Makefile | 3 - backend/common/fileutils.py | 2 backend/common/rhnMail.py | 7 +- backend/common/rhnTB.py | 26 ++++---- backend/common/stringutils.py | 29 ++++++++++ backend/satellite_tools/sync_handlers.py | 3 - backend/server/action_extra_data/configfiles.py | 5 - backend/server/importlib/debPackage.py | 4 - backend/server/importlib/headerSource.py | 3 - backend/server/rhnSQL/driver_cx_Oracle.py | 8 +- backend/server/rhnSQL/sql_base.py | 7 -- backend/server/rhnServer/server_certificate.py | 8 +- backend/spacewalk-backend.spec | 10 +++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java | 3 - java/code/src/org/cobbler/test/MockConnection.java | 1 rel-eng/packages/spacewalk-backend | 2 17 files changed, 76 insertions(+), 47 deletions(-) ---

1 0

5 commits - backend/common backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 18 Oct '13

18 Oct '13

backend/common/Makefile | 3 +- backend/common/rhnMail.py | 7 ++--- backend/common/rhnTB.py | 26 +++++++++------------ backend/common/stringutils.py | 29 ++++++++++++++++++++++++ backend/satellite_tools/sync_handlers.py | 3 +- backend/server/action_extra_data/configfiles.py | 5 +--- backend/server/importlib/debPackage.py | 4 +-- backend/server/importlib/headerSource.py | 3 +- backend/server/rhnSQL/driver_cx_Oracle.py | 8 +++--- backend/server/rhnSQL/sql_base.py | 7 ----- backend/server/rhnServer/server_certificate.py | 8 ++---- backend/spacewalk-backend.spec | 10 +++++++- rel-eng/packages/spacewalk-backend | 2 - 13 files changed, 71 insertions(+), 44 deletions(-) New commits: commit c76bdce4339c262ff1025e20dc70599ef9d96426 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 18 17:49:08 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.29-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 44ab6ee..438aace 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.28 +Version: 2.1.29 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,13 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Fri Oct 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 +- include stringutils into package +- replace encode/decode with to_string/to_unicode +- 891880 - reuse stringutils functions +- 891880 - make sure we put strings to fd.write() +- 1020910 - use sha1 to compare checksums + * Tue Oct 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.28-1 - python pgsql tests: made easier Jenkins integration diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 37e8bc2..b8c4508 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.28-1 backend/ +2.1.29-1 backend/ commit 8c7ac8621dcddf6bcb8d1fb3fe9fe75a6ca0b23f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 18 17:26:44 2013 +0200 include stringutils into package diff --git a/backend/common/Makefile b/backend/common/Makefile index 50c2e38..e6ebcc3 100644 --- a/backend/common/Makefile +++ b/backend/common/Makefile @@ -27,7 +27,8 @@ SPACEWALK_FILES = __init__ \ rhn_deb \ rhn_mpm \ rhn_pkg \ - rhn_rpm + rhn_rpm \ + stringutils SCRIPTS = spacewalk-cfg-get # check if we can build man pages diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index a4bbd9a..44ab6ee 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -512,6 +512,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/common/rhn_mpm.py* %{pythonrhnroot}/common/rhn_pkg.py* %{pythonrhnroot}/common/rhn_rpm.py* +%{pythonrhnroot}/common/stringutils.py* %files config-files-common %doc LICENSE commit f495b53debaec8289c53a233a230895dc74d1e80 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 3 18:32:25 2013 +0200 replace encode/decode with to_string/to_unicode diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py index 481d263..4d048c5 100644 --- a/backend/satellite_tools/sync_handlers.py +++ b/backend/satellite_tools/sync_handlers.py @@ -18,6 +18,7 @@ import types import string import sys +from spacewalk.common.stringutils import to_string from spacewalk.server import rhnSQL from spacewalk.server.importlib import channelImport, packageImport, errataImport, \ kickstartImport, importLib @@ -598,7 +599,7 @@ def populate_channel_family_permissions(cert): # default the org to 1 for channel families from cert org_id = 1 - cf_name = cf_name.encode('utf-8') + cf_name = to_string(cf_name) try: old_max_tuple = cfps[(cf_name, org_id)] except KeyError: diff --git a/backend/server/action_extra_data/configfiles.py b/backend/server/action_extra_data/configfiles.py index fa62303..c232aa2 100644 --- a/backend/server/action_extra_data/configfiles.py +++ b/backend/server/action_extra_data/configfiles.py @@ -15,9 +15,9 @@ # config file-related error handling functions # -from types import UnicodeType from spacewalk.common import rhnFlags from spacewalk.common.rhnLog import log_debug, log_error +from spacewalk.common.stringutils import to_string from spacewalk.server import rhnSQL from spacewalk.server.rhnServer import server_kickstart @@ -269,8 +269,7 @@ def _add_result(action_config_revision_id, diff): if diff: blob_map = {'result': 'result'} - if type(diff) == UnicodeType: - diff = unicode.encode(diff,'utf-8') + diff = to_string(diff) else: blob_map = None diff = None diff --git a/backend/server/importlib/debPackage.py b/backend/server/importlib/debPackage.py index 99f5c90..b799e3b 100644 --- a/backend/server/importlib/debPackage.py +++ b/backend/server/importlib/debPackage.py @@ -22,7 +22,7 @@ import string from importLib import Channel from backendLib import gmtime, localtime from types import IntType - +from spacewalk.common.stringutils import to_string class debBinaryPackage(headerSource.rpmBinaryPackage): @@ -62,7 +62,7 @@ class debBinaryPackage(headerSource.rpmBinaryPackage): elif val: # Convert to strings if isinstance(val, unicode): - val = unicode.encode(val, 'utf-8') + val = to_string(val) else: val = str(val) elif val == []: diff --git a/backend/server/importlib/headerSource.py b/backend/server/importlib/headerSource.py index 37026fd..7933d29 100644 --- a/backend/server/importlib/headerSource.py +++ b/backend/server/importlib/headerSource.py @@ -24,6 +24,7 @@ from importLib import File, Dependency, ChangeLog, Channel, \ from backendLib import gmtime, localtime from types import ListType, TupleType, IntType, LongType, StringType from spacewalk.common.rhnLog import log_debug +from spacewalk.common.stringutils import to_string class rpmPackage(IncompletePackage): # Various mappings @@ -65,7 +66,7 @@ class rpmPackage(IncompletePackage): elif val: # Convert to strings if isinstance(val, unicode): - val = unicode.encode(val, 'utf-8') + val = to_string(val) else: val = str(val) elif val == []: diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py index 03575da..0af3df6 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -34,7 +34,7 @@ from spacewalk.server import rhnSQL from spacewalk.common import rhnConfig from spacewalk.common.rhnLog import log_debug, log_error from spacewalk.common.rhnException import rhnException -from sql_base import adjust_type +from spacewalk.common.stringutils import to_string from const import ORACLE ORACLE_TYPE_MAPPING = [ @@ -154,7 +154,7 @@ class Cursor(sql_base.Cursor): if not _p.has_key(k): # Raise the fault ourselves raise sql_base.SQLError(1008, 'Not all variables bound', k) - params[k] = adjust_type(_p[k]) + params[k] = to_string(_p[k]) # cx_Oracle expects the first arg to be the statement and no # positional args: @@ -194,7 +194,7 @@ class Cursor(sql_base.Cursor): for i in xrange(item_count): pdict = arr[i] for k, v in kwargs.iteritems(): - pdict[k] = adjust_type(v[start+i]) + pdict[k] = to_string(v[start+i]) # We clear self->bindVariables so that list of all nulls # in the previous chunk which caused the type to be set to @@ -326,7 +326,7 @@ class Procedure(sql_base.Procedure): return self._call_proc_ret(args, ret_type=None) def _call_proc_ret(self, args, ret_type=None): - args = map(adjust_type, self._munge_args(args)) + args = map(to_string, self._munge_args(args)) if ret_type: for sqltype, db_type in self._type_mapping: if isinstance(ret_type, sqltype): diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py index f76c2e1..e1ce75a 100644 --- a/backend/server/rhnSQL/sql_base.py +++ b/backend/server/rhnSQL/sql_base.py @@ -28,13 +28,6 @@ import sys import sql_types import types -def adjust_type(val): - """ Adjust data types prior to calling execute(). """ - if isinstance(val, types.UnicodeType): - # Represent it as UTF8 - return val.encode("UTF8") - return val - def ociDict(names=None, row=None): """ Create a dictionary from a row description and its values. """ data = {} diff --git a/backend/server/rhnServer/server_certificate.py b/backend/server/rhnServer/server_certificate.py index 30ee545..5d2e3ed 100644 --- a/backend/server/rhnServer/server_certificate.py +++ b/backend/server/rhnServer/server_certificate.py @@ -26,6 +26,7 @@ import xmlrpclib from spacewalk.common.rhnLog import log_debug, log_error from spacewalk.common.rhnException import rhnFault +from spacewalk.common.stringutils import to_string from server_lib import getServerSecret def gen_secret(): @@ -56,7 +57,7 @@ class Checksum: else: if type(arg) == type(0): arg = str(arg) - self.sum.update(arg.encode("utf-8")) + self.sum.update(to_string(arg)) def __repr__(self): t = "" for i in self.sum.digest()[:]: @@ -141,10 +142,7 @@ class Certificate: return -1 # Now decode this certificate try: - if isinstance(text_id, unicode): - sysid, junk = xmlrpclib.loads(text_id.encode('utf-8')) - else: - sysid, junk = xmlrpclib.loads(text_id) + sysid, junk = xmlrpclib.loads(to_string(text_id)) except: return -1 else: commit c75009845c65d9a956238b46f52931c6fd2ae4c4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 3 17:42:47 2013 +0200 891880 - reuse stringutils functions diff --git a/backend/common/rhnMail.py b/backend/common/rhnMail.py index 2059c59..684fced 100644 --- a/backend/common/rhnMail.py +++ b/backend/common/rhnMail.py @@ -20,6 +20,7 @@ import smtplib from rhnConfig import CFG, PRODUCT_NAME from rhn.connections import idn_pune_to_unicode +from stringutils import to_string # check if the headers have the minimum required fields def __check_headers(h): @@ -53,8 +54,6 @@ def send(headers, body, sender = None): joined_headers += u"%s: %s\n" % (h, headers[h]) server = smtplib.SMTP('localhost') - if not isinstance(body, unicode): - body = body.decode('utf-8') - msg = u"%s\n%s\n" % (joined_headers, body) - server.sendmail(sender, toaddrs, msg.encode('utf-8')) + msg = "%s\n%s\n" % (to_string(joined_headers), to_string(body)) + server.sendmail(sender, toaddrs, msg) server.quit() commit e8628e3b3decc8502f4914d9f60c1d5e1dee3bd6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 3 17:13:55 2013 +0200 891880 - make sure we put strings to fd.write() diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py index 209cac3..9c77f58 100644 --- a/backend/common/rhnTB.py +++ b/backend/common/rhnTB.py @@ -24,6 +24,7 @@ from rhn.connections import idn_pune_to_unicode from rhnConfig import CFG, PRODUCT_NAME from rhnLog import log_error from rhnTranslate import _ +from stringutils import to_string import rhnMail import rhnFlags @@ -44,7 +45,7 @@ def print_env(fd = sys.stderr): el = dct.keys() el.sort() for k in el: - fd.write("%s = %s\n" % (k, dct[k])) + fd.write("%s = %s\n" % (to_string(k), to_string(dct[k]))) def print_locals(fd = sys.stderr, tb = None): @@ -70,13 +71,13 @@ def print_locals(fd = sys.stderr, tb = None): frame.f_code.co_filename, frame.f_lineno)) for key, value in frame.f_locals.items(): - fd.write("\t%20s = " % key) + fd.write("\t%20s = " % to_string(key)) # We have to be careful not to cause a new error in our error # printer! Calling str() on an unknown object could cause an # error we don't want. # pylint: disable=W0702 try: - s = str(value) + s = str(to_string(value)) except: s = "<ERROR WHILE PRINTING VALUE>" if len(s) > 100 * 1024: @@ -98,7 +99,7 @@ def print_req(req, fd = sys.stderr): kl = req.headers_in.keys() kl.sort() for k in kl: - fd.write("\t%s: %s\n" % (k, req.headers_in[k])) + fd.write("\t%s: %s\n" % (to_string(k), to_string(req.headers_in[k]))) return 0 @@ -126,16 +127,16 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr, exc = StringIO() unicode_hostname = idn_pune_to_unicode(hostname) - exc.write("Exception reported from %s\nTime: %s\n" % (unicode_hostname, t)) - exc.write("Exception type %s\n" % (e_type,)) + exc.write("Exception reported from %s\nTime: %s\n" % (to_string(unicode_hostname), t)) + exc.write("Exception type %s\n" % to_string(e_type)) if method: - exc.write("Exception while handling function %s\n" % method) + exc.write("Exception while handling function %s\n" % to_string(method)) # print information about the request being served if req: print_req(req, exc) if extra: - exc.write("Extra information about this error:\n%s\n" % extra) + exc.write("Extra information about this error:\n%s\n" % to_string(extra)) # Print the traceback exc.write("\nException Handler Information\n") @@ -147,11 +148,8 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr, # we always log it somewhere if ostream: - msg = exc.getvalue() - if isinstance(msg, unicode): - msg = msg.encode('utf-8') - ostream.write("%s\n" % msg) - + ostream.write(to_string(exc.getvalue())) + ostream.write("\n") if mail: # print the stack frames for the mail we send out @@ -175,7 +173,7 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr, } QUIET_MAIL = QUIET_MAIL - 1 # count it no matter what - outstring = exc.getvalue() + outstring = to_string(exc.getvalue()) #5/18/05 wregglej - 151158 Go through every string in the security list # and censor it out of the debug information. diff --git a/backend/common/stringutils.py b/backend/common/stringutils.py new file mode 100644 index 0000000..b7d8715 --- /dev/null +++ b/backend/common/stringutils.py @@ -0,0 +1,29 @@ +# +# Copyright (c) 2013 Red Hat, Inc. +# +# This software is licensed to you under the GNU General Public License, +# version 2 (GPLv2). There is NO WARRANTY for this software, express or +# implied, including the implied warranties of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +# along with this software; if not, see +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +# +# Red Hat trademarks are not licensed under GPLv2. No permission is +# granted to use or replicate Red Hat trademarks that are incorporated +# in this software or its documentation. +# + +from types import StringType, UnicodeType + + +def to_unicode(obj): + if type(obj) == StringType: + return unicode(obj, 'utf8') + else: + return obj + +def to_string(obj): + if type(obj) == UnicodeType: + return obj.encode('utf8') + else: + return obj

1 0

backend/common
by Milan Zazrivec 18 Oct '13

18 Oct '13

backend/common/fileutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4d23af586196547fa8d3b867f0aed7922503ca8 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Oct 18 15:59:17 2013 +0200 1020910 - use sha1 to compare checksums md5 will not work on a FIPS enabled Spacewalk. diff --git a/backend/common/fileutils.py b/backend/common/fileutils.py index f8fc12f..fb4cb8b 100644 --- a/backend/common/fileutils.py +++ b/backend/common/fileutils.py @@ -107,7 +107,7 @@ def rotateFile(filepath, depth=5, suffix='.', verbosity=0): % os.path.dirname(pathNSuffix)) # is there anything to do? (existence, then size, then checksum) - checksum_type = 'md5' # FIXME: this should be configuation option + checksum_type = 'sha1' if os.path.exists(pathNSuffix1) and os.path.isfile(pathNSuffix1) \ and os.stat(filepath)[6] == os.stat(pathNSuffix1)[6] \ and getFileChecksum(checksum_type, filepath) == \

1 0

java/code
by Silvio Moioli 18 Oct '13

18 Oct '13

java/code/src/org/cobbler/test/MockConnection.java | 1 + 1 file changed, 1 insertion(+) New commits: commit 6b7b0945b6b7a310ff76341ba7f7600bff3a5780 Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Oct 18 11:50:26 2013 +0200 Cobbler tests: added missing return diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code/src/org/cobbler/test/MockConnection.java index 67e512a..105462c 100644 --- a/java/code/src/org/cobbler/test/MockConnection.java +++ b/java/code/src/org/cobbler/test/MockConnection.java @@ -233,6 +233,7 @@ public class MockConnection extends CobblerConnection { } else if ("remove_system".equals(name)) { systems.remove(findByName((String)args[0], systems)); + return true; } else if ("new_system".equals(name)) { Map profile = new HashMap();

1 0

java/code
by Silvio Moioli 18 Oct '13

18 Oct '13

java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 08f2d4b7b2d71c21004768fb2c2d8bd1d4d2e0d0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Oct 18 12:05:28 2013 +0200 Update ScriptSetupActionTest for new attribute name diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java index 88895c2..1e397d6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java @@ -38,7 +38,7 @@ import com.redhat.rhn.manager.kickstart.KickstartLister; */ public class ScriptsSetupAction extends RhnAction { - static final String LIST_NAME = "kickstart_scripts"; + public static final String LIST_NAME = "kickstart_scripts"; /** * diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java index 9dae86f..8563b6d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.kickstart.test; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.frontend.action.kickstart.ScriptsSetupAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.UserTestUtils; @@ -35,7 +36,7 @@ public class ScriptSetupActionTest extends RhnMockStrutsTestCase { setRequestPathInfo("/kickstart/Scripts"); addRequestParameter(RequestContext.KICKSTART_ID, k.getId().toString()); actionPerform(); - DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST); + DataResult dr = (DataResult) request.getAttribute(ScriptsSetupAction.LIST_NAME); assertNotNull(dr); assertTrue(dr.size() > 0);

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.21-1'
by StephenHerr 17 Oct '13

17 Oct '13

Tag 'spacewalk-schema-2.1.21-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-17 19:25 +0000 Tagging package [spacewalk-schema] version [2.1.21-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-2.1.57-1: Stephen Herr (1): Automatic commit of package [spacewalk-schema] release [2.1.21-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by StephenHerr 17 Oct '13

17 Oct '13

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b57505d09c973e9e27063286fa81c22258172885 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:25:29 2013 -0400 Automatic commit of package [spacewalk-schema] release [2.1.21-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 211eaa1..258e22f 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.20-1 schema/spacewalk/ +2.1.21-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 099202d..b94be63 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.20 +Version: 2.1.21 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.21-1 +- 1020497 - provide a way to order kickstart scripts + * Tue Sep 17 2013 Jan Dobes 2.1.20-1 - 820225 - recount associated virtual guests entitlements even in other orgs

1 0

Changes to 'refs/tags/spacewalk-java-2.1.57-1'
by StephenHerr 17 Oct '13

17 Oct '13

Tag 'spacewalk-java-2.1.57-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-17 19:17 +0000 Tagging package [spacewalk-java] version [2.1.57-1] in directory [java/]. Changes since spacewalk-branding-2.1.5-1: Stephen Herr (2): 1020497 - re-applying fix from 122418187 that got missed in the merge in c821c7ee2 Automatic commit of package [spacewalk-java] release [2.1.57-1]. --- java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 +++- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr 17 Oct '13

17 Oct '13

java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 +++- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 39a055142be622c3835f8922d6e32b2e73299fdb Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:17:20 2013 -0400 Automatic commit of package [spacewalk-java] release [2.1.57-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 678a35c..4db8b11 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.56 +Version: 2.1.57 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.57-1 +- 1020497 - re-applying fix from 122418187 that got missed in the merge in + c821c7ee2 + * Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.56-1 - 1020497 - provide a way to order kickstart scripts diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index ade0068..174f34e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.56-1 java/ +2.1.57-1 java/ commit c7917c0b99b5cfb253f20efac99a5eb8512f0910 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:16:50 2013 -0400 1020497 - re-applying fix from 122418187 that got missed in the merge in c821c7ee2 diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 75dfbfa..906e26e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -613,7 +613,9 @@ public class KickstartFormatter { else if (ksdata.getNonChrootPost() && !isPre && !kss.thisScriptIsChroot()) { addLogBegin(retval, POST_LOG_NOCHROOT_FILE + "." + this.postLogPostfix, kss.getInterpreter()); - retval.append(RHN_TRACE); + if (isBashInterpreter(kss.getInterpreter())) { + retval.append(RHN_TRACE); + } } else { retval.append(NEWLINE);

1 0

Changes to 'refs/tags/spacewalk-branding-2.1.5-1'
by StephenHerr 17 Oct '13

17 Oct '13

Tag 'spacewalk-branding-2.1.5-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-17 19:02 +0000 Tagging package [spacewalk-branding] version [2.1.5-1] in directory [branding/]. Changes since spacewalk-java-2.1.56-1: Stephen Herr (1): Automatic commit of package [spacewalk-branding] release [2.1.5-1]. --- branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-java-2.1.56-1'
by StephenHerr 17 Oct '13

17 Oct '13

Tag 'spacewalk-java-2.1.56-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-17 19:02 +0000 Tagging package [spacewalk-java] version [2.1.56-1] in directory [java/]. Changes since spacewalk-java-2.1.55-1: Stephen Herr (2): 1020497 - provide a way to order kickstart scripts Automatic commit of package [spacewalk-java] release [2.1.56-1]. --- branding/img/action-order.gif |binary java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 33 - java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java | 76 ++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 236 ++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java | 42 + java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java | 144 ----- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 18 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 50 + java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 122 ++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 9 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 266 ++++------ java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 47 + java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 14 java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp | 139 +++++ java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 79 +- java/code/webapp/WEB-INF/struts-config.xml | 38 + java/spacewalk-java.spec | 5 rel-eng/packages/spacewalk-java | 2 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/021-rhnKickstartScript.sql | 1 web/html/javascript/config_channel_ranks.js | 102 --- web/html/javascript/rank_options.js | 120 ++++ 26 files changed, 1090 insertions(+), 475 deletions(-) ---

1 0

3 commits - branding/img branding/spacewalk-branding.spec java/code java/spacewalk-java.spec rel-eng/packages schema/spacewalk web/html
by StephenHerr 17 Oct '13

17 Oct '13

branding/img/action-order.gif |binary branding/spacewalk-branding.spec | 5 java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 33 - java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java | 76 ++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 236 ++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java | 42 + java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java | 144 ----- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 18 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 50 + java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 122 ++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 9 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 266 ++++------ java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 47 + java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 14 java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp | 139 +++++ java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 79 +- java/code/webapp/WEB-INF/struts-config.xml | 38 + java/spacewalk-java.spec | 5 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-java | 2 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/021-rhnKickstartScript.sql | 1 web/html/javascript/config_channel_ranks.js | 102 --- web/html/javascript/rank_options.js | 120 ++++ 28 files changed, 1095 insertions(+), 477 deletions(-) New commits: commit 40ea51f66b680e1ccd18d716e5f7d103d33683dd Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:02:45 2013 -0400 Automatic commit of package [spacewalk-branding] release [2.1.5-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 27e50fc..56822da 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} Summary: Spacewalk branding data @@ -74,6 +74,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.5-1 +- 1020497 - provide a way to order kickstart scripts + * Tue Oct 08 2013 Stephen Herr <sherr(a)redhat.com> 2.1.4-1 - 1006142 - non-roman character languages had bad wrapping for thin table columns diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index c28e28c..5a36726 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.4-1 branding/ +2.1.5-1 branding/ commit 707133564982d1bfd8e9c8635625080b6ae39ace Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:02:33 2013 -0400 Automatic commit of package [spacewalk-java] release [2.1.56-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e2ea77f..678a35c 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.55 +Version: 2.1.56 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.56-1 +- 1020497 - provide a way to order kickstart scripts + * Thu Oct 17 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.55-1 - 676828 - distinguish bash interpreter in ks non-chroot post scripts diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 04e4857..ade0068 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.55-1 java/ +2.1.56-1 java/ commit c821c7ee2d93635471930d5419a54494db34afb5 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 17 15:01:08 2013 -0400 1020497 - provide a way to order kickstart scripts diff --git a/branding/img/action-order.gif b/branding/img/action-order.gif new file mode 100644 index 0000000..c475c25 Binary files /dev/null and b/branding/img/action-order.gif differ diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml index ec35dc1..e6804f0 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml @@ -63,7 +63,7 @@ ORDER BY KS.label, KS.id </query> </mode> -<mode name="scripts_for_kickstart" class="com.redhat.rhn.frontend.dto.kickstart.ScriptDto"> +<mode name="scripts_for_kickstart" class="com.redhat.rhn.domain.kickstart.KickstartScript"> <query params="kickstart_id"> SELECT KS.id, KS.script_type, KS.chroot, KS.interpreter, KS.script_name, KS.position FROM rhnKickstartScript KS diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index c305a2c..34fba87 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -929,16 +929,33 @@ public class KickstartData { * @param ksIn to add */ public void addScript(KickstartScript ksIn) { - // Calc the max position and add this script at the end - Iterator i = scripts.iterator(); - long maxPosition = 0; - while (i.hasNext()) { - KickstartScript kss = (KickstartScript) i.next(); - if (kss.getPosition().longValue() > maxPosition) { - maxPosition = kss.getPosition().longValue(); + // The ordering goes: Pre scripts and post (chroot) scripts have + // positive positions, post nochroot scripts have negative + // positions where the most negative script is run right before + // Red Hat's scripts. The user can adjust these default positions + // later, but this allows us to preserve previous behavor where + // adding a nochroot post script added it right before Red Hat's + // post scripts and adding a post (chroot) script added it as the + // last script that runs. + if (ksIn.getScriptType().equals(KickstartScript.TYPE_POST) && + !ksIn.thisScriptIsChroot()) { + Long minPosition = 0L; + for (KickstartScript script : scripts) { + if (script.getPosition() < minPosition) { + minPosition = script.getPosition(); + } + } + ksIn.setPosition(minPosition - 1); + } + else { + Long maxPosition = 0L; + for (KickstartScript script : scripts) { + if (script.getPosition() > maxPosition) { + maxPosition = script.getPosition(); + } } + ksIn.setPosition(maxPosition + 1); } - ksIn.setPosition(new Long(maxPosition + 1)); ksIn.setKsdata(this); scripts.add(ksIn); diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java index 3abcfc5..32676f3 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java @@ -15,17 +15,24 @@ package com.redhat.rhn.domain.kickstart; import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.frontend.dto.BaseDto; import java.util.Date; +import org.apache.commons.lang.StringUtils; + /** * KickstartScript - Class representation of the table rhnKickstartScript. * @version $Rev: 1 $ */ -public class KickstartScript implements Comparable<KickstartScript> { +public class KickstartScript extends BaseDto implements Comparable<KickstartScript> { public static final String TYPE_PRE = "pre"; public static final String TYPE_POST = "post"; + private static final String BASH = "bash"; + private static final String PRE = "Pre"; + private static final String POST = "Post"; + private static final String NOCHROOTPOST = "Nochroot Post"; private Long id; private Long position; @@ -38,9 +45,24 @@ public class KickstartScript implements Comparable<KickstartScript> { private Date created; private Date modified; private Boolean raw = true; + private boolean editable = true; private KickstartData ksdata; + /** + * @return True if the script is editable + */ + public boolean getEditable() { + return this.editable; + } + + /** + * @param editableIn Set if script is editable + */ + public void setEditable(boolean editableIn) { + this.editable = editableIn; + } + /** Setup the default value for * chroot and other fields. */ @@ -106,6 +128,28 @@ public class KickstartScript implements Comparable<KickstartScript> { } /** + * Has to have the horrible name because "isChroot" is magic + * and causes a "can't cast boolean to String" error in hibernate. + * @return true if the script is run in a chrooted environment + */ + public boolean thisScriptIsChroot() { + return !this.chroot.toLowerCase().equals("n"); + } + + /** + * @return script "prettyified" type for this script + */ + public String getPrettyScriptType() { + if (this.scriptType.equals(TYPE_POST)) { + if (!this.thisScriptIsChroot()) { + return NOCHROOTPOST; + } + return POST; + } + return PRE; + } + + /** * Setter for scriptType * @param scriptTypeIn to set */ @@ -157,6 +201,17 @@ public class KickstartScript implements Comparable<KickstartScript> { } /** + * + * @return interpreter for this script + */ + public String getPrettyInterpreter() { + if (StringUtils.isBlank(this.interpreter)) { + return BASH; + } + return interpreter; + } + + /** * Setter for interpreter * @param interpreterIn to set */ @@ -268,6 +323,25 @@ public class KickstartScript implements Comparable<KickstartScript> { final int before = -1; final int after = 1; + // pre scripts always come first + if (!scriptIn.getScriptType().equals(this.getScriptType())) { + if (scriptIn.getScriptType().equals(TYPE_PRE)) { + return after; + } + return before; + } + + // If both positions are negative then -2 should come *after* -1. + // This is so that we can give a new script the most negative number + // and have it come right before Red Hat's scripts, preserving + // existing behavior. + if (scriptIn.getPosition() < 0 && this.getPosition() < 0) { + if (scriptIn.getPosition() > this.getPosition()) { + return after; + } + return before; + } + if (scriptIn.getPosition() < this.getPosition()) { return after; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java new file mode 100644 index 0000000..ef6c008 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java @@ -0,0 +1,236 @@ +/** + * Copyright (c) 2009--2010 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.kickstart; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; +import org.apache.struts.util.LabelValueBean; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartScript; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.RhnLookupDispatchAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.manager.kickstart.KickstartLister; + +/** + * KickstartScriptCreateAction action for creating a new kickstart script + * @version $Rev: 1 $ + */ +public class KickstartScriptOrderAction extends RhnLookupDispatchAction { + + static final String PRE_SCRIPTS = "preScripts"; + static final String POST_SCRIPTS = "postScripts"; + static final String SELECTED_PRE = "selectedPre"; + static final String SELECTED_POST = "selectedPost"; + static final String RANKED_PRE = "rankedPreValues"; + static final String RANKED_POST = "rankedPostValues"; + + /** + * + * {@inheritDoc} + */ + public ActionForward handleNoScript(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, HttpServletResponse response) { + RequestContext rctx = new RequestContext(request); + + if (!rctx.isJavaScriptEnabled()) { + getStrutsDelegate().saveMessage("common.config.rank.jsp.error.nojavascript", + request); + } + + setup((DynaActionForm) formIn, rctx); + + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + protected void setup(DynaActionForm formIn, RequestContext rctx) { + Org org = rctx.getCurrentUser().getOrg(); + KickstartData ksdata = KickstartFactory.lookupKickstartDataByIdAndOrg(org, + rctx.getRequiredParam(RequestContext.KICKSTART_ID)); + DataResult<KickstartScript> dataSet = getDataResult(ksdata.getId(), org); + + List<LabelValueBean> preScripts = new ArrayList<LabelValueBean>(); + List<LabelValueBean> postScripts = new ArrayList<LabelValueBean>(); + for (KickstartScript ks : dataSet) { + if (ks.getScriptType().equals(KickstartScript.TYPE_PRE)) { + preScripts.add(lv(ks.getScriptName(), ks.getPosition().toString())); + } + else { + postScripts.add(lv(ks.getScriptName(), ks.getPosition().toString())); + } + } + if (!preScripts.isEmpty()) { + if (StringUtils.isEmpty((String) formIn.get(SELECTED_PRE))) { + String selected = ((LabelValueBean) preScripts.get(0)).getLabel(); + formIn.set(SELECTED_PRE, selected); + } + } + if (!postScripts.isEmpty()) { + if (StringUtils.isEmpty((String) formIn.get(SELECTED_POST))) { + String selected = ((LabelValueBean) postScripts.get(0)).getLabel(); + formIn.set(SELECTED_POST, selected); + } + } + + rctx.getRequest().setAttribute(ListTagHelper.PARENT_URL, + rctx.getRequest().getRequestURI()); + formIn.set(PRE_SCRIPTS, preScripts); + formIn.set(POST_SCRIPTS, postScripts); + rctx.getRequest().setAttribute(RequestContext.KICKSTART, ksdata); + } + + /** + * + * {@inheritDoc} + */ + protected DataResult<KickstartScript> getDataResult(Long ksid, Org org) { + return KickstartLister.getInstance().scriptsInKickstartWithFakeEntry(org, ksid); + } + + /** + * {@inheritDoc} + */ + protected Map<String, String> getKeyMethodMap() { + Map<String, String> keys = new HashMap<String, String>(); + keys.put("kickstartscript.order.update", "update"); + keys.put("ssm.config.rank.jsp.up", "handleNoScript"); + keys.put("ssm.config.rank.jsp.down", "handleNoScript"); + return keys; + } + + /** + * Updates the set and then applies changes to the server + * @param mapping struts ActionMapping + * @param formIn struts ActionForm + * @param request HttpServletRequest + * @param response HttpServletResponse + * @return An action forward to the success page + */ + public ActionForward update(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, HttpServletResponse response) { + RequestContext context = new RequestContext(request); + Org org = context.getCurrentUser().getOrg(); + KickstartData ksdata = KickstartFactory.lookupKickstartDataByIdAndOrg(org, + context.getRequiredParam(RequestContext.KICKSTART_ID)); + DynaActionForm form = (DynaActionForm) formIn; + // if its not javascript enabled, can't do much report error + if (!context.isJavaScriptEnabled()) { + return handleNoScript(mapping, (DynaActionForm) formIn, request, response); + } + + Set<KickstartScript> scripts = ksdata.getScripts(); + + List<String> orderedPrePriorities = getScriptPriority(form, RANKED_PRE); + List<String> orderedPostPriorities = getScriptPriority(form, RANKED_POST); + Map<Long, Long> oldToNew = new HashMap<Long, Long>(); + + Long nextPosition = 1L; + Long nextNegativePosition = -1L; + boolean beforeRedHat = true; + + // map the old priorities to the new updated ones + for (String pre : orderedPrePriorities) { + Long oldPriority = Long.parseLong(pre); + oldToNew.put(oldPriority, nextPosition); + nextPosition += 1; + } + for (String post : orderedPostPriorities) { + Long oldPriority = Long.parseLong(post); + if (oldPriority == 0L) { + beforeRedHat = false; + continue; + } + if (beforeRedHat) { + oldToNew.put(oldPriority, nextNegativePosition); + nextNegativePosition -= 1; + } + else { + oldToNew.put(oldPriority, nextPosition); + nextPosition += 1; + } + } + + // in order to avoid a db constraint error about two scripts having the same + // position, first we'll set them to something huge and then set them to the + // correct new value. + Map<Long, Long> fakeToOld = new HashMap<Long, Long>(); + Long next = 10000L; + for (KickstartScript script : scripts) { + fakeToOld.put(next, script.getPosition()); + script.setPosition(next); + next += 1; + HibernateFactory.getSession().save(script); + } + KickstartFactory.saveKickstartData(ksdata); + + // update scripts with the appropriate priorities + for (KickstartScript script : scripts) { + script.setPosition(oldToNew.get(fakeToOld.get(script.getPosition()))); + } + + getStrutsDelegate().saveMessage("kickstart.script.order.success", request); + return getStrutsDelegate().forwardParam(mapping.findForward("success"), + RequestContext.KICKSTART_ID, ksdata.getId().toString()); + } + + /** + * Returns the position ranking info retrieved after one + * has clicked Update button. + * @param form the submitted form. + * @param preOrPost either + * @return List containing the channel ids in the order of + * their new rankings. + */ + protected List<String> getScriptPriority(DynaActionForm form, String preOrPost) { + List<String> scripts = new ArrayList<String>(); + String rankedValues = (String) form.get(preOrPost); + if (StringUtils.isNotBlank(rankedValues)) { + String[] values = rankedValues.split(","); + for (String value : values) { + scripts.add(value); + } + } + return scripts; + } + + /** + * {@inheritDoc} + */ + protected ActionForward unspecified(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + RequestContext context = new RequestContext(request); + setup((DynaActionForm) form, context); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java index f77121d..88895c2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScriptsSetupAction.java @@ -14,42 +14,56 @@ */ package com.redhat.rhn.frontend.action.kickstart; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartScript; import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.frontend.listview.PageControl; -import com.redhat.rhn.frontend.struts.BaseListAction; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.kickstart.KickstartLister; /** * KickstartsSetupAction. * @version $Rev: 1 $ */ -public class ScriptsSetupAction extends BaseListAction { +public class ScriptsSetupAction extends RhnAction { + + static final String LIST_NAME = "kickstart_scripts"; /** * * {@inheritDoc} */ - protected DataResult getDataResult(RequestContext rctx, PageControl pc) { - Long ksid = rctx.getRequiredParam(RequestContext.KICKSTART_ID); + public ActionForward execute(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, HttpServletResponse response) { + RequestContext rctx = new RequestContext(request); Org org = rctx.getCurrentUser().getOrg(); - return KickstartLister.getInstance().scriptsInKickstart(org, ksid, pc); + KickstartData ksdata = KickstartFactory.lookupKickstartDataByIdAndOrg(org, + rctx.getRequiredParam(RequestContext.KICKSTART_ID)); + DataResult<KickstartScript> dataSet = getDataResult(ksdata.getId(), org); + + request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); + request.setAttribute(LIST_NAME, dataSet); + request.setAttribute(RequestContext.KICKSTART, ksdata); + + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } /** * * {@inheritDoc} */ - protected void processRequestAttributes(RequestContext rctx) { - super.processRequestAttributes(rctx); - - KickstartData ksdata = KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); - rctx.getRequest().setAttribute(RequestContext.KICKSTART, ksdata); + protected DataResult<KickstartScript> getDataResult(Long ksid, Org org) { + return KickstartLister.getInstance().scriptsInKickstartWithFakeEntry(org, ksid); } - } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java deleted file mode 100644 index 3e2fbeb..0000000 --- a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * Copyright (c) 2009--2012 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.dto.kickstart; - -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.dto.BaseDto; - -import org.apache.commons.lang.StringUtils; - -/** - * DTO for a com.redhat.rhn.domain.kickstart.KickStartScript - * @version $Rev: 50942 $ - */ -public class ScriptDto extends BaseDto { - - private Long id; - private String scriptType; - private String chroot; - private String interpreter; - private int position; - private String scriptName; - private static final String BASH = "bash"; - private static final String PRE = "Pre"; - private static final String POST = "Post"; - private static final String CHROOTPOST = "Nochroot Post"; - - /** - * - * @return scriptName - */ - public String getScriptName() { - return scriptName; - } - - /** - * - * @param scriptNameIn to set - */ - public void setScriptName(String scriptNameIn) { - this.scriptName = scriptNameIn; - } - - /** - * - * @return chroot - */ - public String getChroot() { - return chroot; - } - - /** - * - * @param chrootIn to set - */ - public void setChroot(String chrootIn) { - this.chroot = chrootIn; - } - - /** - * - * {@inheritDoc} - */ - public Long getId() { - return id; - } - - /** - * - * @param idIn to set - */ - public void setId(Long idIn) { - this.id = idIn; - } - - /** - * - * @return interpreter for this script - */ - public String getInterpreter() { - if (StringUtils.isBlank(interpreter)) { - return BASH; - } - return interpreter; - } - - /** - * - * @param interpreterIn to set - */ - public void setInterpreter(String interpreterIn) { - this.interpreter = interpreterIn; - } - - /** - * - * @return script type for this script - */ - public String getScriptType() { - if (scriptType.equals("post")) { - if (this.chroot.toLowerCase().equals("n")) { - return CHROOTPOST; - } - return POST; - } - return PRE; - } - - /** - * - * @param scriptTypeIn to set - */ - public void setScriptType(String scriptTypeIn) { - this.scriptType = scriptTypeIn; - } - - /** - * - * @return position in listview - */ - public String getPosition() { - return LocalizationService.getInstance().formatNumber(new Integer(position)); - } - - /** - * - * @param positionIn to set - */ - public void setPosition(int positionIn) { - this.position = positionIn; - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 27c217e..827d626 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -5637,6 +5637,24 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/kickstart/KickstartScriptEdit.do</context> </context-group> </trans-unit> + <trans-unit id="kickstart.script.order.fakename"> + <source>Registration and server actions</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts.do</context> + </context-group> + </trans-unit> + <trans-unit id="kickstart.script.order.fakeinterpreter"> + <source>Not Applicable</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts.do</context> + </context-group> + </trans-unit> + <trans-unit id="kickstart.script.order.success"> + <source>Kickstart Script order was successfully updated.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts.do</context> + </context-group> + </trans-unit> <trans-unit id="listdisplaytag.viewall"> <source>View All</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 0a464b9..b60ae43 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -8820,7 +8820,7 @@ Please note that some manual configuration of these scripts may still be require </context-group> </trans-unit> <trans-unit id="kickstartscript.jsp.summary2"> - <source>You may view or edit the scripts for this kickstart below. You may add a new script using the add new kickstart script button above to the right.</source> + <source>You may view or edit the scripts for this kickstart below. You may add a new script or order the existing scripts using links above to the right.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/Scripts</context> </context-group> @@ -8831,6 +8831,42 @@ Please note that some manual configuration of these scripts may still be require <context context-type="sourcefile">/rhn/kickstart/Scripts</context> </context-group> </trans-unit> + <trans-unit id="kickstartscript.order.header"> + <source>Update kickstart script order</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartScriptOrder</context> + </context-group> + </trans-unit> + <trans-unit id="kickstartscript.order.summary"> + <source>You can update the order that your kickstart scripts will run in by changing the order below. Pre scripts will always run before the installation happens, and Post scripts will always run afterwards.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts</context> + </context-group> + </trans-unit> + <trans-unit id="kickstartscript.order.prescripts"> + <source>Pre Scripts</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts</context> + </context-group> + </trans-unit> + <trans-unit id="kickstartscript.order.postscripts"> + <source>Post Scripts</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts</context> + </context-group> + </trans-unit> + <trans-unit id="kickstartscript.order.update"> + <source>Update Order</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts</context> + </context-group> + </trans-unit> + <trans-unit id="kickstartscript.order.noscript"> + <source><strong>Warning:</strong> Javascript is required for the kickstart script ordering to succeed. Please enable Javascript in order to continue.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Scripts</context> + </context-group> + </trans-unit> <trans-unit id="kickstartips.jsp.baremetal_summary"> <source><p> In order to kickstart "bare metal systems", you will need to provide them with a boot image that is compatible with the version of the operating system you are kickstarting to via boot CD. </p> <p> Once these systems have booted using the appropriate image, you will need to provide a kickstart file. You may use the following URL in your Boot CD or in your PXE configuration to provide these systems with the kickstart file associated with this kickstart profile:</p></source> <context-group name="ctx"> @@ -9582,6 +9618,18 @@ Please note that some manual configuration of these scripts may still be require <context context-type="sourcefile">/rhn/systems/provisioning/preservation/PreservationList.do</context> </context-group> </trans-unit> + <trans-unit id="toolbar.misc.kickstartscript"> + <source>order kickstart scripts</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/provisioning/preservation/PreservationList.do</context> + </context-group> + </trans-unit> + <trans-unit id="toolbar.misc.kickstartscriptalt"> + <source>Change the order kickstart scripts run in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/provisioning/preservation/PreservationList.do</context> + </context-group> + </trans-unit> <trans-unit id="preservationlist.jsp.updatelist"> <source>Update List</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index 6e1b5c6..e1e6f14 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -64,6 +64,7 @@ import org.cobbler.Profile; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -389,12 +390,14 @@ public class ProfileHandler extends BaseHandler { } /** - * List the pre and post scripts for a kickstart profile. + * List the pre and post scripts for a kickstart profile in the order + * they will run. * @param sessionKey key * @param label the kickstart label * @return list of kickstartScript objects * - * @xmlrpc.doc List the pre and post scripts for a kickstart profile. + * @xmlrpc.doc List the pre and post scripts for a kickstart profile + * in the order they will run. * profile * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "ksLabel", "The label of the @@ -406,8 +409,121 @@ public class ProfileHandler extends BaseHandler { checkKickstartPerms(loggedInUser); KickstartData data = lookupKsData(label, loggedInUser.getOrg()); - return new ArrayList<KickstartScript>(data.getScripts()); + ArrayList<KickstartScript> scripts = new ArrayList<KickstartScript>( + data.getScripts()); + Collections.sort(scripts); + return scripts; + + } + + /** + * Change the order that kickstart scripts will run for this kickstart + * profile. Scripts will run in the order they appear in the array. + * There are three arrays, one for all pre scripts, one for the post + * scripts that run before registration and server actions happen, + * and one for post scripts that run after registration and server + * actinos. All scripts must be included in one of these lists, as + * appropriate. + * @param sessionKey key + * @param ksLabel the kickstart label + * @param preScripts the ordered list of pre scripts + * @param postScriptsBeforeRegistration the ordered list of post + * scripts that run before registration + * @param postScriptsAfterRegistration the ordered list of post + * scripts that run after registration + * @return 1 on success + * + * @xmlrpc.doc Change the order that kickstart scripts will run for + * this kickstart profile. Scripts will run in the order they appear + * in the array. There are three arrays, one for all pre scripts, one + * for the post scripts that run before registration and server + * actions happen, and one for post scripts that run after registration + * and server actions. All scripts must be included in one of these + * lists, as appropriate. + * @xmlrpc.param #session_key() + * @xmlrpc.param #param_desc("string", "ksLabel", "The label of the + * kickstart") + * @xmlrpc.param #array_single("int", + * "IDs of the ordered pre scripts") + * @xmlrpc.param #array_single("int", + * "IDs of the ordered post scripts that will run + * before registration") + * @xmlrpc.param #array_single("int", + * "IDs of the ordered post scripts that will run + * after registration") + * @xmlrpc.returntype #return_int_success() + */ + public int orderScripts(String sessionKey, String ksLabel, List<Integer> preScripts, + List<Integer> postScriptsBeforeRegistration, + List<Integer> postScriptsAfterRegistration) { + User loggedInUser = getLoggedInUser(sessionKey); + checkKickstartPerms(loggedInUser); + KickstartData data = lookupKsData(ksLabel, loggedInUser.getOrg()); + if (data == null) { + throw new FaultException(-3, "kickstartProfileNotFound", + "No Kickstart Profile found with label: " + ksLabel); + } + Set<KickstartScript> scripts = data.getScripts(); + + // validate the input + List<KickstartScript> myPreScripts = new ArrayList<KickstartScript>(); + List<KickstartScript> myPostScripts = new ArrayList<KickstartScript>(); + Map<Integer, KickstartScript> idToScript = new HashMap<Integer, KickstartScript>(); + for (KickstartScript script : scripts) { + idToScript.put(script.getId().intValue(), script); + if (script.getScriptType().equals(KickstartScript.TYPE_PRE)) { + myPreScripts.add(script); + if (!preScripts.contains(script.getId().intValue())) { + throw new IllegalArgumentException("Kickstart Script ID missing: " + + script.getId()); + } + } + else { + myPostScripts.add(script); + if (!(postScriptsBeforeRegistration.contains(script.getId().intValue()) || + postScriptsAfterRegistration.contains( + script.getId().intValue()))) { + throw new IllegalArgumentException("Kickstart Script ID missing: " + + script.getId()); + } + } + } + if (preScripts.size() != myPreScripts.size()) { + throw new IllegalArgumentException("Too many pre script IDs."); + } + if ((postScriptsBeforeRegistration.size() + postScriptsAfterRegistration.size() != + myPostScripts.size())) { + throw new IllegalArgumentException("Too many post script IDs."); + } + + // To avoid db constraint error about two scripts having same position, + // make them something else + Long fakePosition = 10000L; + for (KickstartScript script : scripts) { + script.setPosition(fakePosition); + fakePosition += 1; + HibernateFactory.getSession().save(script); + } + KickstartFactory.saveKickstartData(data); + + // create new position values + Long nextPosition = 1L; + Long nextNegativePosition = -1L; + for (Integer id : preScripts) { + idToScript.get(id).setPosition(nextPosition); + nextPosition += 1; + } + for (Integer id : postScriptsBeforeRegistration) { + idToScript.get(id).setPosition(nextNegativePosition); + nextNegativePosition -= 1; + } + for (Integer id : postScriptsAfterRegistration) { + idToScript.get(id).setPosition(nextPosition); + nextPosition += 1; + } + + return 1; } /** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java index 8fb2b46..cb51241 100755 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java @@ -31,6 +31,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * @xmlrpc.doc * #struct("kickstart script") * #prop("int", "id") + * #prop("string", "name") * #prop("string", "contents") * #prop_desc("string", "script_type", "Which type of script ('pre' or 'post').") * #prop_desc("string", "interpreter", "The scripting language interpreter to use @@ -41,6 +42,8 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop_desc("boolean", "erroronfail", "True if the script will throw an error if * it fails.") * #prop_desc("boolean", "template", "True if templating using cobbler is enabled") + * #prop_desc("boolean", "beforeRegistration", "True if script will run before the + * server registers and performs server actions.") * #struct_end() */ public class KickstartScriptSerializer extends RhnXmlRpcCustomSerializer { @@ -62,6 +65,7 @@ public class KickstartScriptSerializer extends RhnXmlRpcCustomSerializer { SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", script.getId()); + helper.add("name", script.getScriptName()); helper.add("contents", script.getDataContents()); helper.add("script_type", script.getScriptType()); @@ -83,6 +87,11 @@ public class KickstartScriptSerializer extends RhnXmlRpcCustomSerializer { helper.add("template", !script.getRaw()); + helper.add( + "beforeRegistration", + script.getScriptType().equals(KickstartScript.TYPE_PRE) || + script.getPosition() < 0L); + helper.writeTo(output); } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 4e53948..75dfbfa 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -170,6 +170,8 @@ public class KickstartFormatter { private final String ksHost; private final User user; private KickstartSession session; + private int postLogPostfix; + private int preLogPostfix; /** * constructor @@ -181,6 +183,8 @@ public class KickstartFormatter { this.ksdata = ksdataIn; this.ksHost = hostIn; this.user = UserFactory.findRandomOrgAdmin(this.ksdata.getOrg()); + this.postLogPostfix = 1; + this.preLogPostfix = 1; } /** @@ -233,6 +237,22 @@ public class KickstartFormatter { */ public String getFileData() { RegistrationType regType = ksdata.getRegistrationType(user); + List<KickstartScript> l = new LinkedList<KickstartScript>(this.ksdata.getScripts()); + Collections.sort(l); + List<KickstartScript> preScripts = new ArrayList<KickstartScript>(); + List<KickstartScript> postBeforeRedHatScripts = new ArrayList<KickstartScript>(); + List<KickstartScript> postAfterRedHatScripts = new ArrayList<KickstartScript>(); + for (KickstartScript ks : l) { + if (ks.getScriptType().equals(KickstartScript.TYPE_PRE)) { + preScripts.add(ks); + } + else if (ks.getPosition() < 0L) { + postBeforeRedHatScripts.add(ks); + } + else { + postAfterRedHatScripts.add(ks); + } + } StringBuilder buf = new StringBuilder(); buf.append(getHeader()); buf.append(getCommands()); @@ -271,9 +291,18 @@ public class KickstartFormatter { addEnd(buf); } - buf.append(getPrePost(KickstartScript.TYPE_PRE)); + buf.append(renderScripts(preScripts)); buf.append(NEWLINE); - buf.append(getNoChroot()); + + // This script should always be the first post script to run + buf.append("%" + KickstartScript.TYPE_POST + SPACE + NOCHROOT + NEWLINE); + buf.append(RHN_NOCHROOT + NEWLINE); + if (this.ksdata.getKsCfg()) { + buf.append(SAVE_KS_CFG + NEWLINE); + } + addEnd(buf); + + buf.append(renderScripts(postBeforeRedHatScripts)); buf.append(NEWLINE); if (RegistrationType.REACTIVATION.equals(regType)) { @@ -288,7 +317,7 @@ public class KickstartFormatter { buf.append(NEWLINE); buf.append(getRhnPost()); buf.append(NEWLINE); - buf.append(getPrePost(KickstartScript.TYPE_POST)); + buf.append(renderScripts(postAfterRedHatScripts)); buf.append(NEWLINE); buf.append("%" + KickstartScript.TYPE_POST); //new %post for last kernel stuff addCobblerSnippet(buf, "post_install_kernel_options"); @@ -343,7 +372,7 @@ public class KickstartFormatter { LinkedList l = new LinkedList(this.ksdata.getCommands()); Collections.sort(l); for (Iterator itr = l.iterator(); itr.hasNext();) { - KickstartCommand command = (KickstartCommand)itr.next(); + KickstartCommand command = (KickstartCommand) itr.next(); String cname = command.getCommandName().getName(); log.debug("getCommands name: " + cname); @@ -532,8 +561,8 @@ public class KickstartFormatter { */ private String getPackages() { StringBuffer buf = new StringBuffer(); - for (Iterator itr = ksdata.getKsPackages().iterator(); itr.hasNext();) { - buf.append(((KickstartPackage)itr.next()).getPackageName().getName() + NEWLINE); + for (KickstartPackage kp : ksdata.getKsPackages()) { + buf.append(kp.getPackageName().getName() + NEWLINE); } if (KickstartVirtualizationType.paraHost().equals(ksdata.getKickstartDefaults(). getVirtualizationType())) { @@ -550,123 +579,69 @@ public class KickstartFormatter { } /** - * @param typeIn type of script to render (pre or post) + * @param scrupts the kickstart scripts we want to render * @return rendered script(s) */ - private String getPrePost(String typeIn) { + private String renderScripts(List<KickstartScript> scripts) { StringBuilder retval = new StringBuilder(); - if (this.ksdata.getScripts() != null) { - List<KickstartScript> l = - new LinkedList<KickstartScript>(this.ksdata.getScripts()); - Collections.sort(l); - Iterator<KickstartScript> i = l.iterator(); - for (KickstartScript kss : l) { - - // render either pre or chroot posts - if (kss.getScriptType().equals(typeIn)) { - if (typeIn.equals(KickstartScript.TYPE_PRE) || - (typeIn.equals(KickstartScript.TYPE_POST) && - (kss.getChroot().equals("Y")))) { - retval.append(NEWLINE); - if (kss.getRaw()) { - retval.append(RAW_START + NEWLINE); - } - String command = "%" + typeIn; - if (kss.getErrorOnFail()) { - command += SPACE + ERRORONFAIL; - } - if (!StringUtils.isBlank(kss.getInterpreter())) { - command += SPACE + INTERPRETER_OPT + SPACE + - kss.getInterpreter(); - } - retval.append(command); - if (typeIn.equals(KickstartScript.TYPE_POST) && - ksdata.getPostLog()) { - addLogBegin(retval, POST_LOG_FILE + "." + kss.getPosition(), - kss.getInterpreter()); - } - else if (typeIn.equals(KickstartScript.TYPE_PRE) && - ksdata.getPreLog()) { - addLogBegin(retval, PRE_LOG_FILE + "." + kss.getPosition(), - kss.getInterpreter()); - } - else { - retval.append(NEWLINE); - } - retval.append(kss.getDataContents() + NEWLINE); - - if (typeIn.equals(KickstartScript.TYPE_POST) && - ksdata.getPostLog()) { - addLogEnd(retval, POST_LOG_FILE + "." + kss.getPosition(), - kss.getInterpreter()); - } - else if (typeIn.equals(KickstartScript.TYPE_PRE) && - ksdata.getPreLog()) { - addLogEnd(retval, PRE_LOG_FILE + "." + kss.getPosition(), - kss.getInterpreter()); - } - if (kss.getRaw()) { - retval.append(RAW_END + NEWLINE); - } - addEnd(retval); - } - } // end script type and chroot = y + for (KickstartScript kss : scripts) { + boolean isPre = kss.getScriptType().equals(KickstartScript.TYPE_PRE); - } // end iterator - } // end if have scripts - return retval.toString(); - } - - /** - * - * @return string containing nochroot post contents - */ - private String getNoChroot() { - StringBuilder retval = new StringBuilder(); - if (this.ksdata.getScripts() != null) { - retval.append("%" + KickstartScript.TYPE_POST + SPACE + - NOCHROOT + NEWLINE); - retval.append(RHN_NOCHROOT + NEWLINE); - if (this.ksdata.getKsCfg()) { - retval.append(SAVE_KS_CFG + NEWLINE); + retval.append(NEWLINE); + if (kss.getRaw()) { + retval.append(RAW_START + NEWLINE); + } + String command = "%" + kss.getScriptType(); + if (!isPre && !kss.thisScriptIsChroot()) { + command += SPACE + NOCHROOT; + } + if (kss.getErrorOnFail()) { + command += SPACE + ERRORONFAIL; + } + if (!StringUtils.isBlank(kss.getInterpreter())) { + command += SPACE + INTERPRETER_OPT + SPACE + kss.getInterpreter(); + } + retval.append(command); + if (ksdata.getPreLog() && isPre) { + addLogBegin(retval, PRE_LOG_FILE + "." + this.preLogPostfix, + kss.getInterpreter()); + } + else if (ksdata.getPostLog() && !isPre && kss.thisScriptIsChroot()) { + addLogBegin(retval, POST_LOG_FILE + "." + this.postLogPostfix, + kss.getInterpreter()); + } + else if (ksdata.getNonChrootPost() && !isPre && !kss.thisScriptIsChroot()) { + addLogBegin(retval, POST_LOG_NOCHROOT_FILE + "." + this.postLogPostfix, + kss.getInterpreter()); + retval.append(RHN_TRACE); + } + else { + retval.append(NEWLINE); } - addEnd(retval); - for (KickstartScript kss : this.ksdata.getScripts()) { - if (kss.getScriptType().equals(KickstartScript.TYPE_POST) && - kss.getChroot().equals("N")) { - // Put a blank line in between the scripts - retval.append(NEWLINE); - String scriptCommand = "%" + KickstartScript.TYPE_POST + SPACE + - NOCHROOT; - if (kss.getErrorOnFail()) { - scriptCommand += SPACE + ERRORONFAIL; - } - String kssInterpreter = kss.getInterpreter(); - if (!StringUtils.isBlank(kssInterpreter)) { - scriptCommand += SPACE + INTERPRETER_OPT + SPACE + - kssInterpreter; - } - retval.append(scriptCommand); - - if (ksdata.getNonChrootPost()) { - addLogBegin(retval, POST_LOG_NOCHROOT_FILE + "." + - kss.getPosition(), kssInterpreter); - if (isBashInterpreter(kssInterpreter)) { - retval.append(RHN_TRACE); - } - } - retval.append(NEWLINE); - retval.append(kss.getDataContents() + NEWLINE); - if (ksdata.getNonChrootPost()) { - addLogEnd(retval, POST_LOG_NOCHROOT_FILE + "." + kss.getPosition(), - kssInterpreter); - } - addEnd(retval); - } - } // end iterator - } // end if we have scripts to process + retval.append(kss.getDataContents() + NEWLINE); + if (ksdata.getPreLog() && isPre) { + addLogEnd(retval, PRE_LOG_FILE + "." + kss.getPosition(), + kss.getInterpreter()); + this.preLogPostfix += 1; + } + else if (ksdata.getPostLog() && !isPre && kss.thisScriptIsChroot()) { + addLogEnd(retval, POST_LOG_FILE + "." + this.postLogPostfix, + kss.getInterpreter()); + this.postLogPostfix += 1; + } + else if (ksdata.getNonChrootPost() && !isPre && !kss.thisScriptIsChroot()) { + addLogEnd(retval, POST_LOG_NOCHROOT_FILE + "." + this.postLogPostfix, + kss.getInterpreter()); + this.postLogPostfix += 1; + } + + if (kss.getRaw()) { + retval.append(RAW_END + NEWLINE); + } + addEnd(retval); + } // end loop return retval.toString(); } @@ -914,9 +889,9 @@ public class KickstartFormatter { * * @return list of packages we need to up2date */ - private HashSet getUpdatePackages(List<ActivationKey> keys) { + private HashSet<String> getUpdatePackages(List<ActivationKey> keys) { log.debug("getUpdatePackages() .."); - HashSet retval = new HashSet(); + HashSet<String> retval = new HashSet<String>(); Channel c = ksdata.getKickstartDefaults().getKstree().getChannel(); for (ActivationKey key : keys) { if (key.getChannels() != null) { @@ -960,37 +935,35 @@ public class KickstartFormatter { * * @return list of optional packages we need to up2date to the latest nvr */ - private HashSet getFreshPackages(List<ActivationKey> keys) { - - Channel c = ksdata.getKickstartDefaults().getKstree().getChannel(); - for (ActivationKey key : keys) { - for (Channel chan : key.getChannels()) { - if (chan.isBaseChannel()) { - c = chan; - break; - } + private HashSet<String> getFreshPackages(List<ActivationKey> keys) { + Channel c = ksdata.getKickstartDefaults().getKstree().getChannel(); + for (ActivationKey key : keys) { + for (Channel chan : key.getChannels()) { + if (chan.isBaseChannel()) { + c = chan; + break; } } + } - String [] pkglist = {}; - if (ksdata.isRhel2()) { - pkglist = FRESH_PKG_NAMES_RHEL2; - } - else if (ksdata.isRhel3() || ksdata.isRhel4()) { - pkglist = FRESH_PKG_NAMES_RHEL34; - } - HashSet retval = new HashSet(); - for (int i = 0; i < pkglist.length; i++) { - Long packageId = ChannelManager.getLatestPackageEqualInTree(c.getId(), - pkglist[i]); - if (packageId != null) { - Package p = PackageFactory.lookupByIdAndUser(packageId, user); - if (p != null) { - retval.add(getSHA1PackagePath(p)); - } + String[] pkglist = {}; + if (ksdata.isRhel2()) { + pkglist = FRESH_PKG_NAMES_RHEL2; + } + else if (ksdata.isRhel3() || ksdata.isRhel4()) { + pkglist = FRESH_PKG_NAMES_RHEL34; + } + HashSet<String> retval = new HashSet<String>(); + for (String pkg : pkglist) { + Long packageId = ChannelManager.getLatestPackageEqualInTree(c.getId(), pkg); + if (packageId != null) { + Package p = PackageFactory.lookupByIdAndUser(packageId, user); + if (p != null) { + retval.add(getSHA1PackagePath(p)); } } - return retval; + } + return retval; } /** @@ -998,12 +971,11 @@ public class KickstartFormatter { * @param setIn of gpg keys for this kickstart * @return rendered gpg key string for kickstart */ - private String renderGpgKeys(HashSet setIn) { + private String renderGpgKeys(HashSet<CryptoKey> setIn) { StringBuffer retval = new StringBuffer(); int peg = 1; - for (Iterator itr = setIn.iterator(); itr.hasNext();) { + for (CryptoKey myKey : setIn) { retval.append("cat > /tmp/gpg-key-" + peg + " <<'EOF'" + NEWLINE); - CryptoKey myKey = (CryptoKey)itr.next(); retval.append(myKey.getKeyString() + NEWLINE); retval.append("EOF\n# gpg-key" + peg + NEWLINE); if (this.ksdata.isRhel2()) { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java index b35db1a..c7c3d86 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java @@ -17,7 +17,9 @@ package com.redhat.rhn.manager.kickstart; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; +import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartScript; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.user.User; @@ -49,6 +51,7 @@ import java.util.Set; */ public class KickstartLister extends BaseManager { + public static final String FAKE_SCRIPT_LABEL = "kickstart.script.order.fakename"; /** * Logger for this class */ @@ -126,25 +129,55 @@ public class KickstartLister extends BaseManager { * * @param orgIn Org coming in. * @param ksIn Kickstart Id we want to fetch scripts for - * @param pc PageControl * @return the kickstart profiles for <code>orgIn</code> */ - public DataResult scriptsInKickstart(Org orgIn, Long ksIn, PageControl pc) { - + public DataResult<KickstartScript> scriptsInKickstart(Org orgIn, Long ksIn) { SelectMode m = ModeFactory.getMode("General_queries", "scripts_for_kickstart"); - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("kickstart_id", ksIn); params.put("org_id", orgIn.getId()); - Map elabParams = new HashMap(); - DataResult returnDataResult = makeDataResult(params, elabParams, pc, m); + Map<String, String> elabParams = new HashMap<String, String>(); + DataResult<KickstartScript> returnDataResult = makeDataResultNoPagination(params, + elabParams, m); if (logger.isDebugEnabled()) { - logger.debug("scriptsInKickstart(KS, PageControl) - end - return value=" + + logger.debug("scriptsInKickstart(KS) - end - return value=" + returnDataResult); } return returnDataResult; } /** + * List the kickstart scripts for a particular kickstart. + * Inserts a fake result to mark where the Red Hat registration + * and Server Actions will occur. + * + * @param orgIn Org coming in. + * @param ksIn Kickstart Id we want to fetch scripts for + * @return the kickstart profiles for <code>orgIn</code> + */ + public DataResult<KickstartScript> + scriptsInKickstartWithFakeEntry(Org orgIn, Long ksIn) { + DataResult<KickstartScript> scripts = scriptsInKickstart(orgIn, ksIn); + + KickstartScript fakeScript = new KickstartScript(); + fakeScript.setPosition(0L); + fakeScript.setScriptType(KickstartScript.TYPE_POST); + fakeScript.setScriptName(LocalizationService.getInstance().getMessage( + FAKE_SCRIPT_LABEL)); + fakeScript.setInterpreter(LocalizationService.getInstance().getMessage( + "kickstart.script.order.fakeinterpreter")); + fakeScript.setEditable(false); + fakeScript.setChroot("y"); + + if (scripts.size() != 0) { + scripts.add(fakeScript); + Collections.sort(scripts); + } + + return scripts; + } + + /** * List the kickstart ip ranges in the Org. * Returns the list of Maps with x fields: , , . * diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp index aeb3852..3862b8f 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <head> -<script src="/javascript/config_channel_ranks.js" type="text/javascript"></script> +<script src="/javascript/rank_options.js" type="text/javascript"></script> </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> @@ -42,7 +42,7 @@ <html:hidden property="dispatch" value="${rhn:localize('sdc.config.rank.jsp.update')}"/> <input type=submit name="dispatcher" value="${rhn:localize('sdc.config.rank.jsp.update')}" - onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> + onclick="handle_ranking_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> </div> </html:form> </body> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf index cb5567b..7955f67 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf @@ -16,15 +16,15 @@ altKey="ssm.config.rank.jsp.up" property="dispatch" value="up" - onclick="return config_channel_up('ranksWidget');" + onclick="return move_selected_up('ranksWidget');" styleClass="button"/> - <td></tr> + </td></tr> <tr> <td><html:image src="/img/button-down.gif" altKey="ssm.config.rank.jsp.down" property="dispatch" value="down" - onclick="return config_channel_down('ranksWidget');" + onclick="return move_selected_down('ranksWidget');" styleClass="button"/> </td></tr> </table> @@ -33,4 +33,4 @@ <html:hidden name="channelRanksForm" property="rankedValues" styleId="rankedValues"/> <rhn:noscript/> -</td> \ No newline at end of file +</td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp index eed8245..031a4b0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp @@ -6,7 +6,7 @@ <html:xhtml/> <html> <head> -<script src="/javascript/config_channel_ranks.js" type="text/javascript"></script> +<script src="/javascript/rank_options.js" type="text/javascript"></script> </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> @@ -42,7 +42,7 @@ <html:hidden property="dispatch" value="${rhn:localize('sdc.config.rank.jsp.update')}"/> <input type=submit name="dispatcher" value="${rhn:localize('sdc.config.rank.jsp.update')}" - onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> + onclick="handle_ranking_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> </div> </html:form> </body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 324f7a4..afe2550 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -7,7 +7,7 @@ <html> <head> <script src="/javascript/prototype.js" type="text/javascript"> </script> -<script src="/javascript/config_channel_ranks.js" type="text/javascript"> </script> +<script src="/javascript/rank_options.js" type="text/javascript"> </script> </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> @@ -57,7 +57,7 @@ <html:hidden property="dispatch" value="${rhn:localize('ssm.config.rank.jsp.apply')}"/> <input type=submit name="dispatcher" value="${rhn:localize('ssm.config.rank.jsp.apply')}" - onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> + onclick="handle_ranking_dispatch('ranksWidget','rankedValues','channelRanksForm');"/> </div> </html:form> </body> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp index 8e588c6..83decbd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp @@ -2,6 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <head> <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> @@ -10,18 +11,17 @@ <html:xhtml/> <html> <body> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> - +<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" + deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}" + deletionType="kickstartscript" > + <bean:message key="kickstartdetails.jsp.header1" arg0="${fn:escapeXml(ksdata.label)}"/> +</rhn:toolbar> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <p> -<rhn:toolbar base="h2" img="/img/rhn-kickstart_profile.gif" - deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}" - deletionType="kickstartscript" > -<bean:message key="kickstart.script.header1"/> -</rhn:toolbar> +<h2><bean:message key="kickstart.script.header1"/></h2> <div> <p> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp new file mode 100644 index 0000000..907380a --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp @@ -0,0 +1,139 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> +<html:xhtml/> +<html> +<head> +<script src="/javascript/rank_options.js" type="text/javascript"></script> +</head> +<body> +<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> + + + +<rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + +<h2><bean:message key="kickstartscript.order.header"/></h2> + +<div> + <p> + <bean:message key="kickstartscript.order.summary"/> + </p> + + <html:form method="post" action="/kickstart/KickstartScriptOrder.do"> + <rhn:csrf /> + <rhn:submitted /> + + <noscript> + <p><bean:message key="kickstartscript.order.noscript"/></p> + </noscript> + <table style="width:100%;"> + <tr> + <td colspan="2"> + <h2><bean:message key="kickstartscript.order.prescripts"/></h2> + </td> + <td colspan="2"> + <h2><bean:message key="kickstartscript.order.postscripts"/></h2> + </td> + </tr> + <tr> + <td style="width:40%;"> + <c:if test="${empty kickstartScriptOrderForm.map.preScripts}"> + <html:select name="kickstartScriptOrderForm" + property="selectedPre" + disabled="true" + size="15" styleId="preRanksWidget" style="width:100%;"> + <html:optionsCollection name="kickstartScriptOrderForm" + property="preScripts"/> + </html:select> + </c:if> + <c:if test="${not empty kickstartScriptOrderForm.map.preScripts}"> + <html:select name="kickstartScriptOrderForm" + property="selectedPre" + size="15" styleId="preRanksWidget" style="width:100%;"> + <html:optionsCollection name="kickstartScriptOrderForm" + property="preScripts"/> + </html:select> + </c:if> + </td> + <td valign="top"> + <table> + <tr> + <td><html:image src="/img/button-up.gif" + altKey="ssm.config.rank.jsp.up" + property="dispatch" + value="up" + onclick="return move_selected_up('preRanksWidget');" + styleClass="button"/> + </td></tr> + <tr> + <td><html:image src="/img/button-down.gif" + altKey="ssm.config.rank.jsp.down" + property="dispatch" + value="down" + onclick="return move_selected_down('preRanksWidget');" + styleClass="button"/> + </td></tr> + </table> + <rhn:noscript/> + </td> + <td style="width:40%;"> + <c:if test="${empty kickstartScriptOrderForm.map.postScripts}"> + <html:select name ="kickstartScriptOrderForm" + property="selectedPost" + disabled="true" + size="15" styleId="postRanksWidget" style="width:100%;"> + <html:optionsCollection name="kickstartScriptOrderForm" + property="postScripts"/> + </html:select> + </c:if> + <c:if test="${not empty kickstartScriptOrderForm.map.postScripts}"> + <html:select name ="kickstartScriptOrderForm" + property="selectedPost" + size="15" styleId="postRanksWidget" style="width:100%;"> + <html:optionsCollection name="kickstartScriptOrderForm" + property="postScripts"/> + </html:select> + </c:if> + </td> + <td valign="top"> + <table> + <tr> + <td><html:image src="/img/button-up.gif" + altKey="ssm.config.rank.jsp.up" + property="dispatch" + value="up" + onclick="return move_selected_up('postRanksWidget');" + styleClass="button"/> + </td></tr> + <tr> + <td><html:image src="/img/button-down.gif" + altKey="ssm.config.rank.jsp.down" + property="dispatch" + value="down" + onclick="return move_selected_down('postRanksWidget');" + styleClass="button"/> + </td></tr> + </table> + <rhn:noscript/> + </td> + </tr> + </table> + <html:hidden property="ksid" value="${ksdata.id}"/> + <html:hidden property="submitted" value="true"/> + <html:hidden property="dispatch" value="${rhn:localize('kickstartscript.order.update')}"/> + <html:hidden name="kickstartScriptOrderForm" property="rankedPreValues" styleId="rankedPreValues"/> + <html:hidden name="kickstartScriptOrderForm" property="rankedPostValues" styleId="rankedPostValues"/> + <div align="right"> + <input type="submit" name="dispatcher" + value="${rhn:localize('kickstartscript.order.update')}" + onclick="handle_ranking('preRanksWidget','rankedPreValues','kickstartScriptOrderForm'); handle_ranking_dispatch('postRanksWidget','rankedPostValues','kickstartScriptOrderForm');"/> + </div> + </html:form> +</div> +</body> +</html> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 8be640b..44537f0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -3,15 +3,30 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <html:html xhtml="true"> <body> -<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" +<c:if test="${! empty kickstart_scripts}"> + <rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" creationType="kickstartscript" + miscUrl="/rhn/kickstart/KickstartScriptOrder.do?ksid=${ksdata.id}" + miscText="toolbar.misc.kickstartscript" + miscImg="action-order.gif" + miscAlt="toolbar.misc.kickstartscriptalt" imgAlt="kickstarts.alt.img"> - <bean:message key="kickstartdetails.jsp.header1" arg0="${fn:escapeXml(ksdata.label)}"/> -</rhn:toolbar> + <bean:message key="kickstartdetails.jsp.header1" arg0="${fn:escapeXml(ksdata.label)}"/> + </rhn:toolbar> +</c:if> +<c:if test="${empty kickstart_scripts}"> + <rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" + creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" + creationType="kickstartscript" + imgAlt="kickstarts.alt.img"> + <bean:message key="kickstartdetails.jsp.header1" arg0="${fn:escapeXml(ksdata.label)}"/> + </rhn:toolbar> +</c:if> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" @@ -26,31 +41,39 @@ <p> <bean:message key="kickstartscript.jsp.summary2"/> </p> - <form method="post" name="rhn_list" action="/rhn/kickstart/Scripts.do"> - <rhn:csrf /> - <rhn:submitted /> - - <rhn:list pageList="${requestScope.pageList}" noDataText="kickstartscript.jsp.noscripts"> - - <rhn:listdisplay renderDisabled="true" - set="${requestScope.set}"> - - <rhn:column header="kickstartscript.jsp.type" style="text-align: center;"> - ${current.scriptType} - </rhn:column> - <rhn:column header="kickstartscript.jsp.scriptnum"> - <a href="/rhn/kickstart/KickstartScriptEdit.do?kssid=${current.id}&ksid=${ksdata.id}"><bean:message key="kickstartscript.jsp.script"/> ${current.position}</a> - </rhn:column> - <rhn:column header="kickstartscript.jsp.scriptname"> - <a href="/rhn/kickstart/KickstartScriptEdit.do?kssid=${current.id}&ksid=${ksdata.id}">${current.scriptName}</a> - </rhn:column> - <rhn:column header="kickstartscript.jsp.language"> - ${current.interpreter} - </rhn:column> - - </rhn:listdisplay> - </rhn:list> - </form> + + <rl:listset name="kickstartScriptsSet"> + <rhn:csrf /> + <rl:list dataset="kickstart_scripts" + width="100%" + name="kickstartPreScripts" + styleclass="list" + emptykey="kickstartscript.jsp.noscripts"> + + <rl:column bound="false" + sortable="false" + headerkey="kickstartscript.jsp.type"> + ${current.prettyScriptType} + </rl:column> + + <rl:column bound="false" + sortable="false" + headerkey="kickstartscript.jsp.scriptname"> + <c:if test="${current.editable}"> + <a href="/rhn/kickstart/KickstartScriptEdit.do?kssid=${current.id}&ksid=${ksdata.id}">${current.scriptName}</a> + </c:if> + <c:if test="${not current.editable}"> + ${current.scriptName} + </c:if> + </rl:column> + + <rl:column bound="false" + sortable="false" + headerkey="kickstartscript.jsp.language"> + ${current.prettyInterpreter} + </rl:column> + </rl:list> + </rl:listset> </div> </body> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 96489bc..f8a68b3 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -720,6 +720,18 @@ <form-property name="submitted" type="java.lang.Boolean"/> <form-property name="no_scrub" type="java.lang.String" initial="contents"/> </form-bean> + + + <form-bean name="kickstartScriptOrderForm" + type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm"> + <form-property name="preScripts" type="java.util.ArrayList"/> + <form-property name="postScripts" type="java.util.ArrayList"/> + <form-property name="selectedPre" type="java.lang.String"/> + <form-property name="selectedPost" type="java.lang.String"/> + <form-property name="submitted" type="java.lang.Boolean" /> + <form-property name="rankedPreValues" type="java.lang.String"/> + <form-property name="rankedPostValues" type="java.lang.String"/> + </form-bean> <form-bean name="kickstartPackages" type="org.apache.struts.action.DynaActionForm"> @@ -6020,6 +6032,17 @@ path="/WEB-INF/pages/kickstart/scripts.jsp"/> </action> + <action path="/kickstart/Scripts" + scope="request" + input="/WEB-INF/pages/kickstart/scripts.jsp" + type="com.redhat.rhn.frontend.action.kickstart.ScriptsSetupAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="postRequiredIfSubmitted" value="true" /> + <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/scripts.jsp"/> + </action> + <action path="/kickstart/KickstartIpRanges" scope="request" input="/WEB-INF/pages/kickstart/kickstartranges.jsp" @@ -6743,6 +6766,21 @@ path="/kickstart/Scripts.do"/> </action> + <action path="/kickstart/KickstartScriptOrder" + scope="request" + name="kickstartScriptOrderForm" + input="/WEB-INF/pages/kickstart/scriptorder.jsp" + type="com.redhat.rhn.frontend.action.kickstart.KickstartScriptOrderAction" + parameter="dispatch" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="postRequiredIfSubmitted" value="true" /> + <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/scriptorder.jsp"/> + <forward name="success" + redirect="true" path="/kickstart/Scripts.do"/> + </action> + <action path="/kickstart/KickstartClone" scope="request" name="kickstartCloneForm" diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/021-rhnKickstartScript.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/021-rhnKickstartScript.sql new file mode 100644 index 0000000..290f8e8 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/021-rhnKickstartScript.sql @@ -0,0 +1 @@ +update rhnkickstartscript set position = position * -1 where script_type = 'post' and chroot = 'N'; diff --git a/web/html/javascript/config_channel_ranks.js b/web/html/javascript/config_channel_ranks.js deleted file mode 100644 index 2751f12..0000000 --- a/web/html/javascript/config_channel_ranks.js +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright (c) 2008--2012 Red Hat, Inc. - * All Rights Reserved. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - * - */ - -/** -This file contains java script code related to ConfigChannel Rankings page. -Basically functions to handle things like the up and down buttons. -Note this file uses a couple of functions from 'Prototype' library -to asynchronously post to the channel rankings update page. -*/ - -function config_channel_up(rankingWidgetName) { - return config_channel_move(rankingWidgetName, true); -} -function config_channel_down(rankingWidgetName) { - return config_channel_move(rankingWidgetName, false); -} - - -/** -This function gets called when the 'up'/'down' button/arrow/image is pressed. -Behaviour, moves the selected Item in the rankingWidget up/down by one step -depending on the boolean value moveUp. -Also calls the update Url action asynchronously if provided(who does things like -saving to a set etc..).. -@param rankingWidgetName the name of the ranking widget list box. -@param updateUrl the url that will be called asynchronously, if some set - has to be updated as a result of this action. Pass - null if no such actions are required... -@param moveUp the direction in which the selected item must be moved - (up if true, down if false). -*/ -function config_channel_move(rankingWidgetName, moveUp) { - - var element = document.getElementById(rankingWidgetName); - var index = element.selectedIndex; - if (index > -1) { - var selected = element.options[index]; - if ((moveUp && index > 0) || - (!moveUp && index < element.options.length - 1)) { - moveToIndex = index - 1; - if (!moveUp) { - moveToIndex = index + 1; - } - - element.options[index] = new Option(element.options[moveToIndex].text, - element.options[moveToIndex].value, false, false); - element.options[moveToIndex] = selected; - } - } - // return false so that a form submit doesnot happen - return false; -} - -/** -This function gets called when a form submit / 'update subscriptions' action is clicked. -Behaviour: -1) Basically joins the values of the rankingWidgetElements into a comma separated string, -2) Stores the value in the element provided by 'storerName' -3) Does a form submit.. -This comma separated magic is required for handling cases where the browser -supports javascript but does not support ajax.. -@param rankingWidgetName the name of the ranking widget list box. -@param storerName name of the element in whom the CS string will be stored - ('rankedValues' in the case of SDC channel rankings) -@param formName name of the form who has to be submitted. -*/ -function handle_config_channels_dispatch (rankingWidgetName, storerName, formName) { - element = document.getElementById(rankingWidgetName); - storer = document.getElementById(storerName); - form = document.getElementById(formName); - storer.value = make_config_channels_csv(rankingWidgetName); - form.submit(); - return true; -} - -/** -This function binds the values of each element of a list box ('listBox') in a comma separated string. -@param listBoxName the name of the list box element who's transform is desired -@return a comma separated list of list elements... -*/ -function make_config_channels_csv(listBoxName) { - var values = new Array(); - var listBox = document.getElementById(listBoxName); - for (var i = 0; i < listBox.options.length; i++) { - values.push(listBox.options[i].value); - } - return values.join(','); -} diff --git a/web/html/javascript/rank_options.js b/web/html/javascript/rank_options.js new file mode 100644 index 0000000..1be071d --- /dev/null +++ b/web/html/javascript/rank_options.js @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2008--2013 Red Hat, Inc. + * All Rights Reserved. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + * + */ + +/** +This file contains java script code related to ConfigChannel Rankings and Kickstart Scripts Ordering pages. +Basically functions to handle things like the up and down buttons. +Note this file uses a couple of functions from 'Prototype' library +to asynchronously post to the channel rankings update page. +*/ + +function move_selected_up(rankingWidgetName) { + return move_selected(rankingWidgetName, true); +} +function move_selected_down(rankingWidgetName) { + return move_selected(rankingWidgetName, false); +} + + +/** +This function gets called when the 'up'/'down' button/arrow/image is pressed. +Behaviour, moves the selected Item in the rankingWidget up/down by one step +depending on the boolean value moveUp. +Also calls the update Url action asynchronously if provided(who does things like +saving to a set etc..).. +@param rankingWidgetName the name of the ranking widget list box. +@param updateUrl the url that will be called asynchronously, if some set + has to be updated as a result of this action. Pass + null if no such actions are required... +@param moveUp the direction in which the selected item must be moved + (up if true, down if false). +*/ +function move_selected(rankingWidgetName, moveUp) { + + var element = document.getElementById(rankingWidgetName); + var index = element.selectedIndex; + if (index > -1) { + var selected = element.options[index]; + if ((moveUp && index > 0) || + (!moveUp && index < element.options.length - 1)) { + moveToIndex = index - 1; + if (!moveUp) { + moveToIndex = index + 1; + } + + element.options[index] = new Option(element.options[moveToIndex].text, + element.options[moveToIndex].value, false, false); + element.options[moveToIndex] = selected; + } + } + // return false so that a form submit doesnot happen + return false; +} + +/** +This function should get called when a form submit action is clicked. +Behaviour: +1) Basically joins the values of the rankingWidgetElements into a comma separated string, +2) Stores the value in the element provided by 'storerName' +3) Does a form submit.. +This comma separated magic is required for handling cases where the browser +supports javascript but does not support ajax.. +@param rankingWidgetName the name of the ranking widget list box. +@param storerName name of the element in whom the CS string will be stored + ('rankedValues' in the case of SDC channel rankings) +@param formName name of the form who has to be submitted. +*/ +function handle_ranking_dispatch (rankingWidgetName, storerName, formName) { + element = document.getElementById(rankingWidgetName); + storer = document.getElementById(storerName); + form = document.getElementById(formName); + storer.value = make_ranking_csv(rankingWidgetName); + form.submit(); + return true; +} + +/** + * This function does the same thing that handle_ranking_dispatch does, + * but without submitting the form. This is necessary so that you can submit + * a form with more than one rankingWidget in it. The last rakingWidget should + * call handle_config_channels_dispatch to submit the form. + * @param rankingWidgetName the name of the ranking widget list box. + * @param storerName name of the element in whom the CS string will be stored + * ('rankedValues' in the case of SDC channel rankings) + * @param formName name of the form who has to be submitted. + */ +function handle_ranking (rankingWidgetName, storerName, formName) { + element = document.getElementById(rankingWidgetName); + storer = document.getElementById(storerName); + form = document.getElementById(formName); + storer.value = make_ranking_csv(rankingWidgetName); + return false; +} + +/** +This function binds the values of each element of a list box ('listBox') in a comma separated string. +@param listBoxName the name of the list box element who's transform is desired +@return a comma separated list of list elements... +*/ +function make_ranking_csv(listBoxName) { + var values = new Array(); + var listBox = document.getElementById(listBoxName); + for (var i = 0; i < listBox.options.length; i++) { + values.push(listBox.options[i].value); + } + return values.join(','); +}

1 0

Changes to 'refs/tags/spacewalk-java-2.1.55-1'
by Tomas Lestach 17 Oct '13

17 Oct '13

Tag 'spacewalk-java-2.1.55-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-10-17 14:38 +0000 Tagging package [spacewalk-java] version [2.1.55-1] in directory [java/]. Changes since yum-rhn-plugin-2.1.5-1: Tomas Lestach (2): 676828 - distinguish bash interpreter in ks non-chroot post scripts Automatic commit of package [spacewalk-java] release [2.1.55-1]. --- java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 13 ++++++---- java/spacewalk-java.spec | 5 +++ rel-eng/packages/spacewalk-java | 2 - 3 files changed, 13 insertions(+), 7 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 17 Oct '13

17 Oct '13

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 25e73af79c8ae9185dc457a8770a65967f491925 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 17 16:38:59 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.55-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 50b289d..e2ea77f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.54 +Version: 2.1.55 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 17 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.55-1 +- 676828 - distinguish bash interpreter in ks non-chroot post scripts + * Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.54-1 - cleaning up old svn Ids diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index ece6882..04e4857 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.54-1 java/ +2.1.55-1 java/

1 0

java/code
by Tomas Lestach 17 Oct '13

17 Oct '13

java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 13 ++++++---- 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit 1224181878b7966cb659727b41019f36c2d03f98 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Oct 17 14:30:07 2013 +0200 676828 - distinguish bash interpreter in ks non-chroot post scripts when logging non-chroot post script actions diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 99b6142..4e53948 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -641,22 +641,25 @@ public class KickstartFormatter { if (kss.getErrorOnFail()) { scriptCommand += SPACE + ERRORONFAIL; } - if (!StringUtils.isBlank(kss.getInterpreter())) { + String kssInterpreter = kss.getInterpreter(); + if (!StringUtils.isBlank(kssInterpreter)) { scriptCommand += SPACE + INTERPRETER_OPT + SPACE + - kss.getInterpreter(); + kssInterpreter; } retval.append(scriptCommand); if (ksdata.getNonChrootPost()) { addLogBegin(retval, POST_LOG_NOCHROOT_FILE + "." + - kss.getPosition(), kss.getInterpreter()); - retval.append(RHN_TRACE); + kss.getPosition(), kssInterpreter); + if (isBashInterpreter(kssInterpreter)) { + retval.append(RHN_TRACE); + } } retval.append(NEWLINE); retval.append(kss.getDataContents() + NEWLINE); if (ksdata.getNonChrootPost()) { addLogEnd(retval, POST_LOG_NOCHROOT_FILE + "." + kss.getPosition(), - kss.getInterpreter()); + kssInterpreter); } addEnd(retval); }

1 0

Changes to 'refs/tags/yum-rhn-plugin-2.1.5-1'
by Michael Mraka 17 Oct '13

17 Oct '13

Tag 'yum-rhn-plugin-2.1.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-17 07:11 +0000 Tagging package [yum-rhn-plugin] version [2.1.5-1] in directory [client/rhel/yum-rhn-plugin/]. Changes since spacewalk-oscap-0.0.22-1: Michael Mraka (2): 1018929 - removed redundant exception Automatic commit of package [yum-rhn-plugin] release [2.1.5-1]. --- client/rhel/yum-rhn-plugin/rhnplugin.py | 4 +--- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++- rel-eng/packages/yum-rhn-plugin | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---

1 0

2 commits - client/rhel rel-eng/packages
by Michael Mraka 17 Oct '13

17 Oct '13

client/rhel/yum-rhn-plugin/rhnplugin.py | 4 +--- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++- rel-eng/packages/yum-rhn-plugin | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 112d40c860aaddc8456ea4729626a554f0f02c83 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 17 09:11:15 2013 +0200 Automatic commit of package [yum-rhn-plugin] release [2.1.5-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index e1c5ac7..276a22e 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,6 +1,6 @@ Summary: Spacewalk support for yum Name: yum-rhn-plugin -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -70,6 +70,9 @@ fi %doc LICENSE %changelog +* Thu Oct 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.5-1 +- 1018929 - removed redundant exception + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1 - removed trailing whitespaces diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index f880dba..99f4126 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -2.1.4-1 client/rhel/yum-rhn-plugin/ +2.1.5-1 client/rhel/yum-rhn-plugin/ commit 60cf0271cc8a32b709b6f66161938fa03bede4d4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 16 09:41:23 2013 +0200 1018929 - removed redundant exception both sections just re-raise exception as RepoError diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index 05230ba..3f70d50 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -361,9 +361,7 @@ class RhnRepo(YumRepository): try: li = up2dateAuth.getLoginInfo(timeout=self.timeout) - except up2dateErrors.RhnServerException, e: - raise yum.Errors.RepoError(unicode(e)), None, sys.exc_info()[2] - except e: + except Exception, e: raise yum.Errors.RepoError(unicode(e)), None, sys.exc_info()[2] # TODO: do evalution on li auth times to see if we need to obtain a

1 0

Changes to 'refs/tags/spacewalk-oscap-0.0.22-1'
by Šimon Lukašík 15 Oct '13

15 Oct '13

Tag 'spacewalk-oscap-0.0.22-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-10-15 15:27 +0000 Tagging package [spacewalk-oscap] version [0.0.22-1] in directory [client/rhel/spacewalk-oscap/]. Changes since spacewalk-backend-2.1.28-1: Simon Lukasik (2): Improve logged error message. Automatic commit of package [spacewalk-oscap] release [0.0.22-1]. --- client/rhel/spacewalk-oscap/scap.py | 2 +- client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Šimon Lukašík 15 Oct '13

15 Oct '13

client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 7ec11c4a5e77c6bf9f763553282bb30be9995dfc Author: Simon Lukasik <slukasik(a)redhat.com> Date: Tue Oct 15 17:27:59 2013 +0200 Automatic commit of package [spacewalk-oscap] release [0.0.22-1]. diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec index 64f6e73..cb05f0c 100644 --- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec +++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec @@ -1,5 +1,5 @@ Name: spacewalk-oscap -Version: 0.0.21 +Version: 0.0.22 Release: 1%{?dist} Summary: OpenSCAP plug-in for rhn-check @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 15 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.22-1 +- Improve logged error message. + * Fri Oct 11 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.21-1 - 1009512 - redirect stdout of xsltproc to /dev/null diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap index a92e643..cbaa7ed 100644 --- a/rel-eng/packages/spacewalk-oscap +++ b/rel-eng/packages/spacewalk-oscap @@ -1 +1 @@ -0.0.21-1 client/rhel/spacewalk-oscap/ +0.0.22-1 client/rhel/spacewalk-oscap/

1 0

client/rhel
by Šimon Lukašík 15 Oct '13

15 Oct '13

client/rhel/spacewalk-oscap/scap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b68d2d5e505d39d4089b019aa014c095b96b268 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Tue Oct 15 17:07:43 2013 +0200 Improve logged error message. Related: f6d747158f07af9fb5006b1cccd52f9e9c11badb Addressing ugly message as (not the cause): D: Excluding "%s" file from upload. Not an XML./tmp/tmpL8_Ei4/xccdf-report.html diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py index f2c50e5..6ccea9a 100644 --- a/client/rhel/spacewalk-oscap/scap.py +++ b/client/rhel/spacewalk-oscap/scap.py @@ -143,7 +143,7 @@ def _upload_results(xccdf_result, results_dir, args): def _upload_file(server, systemid, args, path, filename, f): if filename != 'xccdf-report.html' and not _assert_xml(f): - log.log_debug('Excluding "%s" file from upload. Not an XML.', path) + log.log_debug('Excluding "%s" file from upload. Not an XML.' % path) return '\nxccdf_eval: File "%s" not uploaded. Not an XML file format.' % filename stat = os.fstat(f.fileno())

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.28-1'
by Michael Mraka 15 Oct '13

15 Oct '13

Tag 'spacewalk-backend-2.1.28-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-15 12:32 +0000 Tagging package [spacewalk-backend] version [2.1.28-1] in directory [backend/]. Changes since spacewalk-web-2.1.25-1: Flavio Castelli (1): python pgsql tests: made easier Jenkins integration Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [2.1.28-1]. --- backend/spacewalk-backend.spec | 5 ++ backend/test/non-unit/server/rhnSQL/dbtests.py | 45 ------------------------- backend/test/runtests-postgresql.py | 42 +++++++++++++++++++++-- rel-eng/packages/spacewalk-backend | 2 - 4 files changed, 44 insertions(+), 50 deletions(-) ---

1 0

2 commits - backend/spacewalk-backend.spec backend/test rel-eng/packages
by Michael Mraka 15 Oct '13

15 Oct '13

backend/spacewalk-backend.spec | 5 ++ backend/test/non-unit/server/rhnSQL/dbtests.py | 45 ------------------------- backend/test/runtests-postgresql.py | 42 +++++++++++++++++++++-- rel-eng/packages/spacewalk-backend | 2 - 4 files changed, 44 insertions(+), 50 deletions(-) New commits: commit ffb62fc9eb96ae75342c7872d1a2267644b214c8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 15 14:32:49 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.28-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 1562ee7..a4bbd9a 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.27 +Version: 2.1.28 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -627,6 +627,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Tue Oct 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.28-1 +- python pgsql tests: made easier Jenkins integration + * Wed Oct 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1 - cleaning up old svn Ids diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 18193f9..37e8bc2 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.27-1 backend/ +2.1.28-1 backend/ commit 9a4621630b54aea3c2822a65a50784363f9f4f9d Author: Flavio Castelli <fcastelli(a)suse.com> Date: Tue Oct 15 14:17:12 2013 +0200 python pgsql tests: made easier Jenkins integration Made easier to run the pgsql tests using nosetests in conjunction with the 'with-xunit'. Invoking: nosetests --with-xunit --xunit-file pgsql_tests.xml runtests-postgresql.py will produce an xml file which can be parsed by Jenkins. Invoking the script in the old way still works as expected. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index ff51148..0fa703a 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -201,44 +201,6 @@ class RhnSQLDatabaseTests(unittest.TestCase): -class PostgreSQLDatabaseTests(RhnSQLDatabaseTests): - QUERY_CREATE_TABLE = """ - CREATE TABLE %s(id INT, name TEXT, num NUMERIC(5,2)) - """ - - SIMPLE_PROCEDURE = """ -CREATE OR REPLACE FUNCTION return_int(returnme INTEGER) RETURNS int AS $$ -DECLARE - myInt int; -BEGIN - myInt := returnme; - RETURN myInt; -END -$$ LANGUAGE 'plpgsql'; - """ - - def setUp(self): - self.set_temp_table() - create_table_query = self.QUERY_CREATE_TABLE % self.temp_table - cursor = rhnSQL.prepare(create_table_query) - cursor.execute() - - RhnSQLDatabaseTests.setUp(self) - - cursor = rhnSQL.prepare(self.SIMPLE_PROCEDURE) - cursor.execute() - - def tearDown(self): - try: - cursor = rhnSQL.prepare("DROP FUNCTION return_int(returnme integer)") - cursor.execute() - except: - pass - - RhnSQLDatabaseTests.tearDown(self) - - - class OracleDatabaseTests(RhnSQLDatabaseTests): QUERY_CREATE_TABLE = """ CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2)) @@ -270,13 +232,6 @@ END; RhnSQLDatabaseTests.tearDown(self) - - -def postgresql_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(PostgreSQLDatabaseTests)) - return suite - def oracle_suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(OracleDatabaseTests)) diff --git a/backend/test/runtests-postgresql.py b/backend/test/runtests-postgresql.py index 0a10ec7..f647331 100755 --- a/backend/test/runtests-postgresql.py +++ b/backend/test/runtests-postgresql.py @@ -48,11 +48,47 @@ rhnSQL.initDB(backend="postgresql", host=PG_HOST, username=PG_USER, rhnSQL.initDB(backend="postgresql", host=PG_HOST, username=PG_USER, password=PG_PASSWORD, database=PG_DATABASE) +class PostgreSQLDatabaseTests(dbtests.RhnSQLDatabaseTests): + QUERY_CREATE_TABLE = """ + CREATE TABLE %s(id INT, name TEXT, num NUMERIC(5,2)) + """ + + SIMPLE_PROCEDURE = """ +CREATE OR REPLACE FUNCTION return_int(returnme INTEGER) RETURNS int AS $$ +DECLARE + myInt int; +BEGIN + myInt := returnme; + RETURN myInt; +END +$$ LANGUAGE 'plpgsql'; + """ + + def setUp(self): + self.set_temp_table() + create_table_query = self.QUERY_CREATE_TABLE % self.temp_table + cursor = rhnSQL.prepare(create_table_query) + cursor.execute() + + dbtests.RhnSQLDatabaseTests.setUp(self) + + cursor = rhnSQL.prepare(self.SIMPLE_PROCEDURE) + cursor.execute() + + def tearDown(self): + try: + cursor = rhnSQL.prepare("DROP FUNCTION return_int(returnme integer)") + cursor.execute() + except: + pass + + dbtests.RhnSQLDatabaseTests.tearDown(self) + def suite(): + s = unittest.TestSuite() + s.addTest(unittest.makeSuite(PostgreSQLDatabaseTests)) # Append all test suites here: - return unittest.TestSuite(( - dbtests.postgresql_suite(), - )) + return unittest.TestSuite(s) if __name__ == "__main__": try:

1 0

Changes to 'refs/tags/spacewalk-web-2.1.25-1'
by Michael Mraka 15 Oct '13

15 Oct '13

Tag 'spacewalk-web-2.1.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-15 12:11 +0000 Tagging package [spacewalk-web] version [2.1.25-1] in directory [web/]. Changes since spacewalk-koan-2.1.3-1: Michael Mraka (2): 1018194 - convert empty string to NULL Automatic commit of package [spacewalk-web] release [2.1.25-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/modules/rhn/RHN/DB/User.pm | 5 +++-- web/spacewalk-web.spec | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka 15 Oct '13

15 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/modules/rhn/RHN/DB/User.pm | 5 +++-- web/spacewalk-web.spec | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 4a66496a0f3aaf79af1aceee1404bbbc2d32d37a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 15 14:11:32 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.25-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 607a390..c875299 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.24-1 web/ +2.1.25-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index cf986d8..ca32265 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.24 +Version: 2.1.25 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -271,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Tue Oct 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1 +- 1018194 - convert empty string to NULL + * Wed Oct 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.24-1 - cleaning up old svn Ids commit 31417d7596d416002ddd97b8b4ccb65b2f2b0df4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 15 14:06:39 2013 +0200 1018194 - convert empty string to NULL diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm index bb97097..16870fc 100644 --- a/web/modules/rhn/RHN/DB/User.pm +++ b/web/modules/rhn/RHN/DB/User.pm @@ -1038,8 +1038,9 @@ sub verify_channel_role { my $sth = $dbh->prepare(<<EOQ); select rhn_channel.user_role_check(:cid, :user_id, :role) from dual EOQ - - my $result = $sth->execute_h(cid => $channel_id, + # channel_id is always > 0 because rhn_channel_id_seq starts at 101 + # so next ternary operator is safe way to turn '' to NULL + my $result = $sth->execute_h(cid => ($channel_id ? $channel_id : undef), user_id => $self->id, role => $role, );

1 0

Branch 'bootstrap-css' - 23 commits - branding/css java/code web/html
by Silvio Moioli 15 Oct '13

15 Oct '13

branding/css/spacewalk.less | 30 java/code/src/com/redhat/rhn/frontend/html/BaseTag.java | 19 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 299 ++++----- java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java | 24 java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 7 java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 51 - java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 332 +++++----- java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 69 +- java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java | 18 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 5 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java | 12 java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java | 4 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 5 java/code/webapp/WEB-INF/includes/footer.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 46 - java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp | 1 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 1 web/html/javascript/bootstrap.js | 6 web/html/javascript/jquery.js | 6 web/html/javascript/render.js | 10 web/html/javascript/spacewalk-essentials.js | 50 + 23 files changed, 548 insertions(+), 455 deletions(-) New commits: commit 5b3e0cdb65484bbc525feebe7d3ca03b52a68362 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 11:50:53 2013 +0200 This is loaded in the footer, loading it once should be enough diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index ce894e2..272e535 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -38,5 +38,4 @@ <script src="/rhn/dwr/interface/DWRItemSelector.js"></script> <script src="/javascript/bootstrap.js"></script> - <script src="/javascript/check_all.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> commit 83b11e6221a56c6d0c176bb4e4c7e0334eee70af Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 11:35:57 2013 +0200 Move content of render.js into spacewalk-essentials.js makeAjaxCallback() now depends on columnHeight(), so it would make sense to put them in the same file. Makes the render.js file obsolete as well. diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp index bbd179d..ca0377e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp @@ -8,7 +8,6 @@ <head> <script type="text/javascript" src="/rhn/dwr/interface/ImagesRenderer.js"></script> <script type="text/javascript" src="/rhn/dwr/engine.js"></script> - <script type="text/javascript" src="/javascript/render.js"></script> <script type="text/javascript" src="/javascript/images.js"></script> </head> <body> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index aaa5557..2a689cb 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -32,7 +32,6 @@ <c:if test="${requestScope.systemGroupsWidget == 'y'}"> <script type="text/javascript" src="/rhn/dwr/interface/SystemGroupsRenderer.js"></script> </c:if> -<script type="text/javascript" src="/javascript/render.js"></script> </head> <body> <rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif" imgAlt="yourrhn.jsp.toolbar.img.alt" diff --git a/web/html/javascript/render.js b/web/html/javascript/render.js deleted file mode 100644 index 8083377..0000000 --- a/web/html/javascript/render.js +++ /dev/null @@ -1,11 +0,0 @@ -function makeAjaxCallback(divId, debug) { - cb = function(text) { - if (debug) { - alert(text); - } - $('#' + divId).html(text); - $('#' + divId).fadeIn(); - columnHeight(); - }; - return cb; -} diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index bd8bc9e..e693ab0 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -47,3 +47,17 @@ function columnHeight() { 200); //}; }; + +// Render page fragments loaded via DWR +function makeAjaxCallback(divId, debug) { + cb = function(text) { + if (debug) { + alert(text); + } + $('#' + divId).html(text); + $('#' + divId).fadeIn(); + columnHeight(); + }; + return cb; +} + commit 86c8a384621780868b4da487b7efd2e0eba1a9e1 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 11:09:03 2013 +0200 Move reference to spacewalk-essentials.js back to the head diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 7d32c87..ce894e2 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -39,3 +39,4 @@ <script src="/javascript/bootstrap.js"></script> <script src="/javascript/check_all.js"></script> + <script src="/javascript/spacewalk-essentials.js"></script> diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index 4f3e9e1..e740d86 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -26,4 +26,3 @@ --%>  <script src="/javascript/check_all.js"></script> -<script src="/javascript/spacewalk-essentials.js"></script> commit bb77794c0ee9b1fde7b377a4baf4967875ae735e Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 11:08:03 2013 +0200 Call columnHeight() whenever a fragment is rendered with DWR diff --git a/web/html/javascript/render.js b/web/html/javascript/render.js index e2502f7..8083377 100644 --- a/web/html/javascript/render.js +++ b/web/html/javascript/render.js @@ -5,6 +5,7 @@ function makeAjaxCallback(divId, debug) { } $('#' + divId).html(text); $('#' + divId).fadeIn(); + columnHeight(); }; return cb; } commit e1f14e83145c94bfe78ad5771e5fc447248822c4 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 15 11:01:20 2013 +0200 Call columnHeight() on the window load event instead of using timeout diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index fccf88d..bd8bc9e 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -22,12 +22,10 @@ $(document).on("ready", function(){ } }); -setTimeout(function(){ - // taking the screen size and resizing the columns to keep the footer fixed to the bottom - // On page load - $("section.col-md-10").css("padding-bottom", ""); - columnHeight(); -}, 700); +// On window load +$(window).load(function () { + columnHeight(); +}); // On window resize $(window).resize( function () { @@ -44,9 +42,8 @@ function columnHeight() { var heightDoc = $(document).height(); // Column heights should equal the document height minus the header height and footer height var newHeight = heightDoc - 160 - sectionHeight + "px"; - console.log(sectionHeight + " " + newHeight + " " + heightDoc); $("section.col-md-10").animate({ "padding-bottom": newHeight}, 200); //}; -}; \ No newline at end of file +}; commit 04a4eff3701b08cdec7b6a7ef8d2080f8397e9e6 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Oct 14 17:55:17 2013 +0200 timeout added to wait for all the elements to be loaded and detect the correct screen size diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 5dae3fe..a4f797b 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -34,10 +34,10 @@ footer{ } aside.col-md-2{ background: #eeeeee; - border-right: 1px solid #d5d5d5; height: auto; min-height: 100%; + /* 100% height */ margin-bottom: -9999px; padding-bottom: 9999px; /* errasing the predefined paddings in the columns */ @@ -189,6 +189,9 @@ section.col-md-10{ padding-left:2em; padding-right: 2em; padding-bottom: 3em; + /* some animation */ + transition: width 2s, height 2s, transform 2s; + -webkit-transition: width 2s, height 2s, -webkit-transform 2s; } section [class*=col-md]:first-child{ padding-left:0; diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 157bb09..fccf88d 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -22,12 +22,12 @@ $(document).on("ready", function(){ } }); -$(window).load(function(){ +setTimeout(function(){ // taking the screen size and resizing the columns to keep the footer fixed to the bottom // On page load $("section.col-md-10").css("padding-bottom", ""); columnHeight(); -}); +}, 700); // On window resize $(window).resize( function () { @@ -45,6 +45,8 @@ function columnHeight() { // Column heights should equal the document height minus the header height and footer height var newHeight = heightDoc - 160 - sectionHeight + "px"; console.log(sectionHeight + " " + newHeight + " " + heightDoc); - $("section.col-md-10").css("padding-bottom", newHeight); + $("section.col-md-10").animate({ + "padding-bottom": newHeight}, + 200); //}; }; \ No newline at end of file commit ab6419fa6fde12921d8fcaf72739af154a96f1ce Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 14 17:29:20 2013 +0200 Include a static version of bootstrap.js (v3.0.0) diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 2f5b52e..7d32c87 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -37,5 +37,5 @@ <script src="/rhn/dwr/util.js"></script> <script src="/rhn/dwr/interface/DWRItemSelector.js"></script> - <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> + <script src="/javascript/bootstrap.js"></script> <script src="/javascript/check_all.js"></script> diff --git a/web/html/javascript/bootstrap.js b/web/html/javascript/bootstrap.js new file mode 100644 index 0000000..1765631 --- /dev/null +++ b/web/html/javascript/bootstrap.js @@ -0,0 +1,6 @@ +/** +* bootstrap.js v3.0.0 by @fat and @mdo +* Copyright 2013 Twitter Inc. +* http://www.apache.org/licenses/LICENSE-2.0 +*/ +if(!jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(window.jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b .isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="bu ttons"]');if(a.length){var b=this.$element.find("input").prop("checked",!this.$element.hasClass("active")).trigger("change");"radio"===b.prop("type")&&a.find(".active").removeClass("active")}this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(window.jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a .proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.pro totype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass (["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.att r("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.tr ansitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.proto type.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(window.jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass( "open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasCl ass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i<h.length-1&&i++,~i||(i=0),h.eq(i).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("dropdown");d||c.data("dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu]",f.prototype.keydown)}(window.jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.load(this.options.remote )};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show(),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDe faultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.re move(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data( "bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(window.jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-in ner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=fun ction(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),th is.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h<o?"right":d,c.removeClass(k).addClass(d)}var p=this.getCalculatedOffset(d,g,h,i);this.applyPlacement(p,d),this.$element.trigger("shown.bs."+th is.type)}},b.prototype.applyPlacement=function(a,b){var c,d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),a.top=a.top+g,a.left=a.left+h,d.offset(a).addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;if("top"==b&&j!=f&&(c=!0,a.top=a.top+f-j),/bottom|top/.test(b)){var k=0;a.left<0&&(k=-2*a.left,a.left=0,d.offset(a),i=d[0].offsetWidth,j=d[0].offsetHeight),this.replaceArrow(k-e+i,i,"left")}else this.replaceArrow(j-f,j,"top");c&&d.offset(a)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach()}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPre vented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.$element.trigger("hidden.bs."+this.type),this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.op tions;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;e||d.data("bs.tooltip",e=new b(thi s,f)),"string"==typeof c&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(window.jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototyp e.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(window.jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=( this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;) g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("da ta-target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constru ctor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=nul l!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery); \ No newline at end of file commit 9f581f2325e63e803e4d4f75c785578af38f2bec Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 14 17:21:23 2013 +0200 Remove obsolete type="text/javascript" diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index 45e9ec0..4f3e9e1 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -25,5 +25,5 @@ the form elements we may need have been rendered. --%>  -<script src="/javascript/check_all.js" type="text/javascript"></script> +<script src="/javascript/check_all.js"></script> <script src="/javascript/spacewalk-essentials.js"></script> commit 7595a2914ba5621bb08e5c3a3f8d0715549f6adf Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Oct 14 17:20:03 2013 +0200 changes to fix aside section 100% height diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index a7008e5..5dae3fe 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -34,14 +34,15 @@ footer{ } aside.col-md-2{ background: #eeeeee; - /* errasing the predefined paddings in the columns */ - padding-right: 0; - padding-left: 0; + border-right: 1px solid #d5d5d5; height: auto; min-height: 100%; margin-bottom: -9999px; padding-bottom: 9999px; + /* errasing the predefined paddings in the columns */ + padding-right: 0; + padding-left: 0; } section{ /* for the body div to make both columns the same size*/ diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 82d0078..157bb09 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -1,4 +1,5 @@ $(document).on("ready", function(){ + /* Menu in the left column - actions to hide submenu and create animation when a menu only has submenues and doesnt have a URL */ $("#sidenav ul>ul").hide(); @@ -19,4 +20,31 @@ $(document).on("ready", function(){ $(this).hide(); }); } -}); \ No newline at end of file +}); + +$(window).load(function(){ + // taking the screen size and resizing the columns to keep the footer fixed to the bottom + // On page load + $("section.col-md-10").css("padding-bottom", ""); + columnHeight(); +}); + +// On window resize +$(window).resize( function () { + $("section.col-md-10").css("padding-bottom", ""); + columnHeight(); +}); + +// Make columns 100% in height +function columnHeight() { + //Only if the screen size is higher than the max-width set up in the Variables.less under the definition @screen-md: + //PLEASE: update this if you change the content of @screen-md + //if ($(document).width()>992) { + var sectionHeight = $("section.col-md-10").outerHeight(); + var heightDoc = $(document).height(); + // Column heights should equal the document height minus the header height and footer height + var newHeight = heightDoc - 160 - sectionHeight + "px"; + console.log(sectionHeight + " " + newHeight + " " + heightDoc); + $("section.col-md-10").css("padding-bottom", newHeight); + //}; +}; \ No newline at end of file commit 29c8424a3e4eab4670541aec22adf1fe4709306c Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 14 17:14:29 2013 +0200 Load spacewalk-essentials in the footer diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 4ab2139..2f5b52e 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -39,4 +39,3 @@ <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> <script src="/javascript/check_all.js"></script> - <script src="/javascript/spacewalk-essentials.js"></script> diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index f8f308a..45e9ec0 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -26,3 +26,4 @@ --%>  <script src="/javascript/check_all.js" type="text/javascript"></script> +<script src="/javascript/spacewalk-essentials.js"></script> commit 2ffc551a0843a02e0aace904ac60c02f919df9dc Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Oct 14 17:09:55 2013 +0200 Serve jquery locally instead of fetching it from a CDN This is version 1.10.2, so the original filename was jquery-1.10.2.min.js. diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index 414e5a6..4ab2139 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -30,7 +30,7 @@ <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> + <script src="/javascript/jquery.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/1.4.1/less.min.js"></script> <script src="/rhn/dwr/engine.js"></script> diff --git a/web/html/javascript/jquery.js b/web/html/javascript/jquery.js new file mode 100644 index 0000000..da41706 --- /dev/null +++ b/web/html/javascript/jquery.js @@ -0,0 +1,6 @@ +/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license +//@ sourceMappingURL=jquery-1.10.2.min.map +*/ +(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)retu rn this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:fun ction(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expa ndo:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast) for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){ t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];e lse while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a ={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st (),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\$((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\$|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp ("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\$"+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\$|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\$"+P+"*((?:-\\d)?\\d*)"+P+"*\$|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.n odeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e) {var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.docume ntElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TA G=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozM atchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c ,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDupl icates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2] ;return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return! !e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call (e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:funct ion(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for (;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;r eturn t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y =[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]) ;b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parent Node||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXML Doc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t, r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o ){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement ("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute(" value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0; left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),ty peof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t +}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{ap plet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(functi on(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x .fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.acc ess(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.clas sName+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this ).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0 )&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFi x[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocu ment.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxL ength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,a rguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:. *\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n ]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this ,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt .test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n. clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEv entListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t) {x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(th is,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0== =n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x. event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;f or(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling" )},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i },sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$| \/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prep end:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.acc ess(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i =p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._dat a(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"repl aceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a ++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||- 1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); +u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var P t,Rt,Wt,$t=/alpha$[^)]*$/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a+ +)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn (u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.max Width=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1, o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity| |(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr .filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=functi on(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:fu nction(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c ),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"t ext/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase( );return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data, delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&& clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o= ==t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x- ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(func tion(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function() {r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u ]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.ove rflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,t his.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show() .end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0) ,o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math. PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOf fset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.of fsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length },x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window); commit c4f5e6b60750dc9632548dad896527bc8ecfc83c Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Oct 14 14:35:01 2013 +0200 footer and margin in Section tag fixed diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index aab71bf..a7008e5 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -29,7 +29,8 @@ footer{ color: #fff; font-weight: normal; font-size: 0.9em; - height: 80px + height: 80px; + clear: both } aside.col-md-2{ background: #eeeeee; @@ -39,6 +40,8 @@ aside.col-md-2{ border-right: 1px solid #d5d5d5; height: auto; min-height: 100%; + margin-bottom: -9999px; + padding-bottom: 9999px; } section{ /* for the body div to make both columns the same size*/ @@ -75,7 +78,7 @@ h2{ overflow: hidden; margin-bottom: -80px; padding-bottom: 80px; - height: auto; + height: auto !important; min-height: 100% } /* style for the login page */ @@ -183,7 +186,8 @@ header .btn.btn-info.input-sm{ /* fixing margins in the 1st and last columns */ section.col-md-10{ padding-left:2em; - padding-right: 2em + padding-right: 2em; + padding-bottom: 3em; } section [class*=col-md]:first-child{ padding-left:0; diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 9e9f0ea..82d0078 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -19,29 +19,4 @@ $(document).on("ready", function(){ $(this).hide(); }); } -}); - -// taking the screen size and resizing the columns to keep the footer fixed to the bottom -// On page load -$(window).load(columnHeight); - -// On window resize -$(window).resize( function () { - // Clear all forced column heights before recalculating them after window resize - $("aside").css("height", ""); - $("section").css("height", ""); - columnHeight(); -}); - -// Make columns 100% in height -function columnHeight() { - //Only if the screen size is higher than the max-width set up in the Variables.less under the definition @screen-md: - //PLEASE: update this if you change the content of @screen-md - if ($(document).width()>992) { - // Column heights should equal the document height minus the header height and footer height - var newHeight = $(document).height() - 200 + "px"; - console.log(newHeight); - $("aside").css("height", newHeight); - $("section").css("height", newHeight); - }; -} +}); \ No newline at end of file commit aaed2f0b465d913d6e3b5d1d82d51bd4760d866a Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 14 13:34:15 2013 +0200 fix empty lists closing tags diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index dcd31d3..1b796f5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -535,6 +535,7 @@ public class ListTag extends BodyTagSupport { if (manip.isListEmpty()) { renderEmptyList(); + ListTagUtil.write(pageContext, "</table>"); return BodyTagSupport.SKIP_BODY; } ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), @@ -773,6 +774,7 @@ public class ListTag extends BodyTagSupport { } private void renderEmptyList() throws JspException { + ListTagUtil.write(pageContext, "<tbody>"); ListTagUtil.write(pageContext, "<tr><td "); ListTagUtil.write(pageContext, "colspan=\""); ListTagUtil.write(pageContext, String.valueOf(columnCount)); @@ -784,10 +786,11 @@ public class ListTag extends BodyTagSupport { ListTagUtil .write(pageContext, "<div class=\"list-empty-message\">"); ListTagUtil.write(pageContext, msg); - ListTagUtil.write(pageContext, "<br /></div>"); + ListTagUtil.write(pageContext, "</div>"); } ListTagUtil.write(pageContext, "</td></tr>"); + ListTagUtil.write(pageContext, "</tbody>"); } private void renderRowClassAndId() throws JspException { commit d38d6a60e045b184e586c22791a085faf05ed0d2 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 14 12:20:23 2013 +0200 fix the ul.active selector for the opening of the selected left menu item diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 5aaa0ad..9e9f0ea 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -2,9 +2,11 @@ $(document).on("ready", function(){ /* Menu in the left column - actions to hide submenu and create animation when a menu only has submenues and doesnt have a URL */ $("#sidenav ul>ul").hide(); - if ($("#sidenav li").attr("class", "active")){ + + $("#sidenav li.active").each(function() { $(this).next("ul").show(300); - }; + }); + /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when no system is selected */ $("#clearbtn").click(hidesystemtool); commit b8b9d89dd4ff5aae35da5e4a12a5082e9144a913 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 14 09:19:35 2013 +0200 The table heading of inactive systems is really the title. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp index 2f3a07b..c48acf4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp @@ -2,30 +2,32 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + <div class="${requestScope.inactiveSystemsClass}"> <form method="post" name="rhn_list" action="/YourRhn.do"> + <rhn:list pageList="${requestScope.inactiveSystemList}" - noDataText="${requestScope.inactiveSystemsEmpty}" - formatMessage="false"> - <rhn:listdisplay set="${requestScope.set}" - paging="false" - type="half-table" - reflink="/rhn/systems/Inactive.do" - reflinkkey="yourrhn.jsp.allinactivesystems" - reflinkkeyarg0="${pageList.size}"> - + noDataText="${requestScope.inactiveSystemsEmpty}" + formatMessage="false"> + <rhn:listdisplay set="${requestScope.set}" + title="inactivelist.jsp.header" + paging="false" + reflink="/rhn/systems/Inactive.do" + reflinkkey="yourrhn.jsp.allinactivesystems" + reflinkkeyarg0="${pageList.size}" + domainClass="systems"> + <rhn:column header="probesuitesystemsedit.jsp.systemname" + url="/rhn/systems/details/Overview.do?sid=${current.id}"> + <i class="icon-question-sign"></i> + <c:out value="${current.name}" escapeXml="true" /> + </rhn:column> + + <rhn:column header="emptyspace.jsp"> + ${current.lastCheckinString} + </rhn:column> - <rhn:column header="inactivelist.jsp.header" - url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <img src="/img/icon_checkin.gif" alt="<bean:message key="system-legend.jsp.notcheckingin"/>" /> - <c:out value="${current.name}" escapeXml="true" /> - </rhn:column> + </rhn:listdisplay> + </rhn:list> - <rhn:column header="emptyspace.jsp"> - ${current.lastCheckinString} - </rhn:column> - - </rhn:listdisplay> - </rhn:list> - </form> - </div> + </form> + </div> commit 4764aa250a097135ff1dc7ee50bca56ee0e96ca7 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 14 09:18:14 2013 +0200 rl:list re-arrangement title goes into the panel heading but filter/addons stay as a thead links go into a footer but pagination/etc go into a tfoot diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 3e66cb8..b0d1638 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -28,6 +28,7 @@ import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.listview.AlphaBar; import com.redhat.rhn.frontend.listview.PaginationUtil; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; import com.redhat.rhn.manager.acl.AclManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; @@ -592,7 +593,7 @@ public class ListDisplayTag extends BodyTagSupport { if (request.getQueryString() != null) { page.append("&" + request.getQueryString()); } - out.println("<div class=\"spacewalk-csv-download\"><a href=\"" + page + + out.println("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + page + "\"><i class=\"icon-download-alt\"></i>" + LocalizationService.getInstance().getMessage("listdisplay.csv") + "</a></div>"); @@ -605,9 +606,13 @@ public class ListDisplayTag extends BodyTagSupport { */ private void renderTitle(JspWriter out) throws IOException { if (!StringUtils.isEmpty(title)) { - HtmlTag caption = new HtmlTag("caption"); - caption.addBody(LocalizationService.getInstance().getMessage(title)); - out.println(caption.render()); + HtmlTag heading = new HtmlTag("div"); + heading.setAttribute("class", "panel-heading"); + HtmlTag h3 = new HtmlTag("h3"); + h3.setAttribute("class", "panel-title"); + h3.addBody(LocalizationService.getInstance().getMessage(title)); + heading.addBody(h3); + out.println(heading.render()); } } @@ -744,10 +749,6 @@ public class ListDisplayTag extends BodyTagSupport { out.print("</span>"); } } - if (!top && exportColumns != null) { - renderExport(out); - } - out.println("</div>"); @@ -1074,30 +1075,16 @@ public class ListDisplayTag extends BodyTagSupport { doSort(sortedColumn); } - /* If pageList contains an index and pageList.size() (what we are - * displaying on the page) is less than pageList.getTotalSize() - * (the total number of items in the data result), render alphabar. - * This prevents the alphabar from showing up on pages that show - * all of the entries on a single page and is similar to how the - * perl code behaves. - */ - if (pageList.getIndex().size() > 0 && - pageList.size() < pageList.getTotalSize()) { - - renderViewAllLink(out); - renderAlphabar(out); - } + out.print("<div class=\"spacewalk-list-container\">"); + out.print("<div class=\"spacewalk-list panel panel-default\">"); - if (isPaging()) { - renderPagination(out, true); - renderBoundsVariables(out); - } + renderTitle(out); /* If the type is list, we must set the width explicitly. Otherwise, * it shouldn't matter */ if (type.equals("list")) { - out.print("<table class=\"table table-striped spacewalk-list\""); + out.print("<table class=\"table table-striped\""); } else { out.print("<table class=\"" + type + "\""); @@ -1113,8 +1100,33 @@ public class ListDisplayTag extends BodyTagSupport { out.println(">"); - renderTitle(out); + // we render the pagination controls as an additional head + out.println("<thead>"); + out.println("<tr>"); + out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); + /* If pageList contains an index and pageList.size() (what we are + * displaying on the page) is less than pageList.getTotalSize() + * (the total number of items in the data result), render alphabar. + * This prevents the alphabar from showing up on pages that show + * all of the entries on a single page and is similar to how the + * perl code behaves. + */ + if (pageList.getIndex().size() > 0 && + pageList.size() < pageList.getTotalSize()) { + + renderViewAllLink(out); + renderAlphabar(out); + } + + if (isPaging()) { + renderPagination(out, true); + renderBoundsVariables(out); + } + out.println("</td>"); + out.println("</tr>"); + + // Now print the column headings out.println("<thead>"); out.println("\n<tr>"); @@ -1179,36 +1191,9 @@ public class ListDisplayTag extends BodyTagSupport { /* If the type is a half-table, we must draw an extra row on the * end of the table if the reflink has been set */ - if (reflink != null) { - columnCount = 0; - - out.println("<tfoot>"); - - out.println("<a href=\"" + reflink + "\" >"); - - /* Here we render the reflink and its key. If the key hasn't been set - * we just display the link address itself. - */ - if (reflinkkey != null) { - Object[] args = new Object[2]; - - args[0] = new Integer(pageList.getTotalSize()); - args[1] = reflinkkeyarg0; - - String message = LocalizationService.getInstance(). - getMessage(reflinkkey, args); - out.println(message); - } - else { - out.println(reflink); - } - - out.println("</a>"); - out.println("</tfoot>"); - } - - - out.println("</table>\n"); + out.println("<tfoot>"); + out.println("<tr>"); + out.println("<td colspan=\"" + getNumberOfColumns() + "\">"); /* If paging is on, we render the pagination */ if (isPaging()) { @@ -1237,6 +1222,48 @@ public class ListDisplayTag extends BodyTagSupport { .getMessage("message.range.withtypedescription", args)); out.println("</span>"); } + out.println("</tr>"); + out.println("</td>"); + out.println("</tfoot>\n"); + + out.println("</table>\n"); + + if (reflink != null) { + columnCount = 0; + + out.println("<div class=\"panel-footer\">"); + + out.println("<a href=\"" + reflink + "\" >"); + + /* Here we render the reflink and its key. If the key hasn't been set + * we just display the link address itself. + */ + if (reflinkkey != null) { + Object[] args = new Object[2]; + + args[0] = new Integer(pageList.getTotalSize()); + args[1] = reflinkkeyarg0; + + String message = LocalizationService.getInstance(). + getMessage(reflinkkey, args); + out.println(message); + } + else { + out.println(reflink); + } + + out.println("</a>"); + out.println("</div>"); + } + + + out.println("</div>\n"); + // export button goes outside of the panel + if (exportColumns != null) { + renderExport(out); + } + out.println("</div>\n"); + setColumnCount(0); numberOfColumns = 0; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 15244c4..dcd31d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -441,20 +441,26 @@ public class ListTag extends BodyTagSupport { ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.TBL_HEADING); - ListTagUtil.write(pageContext, "<div class=\"panel-heading\">"); - + // only if there is a title, add a panel-heading if (!StringUtils.isBlank(title)) { + ListTagUtil.write(pageContext, "<div class=\"panel-heading\">"); HtmlTag h3 = new HtmlTag("h3"); h3.setAttribute("class", "panel-title"); h3.addBody(title); - ListTagUtil.write(pageContext, h3.render()); + ListTagUtil.write(pageContext, "</div>"); } - ListTagUtil.write(pageContext, ""); - ListTagUtil.write(pageContext, "</div>"); } else if (haveColsEnumerated && !haveTblAddonsRendered) { - ListTagUtil.write(pageContext, "<div class=\"panel-body\">"); + + startTable(); + + ListTagUtil.write(pageContext, "<thead>"); + + // render the navigation and filters as a row of the header + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); + setupManipulator(); manip.sort(); pageData = manip.getPage(); @@ -475,67 +481,58 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, ListTagUtil.makeParentIsAnElementLabel(uniqueName), parentIsElement)); - ListTagUtil.write(pageContext, "<div class=\"filter-input\">"); - ListTagUtil.write(pageContext, "<div class=\"row\">"); - - // column with the filter - ListTagUtil.write(pageContext, "<div class=\"col-lg-6 text-left\">"); + ListTagUtil.write(pageContext, "<div class=\"filter-input row\">"); + // column with the filter + ListTagUtil.write(pageContext, "<div class=\"col-md-4 text-left\">"); if (filter != null && manip.getUnfilteredDataSize() != 0) { ListTagUtil.renderFilterUI(pageContext, filter, getUniqueName(), width, columnCount, searchParent, searchChild); } - if (isSortable()) { - renderSortableHiddenFields(); - } - - if (!isEmpty()) { + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "<div class=\"col-md-8 text-right\">"); + if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.beforeTopPagination(); } - } - ListTagUtil.write(pageContext, "</div>"); - - // column with the pagination controls - ListTagUtil.write(pageContext, "<div class=\"col-lg-6 text-right list-infotext\">"); - renderTopPaginationControls(); - ListTagUtil.write(pageContext, "</div>"); - - // end of the row - ListTagUtil.write(pageContext, "</div>"); + } - // end of the filter-input div - ListTagUtil.write(pageContext, "</div>"); + // column with the pagination controls + renderTopPaginationControls(); + ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, ""); - ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</div>"); + ListTagUtil.write(pageContext, "</td>"); + ListTagUtil.write(pageContext, "</tr>"); - startTable(); - HttpServletRequest request = (HttpServletRequest) pageContext + HttpServletRequest request = (HttpServletRequest) pageContext .getRequest(); - manip.bindPaginationInfo(); - request.setAttribute("dataSize", String + manip.bindPaginationInfo(); + request.setAttribute("dataSize", String .valueOf(pageData.size() + 1)); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_ADDONS); - if (pageData != null && pageData.size() > 0) { - iterator = pageData.iterator(); - } - else { - iterator = null; - } + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_ADDONS); + if (pageData != null && pageData.size() > 0) { + iterator = pageData.iterator(); + } + else { + iterator = null; + } } if (haveColsEnumerated && haveTblAddonsRendered && !haveColHeadersRendered) { - // Nothing to do when rendering the col headers - // those are done by the column tag + // open the row tag for the column header th's + ListTagUtil.write(pageContext, "<tr>"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.COL_HEADER); } if (haveColHeadersRendered && !haveTblFootersRendered) { + ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "</thead>"); + if (manip.isListEmpty()) { renderEmptyList(); return BodyTagSupport.SKIP_BODY; @@ -554,7 +551,6 @@ public class ListTag extends BodyTagSupport { } if (currentObject == null) { ListTagUtil.write(pageContext, "</tbody>"); - ListTagUtil.write(pageContext, "</table>"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.TBL_FOOTER); } @@ -569,9 +565,20 @@ public class ListTag extends BodyTagSupport { else if (haveTblFootersRendered) { retval = BodyTagSupport.SKIP_BODY; - ListTagUtil.write(pageContext, "<div class=\"panel-footer\">"); + // render the pagination controls as the footer of the table + ListTagUtil.write(pageContext, "<tfoot>"); + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td colspan=\"" + getColumnCount() + "\">"); + renderFooterPaginationControls(); + ListTagUtil.write(pageContext, "</td>"); + ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "</tfoot>"); + ListTagUtil.write(pageContext, "</table>"); + // if there is reference links, put them as a panel footer if ((refLink != null) && (!isEmpty())) { + ListTagUtil.write(pageContext, "<div class=\"panel-footer\">"); + ListTagUtil.write(pageContext, "<a href=\"" + refLink + "\" >"); /* Here we render the reflink and its key. If the key hasn't been set * we just display the link address itself. @@ -590,11 +597,14 @@ public class ListTag extends BodyTagSupport { } ListTagUtil.write(pageContext, "</a>"); + // closes the panel footer + ListTagUtil.write(pageContext, "</div>"); } - renderFooterPaginationControls(); - // closes the panel footer - ListTagUtil.write(pageContext, "</div>"); + // we render the hidden fields outside of the table + if (isSortable()) { + renderSortableHiddenFields(); + } } return retval; } @@ -848,21 +858,14 @@ public class ListTag extends BodyTagSupport { return; } - ListTagUtil.write(pageContext, "<div>"); - ListTagUtil.write(pageContext, "<table "); - ListTagUtil.write(pageContext, " cellspacing=\"0\" "); - ListTagUtil.write(pageContext, "cellpadding=\"0\" width=\"100%\">"); - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td align=\"left\">"); - + ListTagUtil.write(pageContext, "<div class=\"pull-left\">"); for (ListDecorator dec : getDecorators()) { dec.setCurrentList(this); dec.afterList(); } - ListTagUtil.write(pageContext, "</td>"); + ListTagUtil.write(pageContext, "</div>"); - ListTagUtil.write(pageContext, - "<td valign=\"middle\" class=\"list-infotext\">"); + ListTagUtil.write(pageContext, "<div class=\"pull-right\">"); if (!isEmpty() && !hidePageNums) { ListTagUtil.write(pageContext, manip.getPaginationMessage()); } @@ -877,9 +880,8 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, "  "); ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES, manip.getPaginationLinks()); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); - ListTagUtil.write(pageContext, "</table></div>"); + + ListTagUtil.write(pageContext, "</div>"); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index bfe8cf0..8028be1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -106,11 +106,12 @@ public class PageSizeDecorator extends BaseListDecorator { /** * {@inheritDoc} */ + @Override public void beforeTopPagination() throws JspException { if (!getCurrentList().isEmpty()) { StringBuilder stringBuild = new StringBuilder(); - stringBuild.append("<td class=\"list-sizeselector\">"); + stringBuild.append("<div class=\"list-sizeselector\">"); HtmlTag select = new HtmlTag("Select"); select.setAttribute("name", makePageSizeLabel(listName)); select.setAttribute("onChange", makeOnChangeScript()); @@ -128,7 +129,7 @@ public class PageSizeDecorator extends BaseListDecorator { LocalizationService ls = LocalizationService.getInstance(); stringBuild.append(ls.getMessage("message.items.per.page", select.render())); - stringBuild.append("</td>"); + stringBuild.append("</div>"); HtmlTag input = new HtmlTag("input"); input.setAttribute("type", "hidden"); input.setAttribute("id", makeSelectionId(listName)); commit fa13d1e2d80a1de58a4ebf46955bf5d96187ebbf Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Oct 11 17:23:04 2013 +0200 Refactor the List code so that code is not split inconsistently across methods leaving tags open and having boolean state everywhere. Some repeated writing of html is not bad if one can read the code without jumping from method to method remembering the state of a open tag. Make the navigation icons to use font awesome diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java index c563f8f..8db7fba 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java @@ -46,41 +46,29 @@ import javax.servlet.jsp.PageContext; public class DataSetManipulator { private static final String[] LINK_PREFIXES = {"_first", "_prev", "_next", "_last"}; - private int pageSize; + private final int pageSize; private List dataset; private ListFilter filter; private String filterBy; private String filterValue; private int totalDataSetSize; - private HttpServletRequest request; - private String uniqueName; + private final HttpServletRequest request; + private final String uniqueName; private int pageNumber = -1; private String alphaCol; private int alphaPosition = -1; private boolean ascending = true; - private int unfilteredDataSize; - private boolean parentIsAnElement; + private final int unfilteredDataSize; + private final boolean parentIsAnElement; - private boolean searchParent; - private boolean searchChild; + private final boolean searchParent; + private final boolean searchChild; private String defaultSortAttribute; - private static final String IMG_FIRST = "/img/list-allbackward.gif"; - private static final String IMG_FIRST_UNFOCUSED = - "/img/list-allbackward-unfocused.gif"; - - private static final String IMG_PREV = "/img/list-backward.gif"; - private static final String IMG_PREV_UNFOCUSED = - "/img/list-backward-unfocused.gif"; - - private static final String IMG_NEXT = "/img/list-forward.gif"; - private static final String IMG_NEXT_UNFOCUSED = - "/img/list-forward-unfocused.gif"; - - - private static final String IMG_LAST = "/img/list-allforward.gif"; - private static final String IMG_LAST_UNFOCUSED = - "/img/list-allforward-unfocused.gif"; + private static final String ICON_FIRST = "icon-fast-backward"; + private static final String ICON_PREV = "icon-backward"; + private static final String ICON_NEXT = "icon-forward"; + private static final String ICON_LAST = "icon-fast-forward"; /** @@ -419,14 +407,13 @@ public class DataSetManipulator { String pageLinkName = "list_" + uniqueName + "_page"; String[] data = new String[4]; if (!isFirstPage()) { - data[0] = IMG_FIRST; + data[0] = ICON_FIRST; data[1] = pageLinkName + "_first"; data[2] = "first"; data[3] = "First Page"; - } else { - data[0] = IMG_FIRST_UNFOCUSED; + data[0] = ICON_FIRST; data[1] = null; data[2] = null; data[3] = null; @@ -434,13 +421,13 @@ public class DataSetManipulator { links.put("allBackward", data); data = new String[4]; if (getPrevPageNumber() > -1) { - data[0] = IMG_PREV; + data[0] = ICON_PREV; data[1] = pageLinkName + "_prev"; data[2] = String.valueOf(getPrevPageNumber()); data[3] = "Previous Page"; } else { - data[0] = IMG_PREV_UNFOCUSED; + data[0] = ICON_PREV; data[1] = null; data[2] = null; data[3] = null; @@ -448,13 +435,13 @@ public class DataSetManipulator { links.put("backward", data); data = new String[4]; if (getNextPageNumber() > -1) { - data[0] = IMG_NEXT; + data[0] = ICON_NEXT; data[1] = pageLinkName + "_next"; data[2] = String.valueOf(getNextPageNumber()); data[3] = "Next Page"; } else { - data[0] = IMG_NEXT_UNFOCUSED; + data[0] = ICON_NEXT; data[1] = null; data[2] = null; data[3] = null; @@ -462,13 +449,13 @@ public class DataSetManipulator { links.put("forward", data); data = new String[4]; if (!isLastPage()) { - data[0] = IMG_LAST; + data[0] = ICON_LAST; data[1] = pageLinkName + "_last"; data[2] = "last"; data[3] = "Last Page"; } else { - data[0] = IMG_LAST_UNFOCUSED; + data[0] = ICON_LAST; } links.put("allForward", data); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java index 46cf520..8942173 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java @@ -22,7 +22,8 @@ package com.redhat.rhn.frontend.taglibs.list; public enum ListCommand { RENDER ("__render__"), - TBL_HEADER ("__tbl_header__"), + TBL_HEADING ("__tbl_heading__"), + TBL_ADDONS ("__tbl_addons__"), TBL_FOOTER ("__tbl__footer__"), COL_HEADER ("__col_header__"), ENUMERATE ("__enum__"); @@ -36,6 +37,7 @@ public enum ListCommand { /** * ${@inheritDoc} */ + @Override public String toString() { return _cmd; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index b1eae8e..15244c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -43,6 +43,15 @@ import javax.servlet.jsp.tagext.BodyTagSupport; /** * Renders a list of data bean in a page * + * The list is rendered as a bootstrap 3.x panel + * + * The title of the list is put in the panel-heading + * Pagination, alphabars and addons go into the panel-body + * Bottom pagination and reflinks g into the panel-footer + * The table goes as is, for seamless display into the panel + * + * @see http://getbootstrap.com/components/#panels + * * @version $Rev $ */ public class ListTag extends BodyTagSupport { @@ -53,7 +62,8 @@ public class ListTag extends BodyTagSupport { private static final String HIDDEN_TEXT = "<input type=\"hidden\" " + "name=\"%s\" value=\"%s\"/>"; private boolean haveColsEnumerated = false; - private boolean haveTblHeadersRendered = false; + private boolean haveTblHeadingRendered = false; + private boolean haveTblAddonsRendered = false; private boolean haveTblFootersRendered = false; private boolean haveColHeadersRendered = false; private int columnCount; @@ -394,40 +404,6 @@ public class ListTag extends BodyTagSupport { */ @Override public int doEndTag() throws JspException { - - /* If a reference link was provided, it needs to be rendered on a separate - * row within the table. - */ - if ((refLink != null) && (!isEmpty())) { - ListTagUtil.write(pageContext, "<tfoot>"); - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td colspan=\"" + String.valueOf(getColumnCount()) + "\">"); - ListTagUtil.write(pageContext, "<a href=\"" + refLink + "\" >"); - /* Here we render the reflink and its key. If the key hasn't been set - * we just display the link address itself. - */ - if (refLinkKey != null) { - Object[] args = new Object[2]; - args[0] = new Integer(getPageRowCount()); - args[1] = refLinkKeyArg0; - String message = LocalizationService.getInstance(). - getMessage(refLinkKey, args); - - ListTagUtil.write(pageContext, message); - } - else { - ListTagUtil.write(pageContext, refLink); - } - - ListTagUtil.write(pageContext, "</a>"); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, "</tr>"); - ListTagUtil.write(pageContext, "</tfoot>"); - } - - - ListTagUtil.write(pageContext, "</table>"); - renderPaginationControls(true); ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, ""); release(); @@ -442,14 +418,43 @@ public class ListTag extends BodyTagSupport { int retval = BodyTagSupport.EVAL_BODY_AGAIN; ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext); - boolean haveRenderedColumnHeaderEndTag = false; + + // close the panel-heading div + if (cmd.equals(ListCommand.TBL_HEADING)) { + //ListTagUtil.write(pageContext, ""); + //ListTagUtil.write(pageContext, "</div>"); + } + + // close the panel-body div + if (cmd.equals(ListCommand.TBL_ADDONS)) { + //ListTagUtil.write(pageContext, ""); + //ListTagUtil.write(pageContext, "</div>"); + } + if (cmd.equals(ListCommand.COL_HEADER)) { - ListTagUtil.write(pageContext, "</tr></thead><tbody>"); - haveRenderedColumnHeaderEndTag = true; + ListTagUtil.write(pageContext, "</tr>"); } setState(); - if (haveColsEnumerated && !haveTblHeadersRendered) { + + if (haveColsEnumerated && !haveTblHeadingRendered) { + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_HEADING); + + ListTagUtil.write(pageContext, "<div class=\"panel-heading\">"); + + if (!StringUtils.isBlank(title)) { + HtmlTag h3 = new HtmlTag("h3"); + h3.setAttribute("class", "panel-title"); + h3.addBody(title); + + ListTagUtil.write(pageContext, h3.render()); + } + ListTagUtil.write(pageContext, ""); + ListTagUtil.write(pageContext, "</div>"); + } + else if (haveColsEnumerated && !haveTblAddonsRendered) { + ListTagUtil.write(pageContext, "<div class=\"panel-body\">"); setupManipulator(); manip.sort(); pageData = manip.getPage(); @@ -469,82 +474,67 @@ public class ListTag extends BodyTagSupport { ListTagUtil.makeFilterSearchChildLabel(uniqueName), searchChild)); ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, ListTagUtil.makeParentIsAnElementLabel(uniqueName), parentIsElement)); - setupFilterUI(); + + ListTagUtil.write(pageContext, "<div class=\"filter-input\">"); + ListTagUtil.write(pageContext, "<div class=\"row\">"); + + // column with the filter + ListTagUtil.write(pageContext, "<div class=\"col-lg-6 text-left\">"); if (filter != null && manip.getUnfilteredDataSize() != 0) { ListTagUtil.renderFilterUI(pageContext, filter, getUniqueName(), width, columnCount, searchParent, searchChild); } if (isSortable()) { - String sortByLabel = ListTagUtil.makeSortByLabel(getUniqueName()); - String sortDirLabel = ListTagUtil.makeSortDirLabel(getUniqueName()); - - HtmlTag sortByInputTag = new HtmlTag("input"); - sortByInputTag.setAttribute("type", "hidden"); - sortByInputTag.setAttribute("name", sortByLabel); - sortByInputTag.setAttribute("id", - ListTagUtil.makeSortById(getUniqueName())); - sortByInputTag.setAttribute("value", StringUtils.defaultString( - pageContext.getRequest().getParameter(sortByLabel))); - - HtmlTag sortByDirTag = new HtmlTag("input"); - sortByDirTag.setAttribute("type", "hidden"); - sortByDirTag.setAttribute("name", sortDirLabel); - sortByDirTag.setAttribute("id", ListTagUtil. - makeSortDirId(getUniqueName())); - sortByDirTag.setAttribute("value", StringUtils.defaultString( - pageContext.getRequest().getParameter(sortDirLabel))); - - ListTagUtil.write(pageContext, sortByInputTag.render()); - ListTagUtil.write(pageContext, sortByDirTag.render()); + renderSortableHiddenFields(); } - if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { dec.beforeTopPagination(); } } - renderPaginationControls(false); - startTable(); - HttpServletRequest request = (HttpServletRequest) pageContext + ListTagUtil.write(pageContext, "</div>"); + + // column with the pagination controls + ListTagUtil.write(pageContext, "<div class=\"col-lg-6 text-right list-infotext\">"); + renderTopPaginationControls(); + ListTagUtil.write(pageContext, "</div>"); + + // end of the row + ListTagUtil.write(pageContext, "</div>"); + + // end of the filter-input div + ListTagUtil.write(pageContext, "</div>"); + + ListTagUtil.write(pageContext, ""); + ListTagUtil.write(pageContext, "</div>"); + + startTable(); + HttpServletRequest request = (HttpServletRequest) pageContext .getRequest(); - manip.bindPaginationInfo(); - request.setAttribute("dataSize", String - .valueOf(pageData.size() + 1)); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_HEADER); - if (pageData != null && pageData.size() > 0) { - iterator = pageData.iterator(); - } - else { - iterator = null; - } + manip.bindPaginationInfo(); + request.setAttribute("dataSize", String + .valueOf(pageData.size() + 1)); + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_ADDONS); + if (pageData != null && pageData.size() > 0) { + iterator = pageData.iterator(); + } + else { + iterator = null; + } } - if (haveColsEnumerated && haveTblHeadersRendered && + if (haveColsEnumerated && haveTblAddonsRendered && !haveColHeadersRendered) { + + // Nothing to do when rendering the col headers + // those are done by the column tag ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.COL_HEADER); - ListTagUtil.write(pageContext, "<thead><tr>"); - - if (!StringUtils.isBlank(title)) { - HtmlTag th = new HtmlTag("th"); - th.setAttribute("colspan", String.valueOf(getColumnCount())); - HtmlTag strong = new HtmlTag("strong"); - strong.addBody(title); - th.addBody(strong.render()); - - ListTagUtil.write(pageContext, th.render()); - - ListTagUtil.write(pageContext, "</tr>\n<tr>"); - } - } if (haveColHeadersRendered && !haveTblFootersRendered) { - if (!haveRenderedColumnHeaderEndTag) { - ListTagUtil.write(pageContext, "</tr>"); - } if (manip.isListEmpty()) { renderEmptyList(); @@ -564,6 +554,7 @@ public class ListTag extends BodyTagSupport { } if (currentObject == null) { ListTagUtil.write(pageContext, "</tbody>"); + ListTagUtil.write(pageContext, "</table>"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.TBL_FOOTER); } @@ -577,10 +568,61 @@ public class ListTag extends BodyTagSupport { } else if (haveTblFootersRendered) { retval = BodyTagSupport.SKIP_BODY; + + ListTagUtil.write(pageContext, "<div class=\"panel-footer\">"); + + if ((refLink != null) && (!isEmpty())) { + ListTagUtil.write(pageContext, "<a href=\"" + refLink + "\" >"); + /* Here we render the reflink and its key. If the key hasn't been set + * we just display the link address itself. + */ + if (refLinkKey != null) { + Object[] args = new Object[2]; + args[0] = new Integer(getPageRowCount()); + args[1] = refLinkKeyArg0; + String message = LocalizationService.getInstance(). + getMessage(refLinkKey, args); + + ListTagUtil.write(pageContext, message); + } + else { + ListTagUtil.write(pageContext, refLink); + } + + ListTagUtil.write(pageContext, "</a>"); + } + + renderFooterPaginationControls(); + // closes the panel footer + ListTagUtil.write(pageContext, "</div>"); } return retval; } + private void renderSortableHiddenFields() throws JspException { + String sortByLabel = ListTagUtil.makeSortByLabel(getUniqueName()); + String sortDirLabel = ListTagUtil.makeSortDirLabel(getUniqueName()); + + HtmlTag sortByInputTag = new HtmlTag("input"); + sortByInputTag.setAttribute("type", "hidden"); + sortByInputTag.setAttribute("name", sortByLabel); + sortByInputTag.setAttribute("id", + ListTagUtil.makeSortById(getUniqueName())); + sortByInputTag.setAttribute("value", StringUtils.defaultString( + pageContext.getRequest().getParameter(sortByLabel))); + + HtmlTag sortByDirTag = new HtmlTag("input"); + sortByDirTag.setAttribute("type", "hidden"); + sortByDirTag.setAttribute("name", sortDirLabel); + sortByDirTag.setAttribute("id", ListTagUtil. + makeSortDirId(getUniqueName())); + sortByDirTag.setAttribute("value", StringUtils.defaultString( + pageContext.getRequest().getParameter(sortDirLabel))); + + ListTagUtil.write(pageContext, sortByInputTag.render()); + ListTagUtil.write(pageContext, sortByDirTag.render()); + } + private void setupPageData() throws JspException { Object d = pageContext.getAttribute(dataSetName); if (d == null) { @@ -617,14 +659,13 @@ public class ListTag extends BodyTagSupport { manip = new DataSetManipulator(pageSize, pageData, (HttpServletRequest) pageContext.getRequest(), getUniqueName(), isParentAnElement(), searchParent, searchChild); - int retval = BodyTagSupport.EVAL_BODY_INCLUDE; ListTagUtil.write(pageContext, ""); - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list\" id=\"" + getUniqueName() + "\">"); + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list panel panel-default\" id=\"" + getUniqueName() + "\">"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.ENUMERATE); - return retval; + return BodyTagSupport.EVAL_BODY_INCLUDE; } private void setupManipulator() throws JspException { @@ -708,7 +749,7 @@ public class ListTag extends BodyTagSupport { filter = null; haveColsEnumerated = false; haveColHeadersRendered = false; - haveTblHeadersRendered = false; + haveTblAddonsRendered = false; haveTblFootersRendered = false; getDecorators().clear(); decorators = null; @@ -787,8 +828,11 @@ public class ListTag extends BodyTagSupport { if (cmd.equals(ListCommand.ENUMERATE)) { haveColsEnumerated = true; } - else if (cmd.equals(ListCommand.TBL_HEADER)) { - haveTblHeadersRendered = true; + else if (cmd.equals(ListCommand.TBL_HEADING)) { + haveTblHeadingRendered = true; + } + else if (cmd.equals(ListCommand.TBL_ADDONS)) { + haveTblAddonsRendered = true; } else if (cmd.equals(ListCommand.COL_HEADER)) { haveColHeadersRendered = true; @@ -798,25 +842,24 @@ public class ListTag extends BodyTagSupport { } } - private void renderPaginationControls(boolean isFooter) throws JspException { + private void renderFooterPaginationControls() throws JspException { - if (isFooter && (isEmpty() || hidePageNums)) { + if (isEmpty() || hidePageNums) { return; } - if (isFooter) { - ListTagUtil.write(pageContext, "<div>"); - ListTagUtil.write(pageContext, "<table "); - ListTagUtil.write(pageContext, " cellspacing=\"0\" "); - ListTagUtil.write(pageContext, "cellpadding=\"0\" width=\"100%\">"); - ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.write(pageContext, "<td align=\"left\">"); + ListTagUtil.write(pageContext, "<div>"); + ListTagUtil.write(pageContext, "<table "); + ListTagUtil.write(pageContext, " cellspacing=\"0\" "); + ListTagUtil.write(pageContext, "cellpadding=\"0\" width=\"100%\">"); + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td align=\"left\">"); - for (ListDecorator dec : getDecorators()) { - dec.afterList(); - } - ListTagUtil.write(pageContext, "</td>"); + for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); + dec.afterList(); } + ListTagUtil.write(pageContext, "</td>"); ListTagUtil.write(pageContext, "<td valign=\"middle\" class=\"list-infotext\">"); @@ -826,13 +869,8 @@ public class ListTag extends BodyTagSupport { if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { - if (isFooter) { - dec.afterBottomPagination(); - dec.setCurrentList(null); - } - else { - dec.afterTopPagination(); - } + dec.afterBottomPagination(); + dec.setCurrentList(null); } } @@ -845,20 +883,21 @@ public class ListTag extends BodyTagSupport { } - private void setupFilterUI() throws JspException { - ListTagUtil.write(pageContext, "<div class=\"filter-input\"><table"); - ListTagUtil.write(pageContext, " cellspacing=\"0\""); - ListTagUtil.write(pageContext, " cellpadding=\"0\""); - if (width != null) { - ListTagUtil.write(pageContext, " width=\""); - ListTagUtil.write(pageContext, width); - ListTagUtil.write(pageContext, "\""); + private void renderTopPaginationControls() throws JspException { + + if (!isEmpty() && !hidePageNums) { + ListTagUtil.write(pageContext, manip.getPaginationMessage()); } - else { - ListTagUtil.write(pageContext, " width=\"100%\""); + + if (!manip.isListEmpty()) { + for (ListDecorator dec : getDecorators()) { + dec.afterTopPagination(); + } } - ListTagUtil.write(pageContext, ">"); - ListTagUtil.write(pageContext, "<tr>"); + + ListTagUtil.write(pageContext, "  "); + ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES, + manip.getPaginationLinks()); } private void setPageSize() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index d06764a..dfd31ee 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -569,35 +569,35 @@ public class ListTagUtil { if (links.size() == 0) { return; } + ListTagUtil.write(pageContext, "<div class=\"btn-group\">"); for (int x = 0; x < linkNames.length; x++) { String[] linkData = (String[]) links.get(linkNames[x]); - if (linkData[1] != null) { - ListTagUtil.write(pageContext, "<input align=\"top\" type=\"image\" "); - ListTagUtil.write(pageContext, "src=\""); - ListTagUtil.write(pageContext, linkData[0]); - ListTagUtil.write(pageContext, "\" name=\""); - ListTagUtil.write(pageContext, linkData[1]); - ListTagUtil.write(pageContext, "\" value=\""); - ListTagUtil.write(pageContext, linkData[2]); - ListTagUtil.write(pageContext, "\" alt=\""); - ListTagUtil.write(pageContext, linkData[3]); - ListTagUtil.write(pageContext, "\" />"); + ListTagUtil.write(pageContext, "<button "); + ListTagUtil.write(pageContext, "class=\"btn btn-default "); + ListTagUtil.write(pageContext, linkData[0]); - ListTagUtil.write(pageContext, "<input type=\"hidden\" name=\""); + // if the link is disabled... + if (linkData[1] == null) { + ListTagUtil.write(pageContext, " disabled"); + } + else { + ListTagUtil.write(pageContext, "\" name=\""); ListTagUtil.write(pageContext, linkData[1]); ListTagUtil.write(pageContext, "\" value=\""); ListTagUtil.write(pageContext, linkData[2]); - ListTagUtil.write(pageContext, "\" />"); - } - else { - ListTagUtil.write(pageContext, "<img align=\"top\" src=\""); - ListTagUtil.write(pageContext, linkData[0]); - ListTagUtil.write(pageContext, "\">"); - if (linkData[1] != null) { - ListTagUtil.write(pageContext, "</a>"); - } } + ListTagUtil.write(pageContext, "\" />"); + + /* + if (linkData[1] = null) { + ListTagUtil.write(pageContext, "<input type=\"hidden\" name=\""); + ListTagUtil.write(pageContext, linkData[1]); + ListTagUtil.write(pageContext, "\" value=\""); + ListTagUtil.write(pageContext, linkData[2]); + ListTagUtil.write(pageContext, "\" />"); + */ } + ListTagUtil.write(pageContext, "</div>"); } /** @@ -641,8 +641,6 @@ public class ListTagUtil { StringEscapeUtils.escapeHtml(filterValue))); - ListTagUtil.write(pageContext, "<td"); - ListTagUtil.write(pageContext, " align=\"left\">"); List fields = filter.getFieldNames(); if (fields == null || fields.size() == 0) { throw new JspException( @@ -678,7 +676,7 @@ public class ListTagUtil { filterValue = StringUtil.nullOrValue(filterValue); StringBuilder sb = new StringBuilder(); - sb.append("<div class=\"col-lg-6\">"); + // create a new row sb.append("<div class=\"input-group input-group-sm\">"); String placeHolder = StringUtils.defaultString(ls.getMessage("message.filterby", @@ -698,11 +696,11 @@ public class ListTagUtil { filterName)); sb.append("</button>"); sb.append("</span>"); - sb.append("</div>"); + sb.append("</div>"); ListTagUtil.write(pageContext, sb.toString()); - ListTagUtil.write(pageContext, "</td>"); + } private static String makePageLink(HttpServletRequest request, diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java index 62aa889..5659ffc 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java @@ -87,7 +87,7 @@ public class SpanTag extends TagSupport { public int doEndTag() throws JspException { ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext); ListTag parent = (ListTag) TagSupport.findAncestorWithClass(this, ListTag.class); - if (cmd.equals(ListCommand.TBL_HEADER) && role.equals("header")) { + if (cmd.equals(ListCommand.TBL_ADDONS) && role.equals("header")) { renderHeader(parent); } else if (cmd.equals(ListCommand.TBL_FOOTER) && role.equals("footer")) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java index 9408ae1..dff15b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java @@ -108,8 +108,8 @@ public class ListTagTest extends MockObjectTestCase { Stub[] cmdValues = { returnValue(ListCommand.ENUMERATE), // listtag asking returnValue(ListCommand.ENUMERATE), // columntag asking - returnValue(ListCommand.TBL_HEADER), // listtag asking - returnValue(ListCommand.TBL_HEADER), // columntag asking + returnValue(ListCommand.TBL_ADDONS), // listtag asking + returnValue(ListCommand.TBL_ADDONS), // columntag asking returnValue(ListCommand.COL_HEADER), // listtag asking returnValue(ListCommand.COL_HEADER), // columntag asking returnValue(ListCommand.RENDER), // listtag asking commit bec5fba62be32cb9fbd877a1d6ed7c57ece45e33 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Oct 11 17:22:21 2013 +0200 align the csv link to the right. May be we make it a button? diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java index d950e9d..f5f9378 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java @@ -196,7 +196,7 @@ public class CSVTag extends BodyTagSupport { private void renderExport() throws JspException { StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI); page.append("?" + makeCSVRequestParams()); - String exportLink = new String("<div class=\"spacewalk-csv-download\"><a href=\"" + + String exportLink = new String("<div class=\"spacewalk-csv-download text-right\"><a href=\"" + page + "\"><i class=\"icon-download-alt\"></i>" + LocalizationService.getInstance().getMessage( "listdisplay.csv") + "</a></div>"); commit ef761326e0f435ba0d0b0a81f6f05f14eaa9b8bc Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Oct 11 16:53:38 2013 +0200 make some space between the badge with the system count and the text in the top bar. diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 580f89c..aab71bf 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -218,7 +218,7 @@ header #bar .spacewalk-bar{ text-align: right; } header #bar .spacewalk-bar .badge{ - padding-right: .5em + margin-right: .5em } /* systems selector */ commit 4ba1f9d1017e2a5c13d99c6a3c9058cf0f50e15e Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Oct 11 16:52:25 2013 +0200 add margin only to icons in a <i> tag otherwise we deform button groups diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less index 9ec12f8..580f89c 100644 --- a/branding/css/spacewalk.less +++ b/branding/css/spacewalk.less @@ -87,10 +87,10 @@ h2{ overflow: hidden; } /* adding margin to the icons in fontawesome */ -[class^="icon-"], -[class*=" icon-"], -[class*="spacewalk-icon"], -[class^="spacewalk-icon"] { +i[class^="icon-"], +i[class*=" icon-"], +i[class*="spacewalk-icon"], +i[class^="spacewalk-icon"] { margin-right: .5em; } commit 79f9b1065e764228c2888d84e3988da5c3f4a306 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Oct 11 16:52:16 2013 +0200 syntax error in js diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 71d338e..5aaa0ad 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -4,7 +4,7 @@ $(document).on("ready", function(){ $("#sidenav ul>ul").hide(); if ($("#sidenav li").attr("class", "active")){ $(this).next("ul").show(300); - }); + }; /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is pressed or when no system is selected */ $("#clearbtn").click(hidesystemtool); commit 1c36762c62c3b9a4f7f5f464c60b9ce76fb84152 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 10 12:49:45 2013 +0200 Port most of the list widgets to output html that can be better styled with bootstrap. rl:list is now rendered inside a div. Most tables that are not data for layout are removed, and caption/tfoot are used. diff --git a/java/code/src/com/redhat/rhn/frontend/html/BaseTag.java b/java/code/src/com/redhat/rhn/frontend/html/BaseTag.java index ddbbce1..90dc302 100644 --- a/java/code/src/com/redhat/rhn/frontend/html/BaseTag.java +++ b/java/code/src/com/redhat/rhn/frontend/html/BaseTag.java @@ -27,10 +27,10 @@ import java.util.Map; * @version $Rev: 60021 $ */ public abstract class BaseTag { - private String tag; - private Map<String, String> attribs; - private List body; - private boolean spaceBeforeEndTag; + private final String tag; + private final Map<String, String> attribs; + private final List body; + private final boolean spaceBeforeEndTag; /** * Public constructor @@ -66,7 +66,16 @@ public abstract class BaseTag { } /** - * set the body of the tag + * sets the body of the tag + * @param bodyIn the new body + */ + public void setBody(String bodyIn) { + body.clear(); + body.add(bodyIn); + } + + /** + * adds to the body of the tag * @param bodyIn the new body */ public void addBody(String bodyIn) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 911004d..3e66cb8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -31,6 +31,7 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.acl.AclManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import java.io.IOException; @@ -55,7 +56,6 @@ import javax.servlet.jsp.tagext.BodyTagSupport; * The ListDisplayTag defines the structure of the ListView. This tag iterates * through the {@link com.redhat.rhn.common.db.datasource.DataResult DataResult} * contained in its parent tag, - * {@link com.redhat.rhn.frontend.taglibs.ListTag ListTag}. In the first * iteration the {@link com.redhat.rhn.frontend.taglibs.ColumnTag ColumnTags} * render the headers of the ListView, while subsequent iterations render the * data contained within the @@ -592,8 +592,8 @@ public class ListDisplayTag extends BodyTagSupport { if (request.getQueryString() != null) { page.append("&" + request.getQueryString()); } - out.println("<div class=\"csv-download\"><a href=\"" + page + - "\"><img src=\"/img/csv-16.png\"/ alt=\"\">" + + out.println("<div class=\"spacewalk-csv-download\"><a href=\"" + page + + "\"><i class=\"icon-download-alt\"></i>" + LocalizationService.getInstance().getMessage("listdisplay.csv") + "</a></div>"); } @@ -605,11 +605,9 @@ public class ListDisplayTag extends BodyTagSupport { */ private void renderTitle(JspWriter out) throws IOException { if (!StringUtils.isEmpty(title)) { - HtmlTag tr = new HtmlTag("tr"); - HtmlTag th = new HtmlTag("th"); - th.addBody(LocalizationService.getInstance().getMessage(title)); - tr.addBody(th); - out.println(tr.render()); + HtmlTag caption = new HtmlTag("caption"); + caption.addBody(LocalizationService.getInstance().getMessage(title)); + out.println(caption.render()); } } @@ -633,15 +631,21 @@ public class ListDisplayTag extends BodyTagSupport { private void renderFilterBox(JspWriter out) throws IOException { LocalizationService ls = LocalizationService.getInstance(); + HtmlTag tag = new HtmlTag("div"); - tag.setAttribute("class", "filter-input"); + tag.setAttribute("class", "spacewalk-filter-input input-group"); StringBuffer buf = new StringBuffer(); + HtmlTag input = new HtmlTag("input"); input.setAttribute("type", "text"); - input.setAttribute("size", "12"); + input.setAttribute("class", "form-control"); input.setAttribute("name", RequestContext.FILTER_STRING); input.setAttribute("value", pageList.getFilterData()); + String placeHolder = StringEscapeUtils.escapeHtml( + ls.getMessage("message.filterby", ls.getMessage(filterBy))); + input.setAttribute("placeholder", placeHolder); + buf.append(input.render()); input = new HtmlTag("input"); @@ -650,15 +654,20 @@ public class ListDisplayTag extends BodyTagSupport { input.setAttribute("value", pageList.getFilterData()); buf.append(input.render()); - input = new HtmlTag("input"); - input.setAttribute("type", "submit"); - input.setAttribute("name", FILTER_DISPATCH); - input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); - buf.append(input.render()); + HtmlTag btnSpan = new HtmlTag("span"); + btnSpan.setAttribute("class", "input-group-btn"); + HtmlTag btn = new HtmlTag("button"); + btn.setAttribute("class", "btn btn-default icon-filter"); + btn.setAttribute("type", "submit"); + btn.setAttribute("name", FILTER_DISPATCH); + //input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY)); - tag.addBody(ls.getMessage("message.filterby", ls.getMessage(filterBy)) + - buf.toString()); + btnSpan.addBody(btn); + + buf.append(btnSpan.render()); + + tag.addBody(buf.toString()); out.println(tag.render()); } @@ -683,11 +692,12 @@ public class ListDisplayTag extends BodyTagSupport { LocalizationService ls = LocalizationService.getInstance(); - HtmlTag input = new HtmlTag("input"); - input.setAttribute("type", "submit"); - input.setAttribute("name", name); - input.setAttribute("value", ls.getMessage(label)); - return input; + HtmlTag btn = new HtmlTag("button"); + btn.setAttribute("class", "btn btn-default"); + btn.setAttribute("type", "submit"); + btn.setAttribute("name", name); + btn.addBody(ls.getMessage(label)); + return btn; } @@ -704,10 +714,10 @@ public class ListDisplayTag extends BodyTagSupport { throws IOException { if (type.equals("list")) { - out.println("<table width=\"100%\" class=\"list-pagination\""); + out.println("<div class=\"spacewalk-list-pagination\""); } else { - out.println("<table class=\"list-pagination\""); + out.println("<div class=\"spacewalk-list-pagination\""); } if (tableId != null) { @@ -715,9 +725,10 @@ public class ListDisplayTag extends BodyTagSupport { } out.println(">"); - out.println("<tr>"); + + out.println("<div class=\"row\">"); // if (!showSetButtons) { - out.println("<td valign=\"middle\" width=\"90%\">"); + out.println("<div class=\"col-md-10\">"); //} //else { // out.println("<td valign=\"middle\">"); @@ -728,7 +739,7 @@ public class ListDisplayTag extends BodyTagSupport { } if (!top && set != null) { if (showSetButtons) { - out.print("<span class=\"list-selection-buttons\">"); + out.print("<span class=\"spacewalk-list-selection-btns\">"); renderSetButtons(out); out.print("</span>"); } @@ -738,8 +749,9 @@ public class ListDisplayTag extends BodyTagSupport { } - out.println("</td>"); - out.print("<td valign=\"middle\" class=\"list-infotext\">"); + out.println("</div>"); + + out.print("<div class=\"col-md-2\" class=\"list-infotext\">"); int finalResult = pageList.getEnd(); if (finalResult > pageList.getTotalSize()) { finalResult = pageList.getTotalSize(); @@ -773,47 +785,42 @@ public class ListDisplayTag extends BodyTagSupport { out.print("</span></strong>\n"); } - out.println("</td>"); + out.println("</div>"); appendButtons(out); - out.println(" </tr>\n"); - out.println("</table>"); + out.println(" </div>\n"); + out.println("</div>"); } private void appendButtons(JspWriter out) throws IOException { - out.println("<td valign=\"middle\" class=\"list-navbuttons\">"); + out.println("<div class=\"list-navbuttons\">"); boolean canGoForward = pageList.getEnd() < pageList.getTotalSize(); boolean canGoBack = pageList.getStart() > 1; if (canGoForward || canGoBack) { out.println(renderPaginationButton(FIRST, - "/img/list-allbackward", " |< ", canGoBack)); - out.println(renderPaginationButton(PREV, "/img/list-backward", + "icon-fast-backward", " |< ", canGoBack)); + out.println(renderPaginationButton(PREV, "icon-backward", " < ", canGoBack)); - out.println(renderPaginationButton(NEXT, "/img/list-forward", + out.println(renderPaginationButton(NEXT, "icon-forward", " > ", canGoForward)); out.println(renderPaginationButton(LAST, - "/img/list-allforward", " >| ", canGoForward)); + "icon-fast-forward", " >| ", canGoForward)); } - out.println("</td>\n"); + out.println("</div>\n"); } - private String renderPaginationButton(String name, String imgPrefix, + private String renderPaginationButton(String name, String icon, String text, boolean active) { - HtmlTag ret = new HtmlTag("input"); - ret.setAttribute("type", "image"); + HtmlTag ret = new HtmlTag("button"); ret.setAttribute("name", name); - ret.setAttribute("value", text); + String styleClass = String.format("btn btn-default %s", icon); - if (active) { - ret.setAttribute("class", "list-nextprev-active"); - ret.setAttribute("src", imgPrefix + ".gif"); - } - else { - ret.setAttribute("class", "list-nextprev-inactive"); - ret.setAttribute("src", imgPrefix + "-unfocused.gif"); + if (!active) { + styleClass += " disabled"; } + ret.addBody(String.format("<span class=\"sr-only\">%s</span>", text)); return ret.render(); } @@ -827,22 +834,21 @@ public class ListDisplayTag extends BodyTagSupport { } - out.println("<div align=\"right\">"); - out.println(" <hr />"); + out.println("<div class=\"text-right\">"); if (getButton() != null && AclManager.hasAcl(getButtonAcl(), (HttpServletRequest) pageContext.getRequest(), getMixins())) { - out.println("<input type=\"submit\" name=\"dispatch\" value=\"" + + out.println("<button class=\"btn btn-default\" type=\"submit\" name=\"dispatch\">" + LocalizationService.getInstance().getMessage(getButton()) + - "\" />"); + "</button>"); } if (getButton2() != null && AclManager.hasAcl(getButton2Acl(), (HttpServletRequest) pageContext.getRequest(), getMixins())) { - out.println("<input type=\"submit\" name=\"dispatch\" value=\"" + + out.println("<button class=\"btn btn-default\" type=\"submit\" name=\"dispatch\">" + LocalizationService.getInstance().getMessage(getButton2()) + - "\" />"); + "</button>"); } out.println("</div>"); @@ -926,17 +932,10 @@ public class ListDisplayTag extends BodyTagSupport { private void renderAlphabar(JspWriter out) throws IOException { StringBuffer target = new StringBuffer(); - if (type.equals("list")) { - target.append("<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"1\">"); - } - else { - target.append("<table cellspacing=\"0\" " + " cellpadding=\"1\">"); - } + target.append("<div class=\"spacewalk-alphabar\">"); - target.append("<tr valign=\"top\">"); - target.append("<td class=\"list-alphabar\"><div align=\"center\"><strong>"); - StringBuffer enabled = new StringBuffer("<a href=\""); + target.append("<ul class=\"pagination pagination-sm\">"); + StringBuffer enabled = new StringBuffer("<li><a href=\""); enabled.append("?lower={1}"); /** @@ -975,15 +974,12 @@ public class ListDisplayTag extends BodyTagSupport { } } - enabled.append("\" class=\"list-alphabar-enabled\">{0}</a>"); + enabled.append("\">{0}</a><li>"); AlphaBar ab = new AlphaBar(enabled.toString(), - "<span class=\"list-alphabar-disabled\">{0}</span>"); + "<li class=\"disabled\"><span>{0}</span></li>"); target.append(ab.getAlphaList(pageList.getIndex())); - target.append("</strong></div>"); - target.append("<br />"); - target.append("</td>"); - target.append(" </tr>"); - target.append("</table>"); + target.append("</ul>"); + target.append("</div>"); out.println(target.toString()); } @@ -1054,6 +1050,7 @@ public class ListDisplayTag extends BodyTagSupport { ////////////////////////////////////////////////////////////////////////// /** {@inheritDoc} */ + @Override public int doStartTag() throws JspException { rowCnt = 0; numItemsChecked = 0; @@ -1099,17 +1096,11 @@ public class ListDisplayTag extends BodyTagSupport { /* If the type is list, we must set the width explicitly. Otherwise, * it shouldn't matter */ - if (type.equals("list") && title == null) { - out.print("<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"0\" " + "class=\"list\""); - } - else if (type.equals("list") && title != null) { - out.print("<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"0\" " + "class=\"list list-doubleheader\""); + if (type.equals("list")) { + out.print("<table class=\"table table-striped spacewalk-list\""); } else { - out.print("<table cellspacing=\"0\" " + " cellpadding=\"0\" " + - "class=\"" + type + "\""); + out.print("<table class=\"" + type + "\""); } /*if (isTransparent()) { @@ -1122,10 +1113,10 @@ public class ListDisplayTag extends BodyTagSupport { out.println(">"); - out.println("<thead>"); - renderTitle(out); + out.println("<thead>"); + out.println("\n<tr>"); if (iterator != null && iterator.hasNext()) { @@ -1142,6 +1133,7 @@ public class ListDisplayTag extends BodyTagSupport { } /** {@inheritDoc} */ + @Override public int doEndTag() throws JspException { JspWriter out = null; try { @@ -1182,6 +1174,7 @@ public class ListDisplayTag extends BodyTagSupport { } out.println(bodyString); } + out.println("</tbody>"); /* If the type is a half-table, we must draw an extra row on the * end of the table if the reflink has been set @@ -1189,17 +1182,7 @@ public class ListDisplayTag extends BodyTagSupport { if (reflink != null) { columnCount = 0; - out.println(getTrElement(null)); - - out.print("<td style=\"text-align: center;\" " + - "class=\"first-column last-column\" "); - - - /* TODO: Make this colspan setting dynamic so that - * the reflink row display correctly for lists of - * with n columns instead of just 2 - */ - out.println("colspan=\"2\">"); + out.println("<tfoot>"); out.println("<a href=\"" + reflink + "\" >"); @@ -1221,11 +1204,10 @@ public class ListDisplayTag extends BodyTagSupport { } out.println("</a>"); - out.println("</td>"); - out.println("</tr>"); + out.println("</tfoot>"); } - out.println("</tbody>"); + out.println("</table>\n"); /* If paging is on, we render the pagination */ @@ -1250,7 +1232,7 @@ public class ListDisplayTag extends BodyTagSupport { args[2] = new Integer(pageList.getTotalSize()); args[3] = LocalizationService.getInstance().getMessage(description); - out.print("<span class=\"full-width-note-left\">\n"); + out.print("<span class=\"text-left\">\n"); out.print(LocalizationService.getInstance() .getMessage("message.range.withtypedescription", args)); out.println("</span>"); @@ -1269,6 +1251,7 @@ public class ListDisplayTag extends BodyTagSupport { } /** {@inheritDoc} */ + @Override public int doAfterBody() throws JspException { JspWriter out = null; try { @@ -1301,6 +1284,7 @@ public class ListDisplayTag extends BodyTagSupport { } /** {@inheritDoc} */ + @Override public void release() { // reset the state of the tag iterator = null; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java index 019b1f2..d950e9d 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java @@ -153,6 +153,7 @@ public class CSVTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public int doEndTag() throws JspException { setupPageData(); if ((null != exportColumns) && (null != pageData)) { @@ -165,6 +166,7 @@ public class CSVTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public int doStartTag() throws JspException { verifyEnvironment(); @@ -174,6 +176,7 @@ public class CSVTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public void release() { name = ListHelper.LIST; dataSetName = ListHelper.DATA_SET; @@ -193,8 +196,8 @@ public class CSVTag extends BodyTagSupport { private void renderExport() throws JspException { StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI); page.append("?" + makeCSVRequestParams()); - String exportLink = new String("<div class=\"csv-download\"><a href=\"" + - page + "\"><img src=\"/img/csv-16.png\" alt=\"\"/>" + + String exportLink = new String("<div class=\"spacewalk-csv-download\"><a href=\"" + + page + "\"><i class=\"icon-download-alt\"></i>" + LocalizationService.getInstance().getMessage( "listdisplay.csv") + "</a></div>"); ListTagUtil.write(pageContext, exportLink); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index dcdba55..b1eae8e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -392,23 +392,17 @@ public class ListTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public int doEndTag() throws JspException { /* If a reference link was provided, it needs to be rendered on a separate * row within the table. */ if ((refLink != null) && (!isEmpty())) { - ListTagUtil.write(pageContext, "<tr"); - renderRowClassAndId(); - ListTagUtil.write(pageContext, ">"); - - ListTagUtil.write(pageContext, "<td style=\"text-align: center;\" " + - "class=\"first-column last-column\" "); - - ListTagUtil.write(pageContext, - "colspan=" + String.valueOf(getColumnCount()) + ">"); + ListTagUtil.write(pageContext, "<tfoot>"); + ListTagUtil.write(pageContext, "<tr>"); + ListTagUtil.write(pageContext, "<td colspan=\"" + String.valueOf(getColumnCount()) + "\">"); ListTagUtil.write(pageContext, "<a href=\"" + refLink + "\" >"); - /* Here we render the reflink and its key. If the key hasn't been set * we just display the link address itself. */ @@ -428,10 +422,13 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, "</a>"); ListTagUtil.write(pageContext, "</td>"); ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "</tfoot>"); } + ListTagUtil.write(pageContext, "</table>"); renderPaginationControls(true); + ListTagUtil.write(pageContext, "</div>"); ListTagUtil.write(pageContext, ""); release(); return BodyTagSupport.EVAL_PAGE; @@ -440,6 +437,7 @@ public class ListTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public int doAfterBody() throws JspException { int retval = BodyTagSupport.EVAL_BODY_AGAIN; @@ -610,6 +608,7 @@ public class ListTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public int doStartTag() throws JspException { verifyEnvironment(); addDecorator(decoratorName); @@ -619,7 +618,9 @@ public class ListTag extends BodyTagSupport { (HttpServletRequest) pageContext.getRequest(), getUniqueName(), isParentAnElement(), searchParent, searchChild); int retval = BodyTagSupport.EVAL_BODY_INCLUDE; - emitId(); + + ListTagUtil.write(pageContext, ""); + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list\" id=\"" + getUniqueName() + "\">"); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.ENUMERATE); @@ -684,6 +685,7 @@ public class ListTag extends BodyTagSupport { /** * ${@inheritDoc} */ + @Override public void release() { if (pageContext.getAttribute("current") != null) { pageContext.removeAttribute("current"); @@ -760,14 +762,8 @@ public class ListTag extends BodyTagSupport { } } - private void emitId() throws JspException { - ListTagUtil.write(pageContext, "\n"); - } - private void startTable() throws JspException { - ListTagUtil.write(pageContext, "<table class=\"table table-stripped\""); + ListTagUtil.write(pageContext, "<table class=\"table table-striped\""); if (styleClass != null) { ListTagUtil.write(pageContext, " class=\""); ListTagUtil.write(pageContext, styleClass); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 1f52275..d06764a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -679,22 +679,23 @@ public class ListTagUtil { StringBuilder sb = new StringBuilder(); sb.append("<div class=\"col-lg-6\">"); - sb.append("<div class=\"input-group\">"); - sb.append(String.format("<span class=\"input-group-addon\">%s</span>", - ls.getMessage("message.filterby", - fields.get(0).toString()))); + sb.append("<div class=\"input-group input-group-sm\">"); + + String placeHolder = StringUtils.defaultString(ls.getMessage("message.filterby", + fields.get(0).toString())); sb.append(String.format("<input autofocus=\"autofocus\" type=\"text\" " + - " name=\"%s\" value=\"%s\" class=\"form-control\"/>", + " name=\"%s\" value=\"%s\" class=\"form-control\" placeholder=\"%s\"/>", filterValueKey, (filterValue != null ? StringEscapeUtils.escapeHtml(filterValue) : - ""))); + ""), + StringEscapeUtils.escapeHtml(placeHolder) + )); sb.append("<span class=\"input-group-btn\">"); sb.append(String.format("<button value=\"%s\" type=\"submit\" name=\"%s\" " + - " class=\"btn btn-default\">%s", + " class=\"btn btn-default\"><i class=\"icon-filter\"></i>", ls.getMessage(RequestContext.FILTER_KEY), - filterName, - ls.getMessage(RequestContext.FILTER_KEY))); + filterName)); sb.append("</button>"); sb.append("</span>"); sb.append("</div>"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java index 9ea6fe8..66e1e04 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; import javax.servlet.jsp.JspException; @@ -38,6 +39,7 @@ public class AddToSsmDecorator extends BaseListDecorator { public static final String PARAM_CLEAR_SSM = "clear-ssm-first"; /** {@inheritDoc} */ + @Override public void afterList() throws JspException { if (!currentList.isEmpty()) { @@ -51,20 +53,30 @@ public class AddToSsmDecorator extends BaseListDecorator { // Generate the HTML to output StringBuffer buf = new StringBuffer(); - buf.append("<span class=\"list-selection-buttons\">"); + buf.append("<span class=\"spacewalk-list-selection-btns\">"); // Add to SSM button - HtmlTag tag = new HtmlTag("input"); + HtmlTag tag = new HtmlTag("button"); + tag.setAttribute("class", "btn btn-default"); tag.setAttribute("type", "submit"); tag.setAttribute("name", buttonName); tag.setAttribute("value", value); + tag.setBody(value); buf.append(tag.render()).append(" "); // Checkbox for whether or not to clear the existing SSM servers tag = new HtmlTag("input"); + String uId = TagHelper.generateUniqueName("chkbox-clear-ssm"); + tag.setAttribute("id", uId); tag.setAttribute("type", "checkbox"); tag.setAttribute("name", PARAM_CLEAR_SSM); - buf.append(tag.render()).append(clearText).append(" "); + + HtmlTag lbl = new HtmlTag("label"); + lbl.setAttribute("for", uId); + lbl.setBody(clearText); + + buf.append(tag.render()); + buf.append(lbl.render()); buf.append("</span>"); ListTagUtil.write(pageContext, buf.toString()); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java index de651bd..24276b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java @@ -39,6 +39,7 @@ public class SelectableDecorator extends BaseListDecorator { /** * {@inheritDoc} */ + @Override public void beforeList() throws JspException { ListTagUtil.write(pageContext, "<input type=\"hidden\" name=\"list_" + listName + "_all\" value=\"false\" id=\"" + "list_" + listName + @@ -51,6 +52,7 @@ public class SelectableDecorator extends BaseListDecorator { /** * {@inheritDoc} */ + @Override public void afterTopPagination() throws JspException { renderSelectedCaption(true); } @@ -58,6 +60,7 @@ public class SelectableDecorator extends BaseListDecorator { /** * {@inheritDoc} */ + @Override public void afterBottomPagination() throws JspException { renderSelectedCaption(false); } @@ -65,6 +68,7 @@ public class SelectableDecorator extends BaseListDecorator { /** * {@inheritDoc} */ + @Override public void afterList() throws JspException { renderSelectButtons(); String script = SelectableColumnTag. @@ -107,19 +111,22 @@ public class SelectableDecorator extends BaseListDecorator { private void renderSelectButtons() throws JspException { if (!currentList.isEmpty()) { StringBuffer buf = new StringBuffer(); - buf.append("<span class=\"list-selection-buttons\">"); + buf.append("<span class=\"spacewalk-list-selection-btns\">"); String buttonName = ListTagUtil.makeSelectActionName(listName); LocalizationService ls = LocalizationService.getInstance(); - HtmlTag tag = new HtmlTag("input"); + HtmlTag tag = new HtmlTag("button"); + tag.setAttribute("class", "btn btn-default"); tag.setAttribute("type", "submit"); tag.setAttribute("name", buttonName); tag.setAttribute("value", ls.getMessage(ListDisplayTag.UPDATE_LIST_KEY)); tag.setAttribute("id", "update_list_key_id"); + tag.setBody(ls.getMessage(ListDisplayTag.UPDATE_LIST_KEY)); buf.append(tag.render()).append(" "); tag.setAttribute("value", ls.getMessage(ListDisplayTag.SELECT_ALL_KEY)); + tag.setBody(ls.getMessage(ListDisplayTag.SELECT_ALL_KEY)); buf.append(tag.render()).append(" "); String selectedName = ListTagUtil.makeSelectedAmountName(listName); @@ -127,6 +134,7 @@ public class SelectableDecorator extends BaseListDecorator { if (!NULL_SELECTION.equals(selected) && selected != null) { tag.setAttribute("value", ls.getMessage(ListDisplayTag.UNSELECT_ALL_KEY)); + tag.setBody(ls.getMessage(ListDisplayTag.UNSELECT_ALL_KEY)); buf.append(tag.render()).append("\n"); } buf.append("</span>"); commit cc12a6be0f3058c26709ce419b5e49e0c37f4620 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Oct 7 15:29:58 2013 +0200 port the alphabar to twitter bootstrap diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java index 1071971..6606059 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java @@ -84,13 +84,10 @@ public class AlphaBarHelper { public void writeAlphaBar(PageContext pageContext, Set<Character> activeChars, String listName) throws JspException { - ListTagUtil.write(pageContext, "<br />"); ListTagUtil.write(pageContext, - "<table width=\"100%\" cellspacing=\"0\"" + - " cellpadding=\"1\">"); - ListTagUtil.write(pageContext, "<tr valign=\"top\">"); - ListTagUtil.write(pageContext, "<td class=\"list-alphabar\">" + - "<div align=\"center\"><strong>"); + "<div class=\"spacewalk-alphabar\">"); + ListTagUtil.write(pageContext, + "<ul class=\"pagination pagination-sm\">"); List<String> alphabet = LocalizationService.getInstance().getAlphabet(); List<String> numbers = LocalizationService.getInstance().getDigits(); @@ -117,11 +114,8 @@ public class AlphaBarHelper { } } - ListTagUtil.write(pageContext, "</strong></div>"); - ListTagUtil.write(pageContext, "<br />"); - ListTagUtil.write(pageContext, "</td>"); - ListTagUtil.write(pageContext, " </tr>"); - ListTagUtil.write(pageContext, "</table>"); + ListTagUtil.write(pageContext, "</ul>"); + ListTagUtil.write(pageContext, "</div>"); } private String renderEnabledAlpha(char alpha, @@ -130,18 +124,18 @@ public class AlphaBarHelper { Map <String, String> params = new HashMap<String, String>(); params.put(makeAlphaKey(listName), String.valueOf(alpha)); - StringBuilder enabled = new StringBuilder("<a href=\""); + StringBuilder enabled = new StringBuilder("<li><a href=\""); List ignoreList = new ArrayList(); ignoreList.add("submitted"); enabled.append(ListTagUtil.makeParamsLink(request, listName, params, ignoreList)); - enabled.append("\""); - enabled.append(" class=\"list-alphabar-enabled\">" + alpha + "</a>"); + enabled.append("\">"); + enabled.append(alpha + "</a></li>"); return enabled.toString(); } private String renderDisabledAlph(char alpha) { - return "<span class=\"list-alphabar-disabled\">" + alpha + "</span>"; + return "<li class=\"disabled\"><a href=\"#\">" + alpha + "</a></li>"; } }

1 0

Changes to 'refs/tags/spacewalk-koan-2.1.3-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacewalk-koan-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:27 +0000 Tagging package [spacewalk-koan] version [2.1.3-1] in directory [client/tools/spacewalk-koan/]. Changes since spacewalk-certs-tools-2.1.4-1: Michael Mraka (1): Automatic commit of package [spacewalk-koan] release [2.1.3-1]. --- client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 14 Oct '13

14 Oct '13

client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b55080eae1738cfaf52debf6bb2d27ccb92dc91a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:27:12 2013 +0200 Automatic commit of package [spacewalk-koan] release [2.1.3-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index 831c90f..2a790cc 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 +- cleaning up old svn Ids + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 - removed trailing whitespaces diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index b4e309b..a5bf460 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -2.1.2-1 client/tools/spacewalk-koan/ +2.1.3-1 client/tools/spacewalk-koan/

1 0

Changes to 'refs/tags/spacewalk-certs-tools-2.1.4-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacewalk-certs-tools-2.1.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:26 +0000 Tagging package [spacewalk-certs-tools] version [2.1.4-1] in directory [spacewalk/certs-tools/]. Changes since rhnclient-5.5.8-1: Michael Mraka (1): Automatic commit of package [spacewalk-certs-tools] release [2.1.4-1]. --- rel-eng/packages/spacewalk-certs-tools | 2 +- spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/certs-tools
by Michael Mraka 14 Oct '13

14 Oct '13

rel-eng/packages/spacewalk-certs-tools | 2 +- spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 406250baf54217a8df2ef3f883d4a2cc347eb422 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:26:48 2013 +0200 Automatic commit of package [spacewalk-certs-tools] release [2.1.4-1]. diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools index e9546fe..7c8aaf0 100644 --- a/rel-eng/packages/spacewalk-certs-tools +++ b/rel-eng/packages/spacewalk-certs-tools @@ -1 +1 @@ -2.1.3-1 spacewalk/certs-tools/ +2.1.4-1 spacewalk/certs-tools/ diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec index 213feac..731b4df 100644 --- a/spacewalk/certs-tools/spacewalk-certs-tools.spec +++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec @@ -2,7 +2,7 @@ Name: spacewalk-certs-tools Summary: Spacewalk SSL Key/Cert Tool Group: Applications/Internet License: GPLv2 -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/www/html/pub/bootstrap/client_config_update.py* %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1 +- cleaning up old svn Ids + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 - removed trailing whitespaces

1 0

Changes to 'refs/tags/rhnclient-5.5.8-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'rhnclient-5.5.8-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:26 +0000 Tagging package [rhnclient] version [5.5.8-1] in directory [client/solaris/rhnclient/]. Changes since spacewalk-admin-2.1.2-1: Michael Mraka (1): Automatic commit of package [rhnclient] release [5.5.8-1]. --- client/solaris/rhnclient/rhnclient.spec | 5 ++++- client/solaris/rhnclient/setup.py | 2 +- rel-eng/packages/rhnclient | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

client/solaris rel-eng/packages
by Michael Mraka 14 Oct '13

14 Oct '13

client/solaris/rhnclient/rhnclient.spec | 5 ++++- client/solaris/rhnclient/setup.py | 2 +- rel-eng/packages/rhnclient | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 24444416dfd620d1c46e1faa3be014ce7988310d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:26:30 2013 +0200 Automatic commit of package [rhnclient] release [5.5.8-1]. diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec index b39d5ab..e08ce97 100644 --- a/client/solaris/rhnclient/rhnclient.spec +++ b/client/solaris/rhnclient/rhnclient.spec @@ -5,7 +5,7 @@ Summary: Spacewalk Client Utilities and Libraries Name: rhnclient Source0: %{name}-%{version}.tar.gz -Version: 5.5.7 +Version: 5.5.8 Release: 1 License: GPLv2 Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT #%doc ChangeLog COPYING README TODO %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.8-1 +- cleaning up old svn Ids + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.7-1 - removed trailing whitespaces diff --git a/client/solaris/rhnclient/setup.py b/client/solaris/rhnclient/setup.py index 9145540..67f927f 100644 --- a/client/solaris/rhnclient/setup.py +++ b/client/solaris/rhnclient/setup.py @@ -7,7 +7,7 @@ from spacewalk.common.rhnConfig import CFG, initCFG initCFG('web') setup(name = "rhnclient", - version = "5.5.7", + version = "5.5.8", description = CFG.PRODUCT_NAME + " Client Utilities and Libraries", long_description = CFG.PRODUCT_NAME + """\ Client Utilities diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient index 2bfb144..3897291 100644 --- a/rel-eng/packages/rhnclient +++ b/rel-eng/packages/rhnclient @@ -1 +1 @@ -5.5.7-1 client/solaris/rhnclient/ +5.5.8-1 client/solaris/rhnclient/

1 0

Changes to 'refs/tags/spacewalk-admin-2.1.2-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacewalk-admin-2.1.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:26 +0000 Tagging package [spacewalk-admin] version [2.1.2-1] in directory [spacewalk/admin/]. Changes since spacecmd-2.1.12-1: Michael Mraka (1): Automatic commit of package [spacewalk-admin] release [2.1.2-1]. --- rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/admin
by Michael Mraka 14 Oct '13

14 Oct '13

rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit ae290662160c1880bced0ad21652380b37f5f2b2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:26:13 2013 +0200 Automatic commit of package [spacewalk-admin] release [2.1.2-1]. diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin index 0d217a6..c243746 100644 --- a/rel-eng/packages/spacewalk-admin +++ b/rel-eng/packages/spacewalk-admin @@ -1 +1 @@ -2.1.1-1 spacewalk/admin/ +2.1.2-1 spacewalk/admin/ diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec index 2617483..3cf09dc 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -2,7 +2,7 @@ Summary: Various utility scripts and data files for Red Hat Satellite installations Name: spacewalk-admin URL: https://fedorahosted.org/spacewalk -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz License: GPLv2 @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 +- cleaning up old svn Ids + * Thu Aug 08 2013 Jan Dobes 2.1.1-1 - fixing decrementation - 972626 - general waiting function

1 0

Changes to 'refs/tags/spacecmd-2.1.12-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacecmd-2.1.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:25 +0000 Tagging package [spacecmd] version [2.1.12-1] in directory [spacecmd/]. Changes since spacewalk-java-2.1.54-1: Michael Mraka (1): Automatic commit of package [spacecmd] release [2.1.12-1]. --- rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacecmd/spacecmd.spec
by Michael Mraka 14 Oct '13

14 Oct '13

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 66a895c856a4b243d6f77f86bd5203fa07f98666 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:25:39 2013 +0200 Automatic commit of package [spacecmd] release [2.1.12-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index f7438dd..053c50e 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.11-1 spacecmd/ +2.1.12-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index 75e2158..58cc9e4 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1 +- fix typo in a comment + * Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 - spacecmd: Fix session validation

1 0

Changes to 'refs/tags/spacewalk-java-2.1.54-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacewalk-java-2.1.54-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:25 +0000 Tagging package [spacewalk-java] version [2.1.54-1] in directory [java/]. Changes since spacewalk-reports-2.1.14-1: Michael Mraka (1): Automatic commit of package [spacewalk-java] release [2.1.54-1]. --- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 14 Oct '13

14 Oct '13

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 5c89a47721f27f0c1a43190433306a12ff46f047 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:25:22 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.54-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0ba8ab9..50b289d 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.53 +Version: 2.1.54 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.54-1 +- cleaning up old svn Ids + * Mon Oct 07 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.53-1 - 1012951 - Revert "removing unused string with trans-id 'file_lists.added'" - 1012951 - Revert "removing unused string with trans-id 'file_lists.removed'" diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 17cd3f7..ece6882 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.53-1 java/ +2.1.54-1 java/

1 0

Changes to 'refs/tags/spacewalk-reports-2.1.14-1'
by Michael Mraka 14 Oct '13

14 Oct '13

Tag 'spacewalk-reports-2.1.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-14 07:25 +0000 Tagging package [spacewalk-reports] version [2.1.14-1] in directory [reporting/]. Changes since spacewalk-oscap-0.0.21-1: Michael Mraka (1): Automatic commit of package [spacewalk-reports] release [2.1.14-1]. --- rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Michael Mraka 14 Oct '13

14 Oct '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 47f7f515d3a82a01a8e44858233075c00fb765fd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 14 09:25:10 2013 +0200 Automatic commit of package [spacewalk-reports] release [2.1.14-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index 33eb8af..8b56d2a 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -2.1.13-1 reporting/ +2.1.14-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index a607467..2df5947 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 2.1.13 +Version: 2.1.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.14-1 +- fixing indentation - expandtabs vs noexpandtab + * Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.13-1 - 1012261 - report system virtualization type - 1009462 - display error message for --(like|where)=<column-id>

1 0

Changes to 'refs/tags/spacewalk-oscap-0.0.21-1'
by Šimon Lukašík 11 Oct '13

11 Oct '13

Tag 'spacewalk-oscap-0.0.21-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-10-11 12:49 +0000 Tagging package [spacewalk-oscap] version [0.0.21-1] in directory [client/rhel/spacewalk-oscap/]. Changes since rhnpush-5.5.71-1: Simon Lukasik (2): 1009512 - redirect stdout of xsltproc to /dev/null Automatic commit of package [spacewalk-oscap] release [0.0.21-1]. --- client/rhel/spacewalk-oscap/scap.py | 17 +++++++++++++---- client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Šimon Lukašík 11 Oct '13

11 Oct '13

client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 49699bccab48a902d00699c2b494523113dccab2 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Fri Oct 11 14:49:48 2013 +0200 Automatic commit of package [spacewalk-oscap] release [0.0.21-1]. diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec index c366a72..64f6e73 100644 --- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec +++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec @@ -1,5 +1,5 @@ Name: spacewalk-oscap -Version: 0.0.20 +Version: 0.0.21 Release: 1%{?dist} Summary: OpenSCAP plug-in for rhn-check @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 11 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.21-1 +- 1009512 - redirect stdout of xsltproc to /dev/null + * Tue Sep 10 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.20-1 - 1006383 - redirect stdout of oscap to /dev/null diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap index efe3f53..a92e643 100644 --- a/rel-eng/packages/spacewalk-oscap +++ b/rel-eng/packages/spacewalk-oscap @@ -1 +1 @@ -0.0.20-1 client/rhel/spacewalk-oscap/ +0.0.21-1 client/rhel/spacewalk-oscap/

1 0

client/rhel
by Šimon Lukašík 11 Oct '13

11 Oct '13

client/rhel/spacewalk-oscap/scap.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit cc9a2a119ff3519dca56ed1e6f2b189a98a8f024 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Fri Oct 11 14:32:39 2013 +0200 1009512 - redirect stdout of xsltproc to /dev/null Do not try to capture the output in the memory. It may get full and cause oscap's flush() operation to hang out. Like: #0 0x0000003c85edb690 in __write_nocancel () from /lib64/libc.so.6 #1 0x0000003c85e71d93 in _IO_new_file_write () from /lib64/libc.so.6 #2 0x0000003c85e73345 in _IO_new_do_write () from /lib64/libc.so.6 #3 0x0000003c85e71a0d in _IO_new_file_xsputn () from /lib64/libc.so.6 #4 0x0000003c85e67d0d in fwrite () from /lib64/libc.so.6 (...) Related: 56f4bc473665b617e8fc23739fb43740c647d274 diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py index 21af704..f2c50e5 100644 --- a/client/rhel/spacewalk-oscap/scap.py +++ b/client/rhel/spacewalk-oscap/scap.py @@ -38,7 +38,7 @@ def xccdf_eval(args, cache_only=None): _cleanup_temp(results_dir) return (1, 'oscap tool did not produce valid xml.\n' + oscap_err, {}) - ret, resume, xslt_err = _xccdf_resume(results_file.name) + ret, resume, xslt_err = _xccdf_resume(results_file.name, temp_dir=results_dir) if ret != 0 or resume == '': del(results_file) _cleanup_temp(results_dir) @@ -68,15 +68,24 @@ def _run_oscap(arguments): log.log_debug('The oscap tool completed\n%s' % errors) return errors -def _xccdf_resume(results_file): +def _xccdf_resume(results_file, temp_dir=None): xslt = '/usr/share/openscap/xsl/xccdf-resume.xslt' - c = _popen(['/usr/bin/xsltproc', xslt, results_file]) + + dev_null = open('/dev/null') + resume_file = tempfile.NamedTemporaryFile(dir=temp_dir) + c = _popen(['/usr/bin/xsltproc', '--output', resume_file.name, + xslt, results_file], stdout=dev_null.fileno()) ret = c.wait() + dev_null.close() + errors = c.stderr.read() if ret != 0: errors += 'xccdf_eval: xsltproc tool returned %i\n' % ret log.log_debug('The xsltproc tool completed:\n%s' % errors) - return ret, c.stdout.read(), errors + + resume = resume_file.read() + del(resume_file) + return ret, resume, errors def _popen(args, stdout=subprocess.PIPE): log.log_debug('Running: ' + str(args))

1 0

Changes to 'refs/tags/rhnpush-5.5.71-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'rhnpush-5.5.71-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:03 +0000 Tagging package [rhnpush] version [5.5.71-1] in directory [client/tools/rhnpush/]. Changes since rhncfg-5.10.65-1: Michael Mraka (1): Automatic commit of package [rhnpush] release [5.5.71-1]. --- client/tools/rhnpush/rhnpush.spec | 5 ++++- rel-eng/packages/rhnpush | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/tools/rhnpush/rhnpush.spec | 5 ++++- rel-eng/packages/rhnpush | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 60752f4095e4a8d00ee30b07f5971d3dc3525d1b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:03:49 2013 +0200 Automatic commit of package [rhnpush] release [5.5.71-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index c30606a..2f1fdec 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -4,7 +4,7 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.70 +Version: 5.5.71 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %doc COPYING %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.71-1 +- cleaning up old svn Ids + * Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.70-1 - fixed pylint deprecated-lambda warning diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index ff35588..340b702 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.5.70-1 client/tools/rhnpush/ +5.5.71-1 client/tools/rhnpush/

1 0

Changes to 'refs/tags/rhncfg-5.10.65-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'rhncfg-5.10.65-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:03 +0000 Tagging package [rhncfg] version [5.10.65-1] in directory [client/tools/rhncfg/]. Changes since rhn-custom-info-5.4.20-1: Michael Mraka (1): Automatic commit of package [rhncfg] release [5.10.65-1]. --- client/tools/rhncfg/rhncfg.spec | 5 ++++- rel-eng/packages/rhncfg | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/tools/rhncfg/rhncfg.spec | 5 ++++- rel-eng/packages/rhncfg | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9d3d4b1b4e10e27b8fb142e8b4718817ec897cbf Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:03:30 2013 +0200 Automatic commit of package [rhncfg] release [5.10.65-1]. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index 84ca5b77..503bc9e 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -8,7 +8,7 @@ Group: Applications/System License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.64 +Version: 5.10.65 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -119,6 +119,9 @@ fi %ghost %attr(600,root,root) %{_localstatedir}/log/rhncfg-actions %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.65-1 +- cleaning up old svn Ids + * Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.64-1 - Adding fallback support for numeric UID/GID diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg index db0dade..6802a05 100644 --- a/rel-eng/packages/rhncfg +++ b/rel-eng/packages/rhncfg @@ -1 +1 @@ -5.10.64-1 client/tools/rhncfg/ +5.10.65-1 client/tools/rhncfg/

1 0

Changes to 'refs/tags/rhn-custom-info-5.4.20-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'rhn-custom-info-5.4.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:03 +0000 Tagging package [rhn-custom-info] version [5.4.20-1] in directory [client/tools/rhncustominfo/]. Changes since osad-5.11.30-1: Michael Mraka (1): Automatic commit of package [rhn-custom-info] release [5.4.20-1]. --- client/tools/rhncustominfo/rhn-custom-info.spec | 5 ++++- rel-eng/packages/rhn-custom-info | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/tools/rhncustominfo/rhn-custom-info.spec | 5 ++++- rel-eng/packages/rhn-custom-info | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit c45ab835e3035b71d82851df93e32d9156ecc79e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:03:12 2013 +0200 Automatic commit of package [rhn-custom-info] release [5.4.20-1]. diff --git a/client/tools/rhncustominfo/rhn-custom-info.spec b/client/tools/rhncustominfo/rhn-custom-info.spec index 247d501..4891bb9 100644 --- a/client/tools/rhncustominfo/rhn-custom-info.spec +++ b/client/tools/rhncustominfo/rhn-custom-info.spec @@ -4,7 +4,7 @@ Group: Applications/System License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk -Version: 5.4.19 +Version: 5.4.20 Release: 1%{?dist} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/rhn-custom-info.* %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.4.20-1 +- cleaning up old svn Ids + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.4.19-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhn-custom-info b/rel-eng/packages/rhn-custom-info index c9ea16b..2dbedb5 100644 --- a/rel-eng/packages/rhn-custom-info +++ b/rel-eng/packages/rhn-custom-info @@ -1 +1 @@ -5.4.19-1 client/tools/rhncustominfo/ +5.4.20-1 client/tools/rhncustominfo/

1 0

Changes to 'refs/tags/osad-5.11.30-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'osad-5.11.30-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:02 +0000 Tagging package [osad] version [5.11.30-1] in directory [client/tools/osad/]. Changes since rhnsd-5.0.14-1: Michael Mraka (1): Automatic commit of package [osad] release [5.11.30-1]. --- client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 155f027e3947c761875e2a613e7c4fbe139da24d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:02:44 2013 +0200 Automatic commit of package [osad] release [5.11.30-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 49c7e0e..bf50963 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -17,7 +17,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.11.29 +Version: 5.11.30 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -388,6 +388,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.30-1 +- cleaning up old svn Ids + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.29-1 - removed trailing whitespaces diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index d2c3e4a..af2e46f 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.11.29-1 client/tools/osad/ +5.11.30-1 client/tools/osad/

1 0

Changes to 'refs/tags/rhnsd-5.0.14-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'rhnsd-5.0.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:02 +0000 Tagging package [rhnsd] version [5.0.14-1] in directory [client/rhel/rhnsd/]. Changes since rhnlib-2.5.69-1: Michael Mraka (1): Automatic commit of package [rhnsd] release [5.0.14-1]. --- client/rhel/rhnsd/rhnsd.spec | 5 ++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/rhel/rhnsd/rhnsd.spec | 5 ++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 62b819c4ae345f4b3a15fb8acb71b84ed218efc3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:02:11 2013 +0200 Automatic commit of package [rhnsd] release [5.0.14-1]. diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index f39abb6..8c10e47 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhnsd -Version: 5.0.13 +Version: 5.0.14 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -138,6 +138,9 @@ rm -fr $RPM_BUILD_ROOT %doc LICENSE %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.0.14-1 +- cleaning up old svn Ids + * Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.0.13-1 - removed old CVS/SVN version ids diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index 54ca7d0..ad5f1e3 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -5.0.13-1 client/rhel/rhnsd/ +5.0.14-1 client/rhel/rhnsd/

1 0

Changes to 'refs/tags/rhnlib-2.5.69-1'
by Michael Mraka 10 Oct '13

10 Oct '13

Tag 'rhnlib-2.5.69-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-10 08:01 +0000 Tagging package [rhnlib] version [2.5.69-1] in directory [client/rhel/rhnlib/]. Changes since rhn-client-tools-2.1.10-1: Michael Mraka (1): Automatic commit of package [rhnlib] release [2.5.69-1]. --- client/rhel/rhnlib/rhnlib.spec | 5 ++++- rel-eng/packages/rhnlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Michael Mraka 10 Oct '13

10 Oct '13

client/rhel/rhnlib/rhnlib.spec | 5 ++++- rel-eng/packages/rhnlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 29e727f904ca4b14f6c7908df15801cddf96131f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 10 10:01:39 2013 +0200 Automatic commit of package [rhnlib] release [2.5.69-1]. diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec index 9389ee6..e21f069 100644 --- a/client/rhel/rhnlib/rhnlib.spec +++ b/client/rhel/rhnlib/rhnlib.spec @@ -4,7 +4,7 @@ Summary: Python libraries for the Spacewalk project Name: rhnlib URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.5.68 +Version: 2.5.69 Release: 1%{?dist} Group: Development/Libraries @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.69-1 +- cleaning up old svn Ids + * Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.68-1 - Python: fixed UserDictCase behaviour when key is not found diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib index 473a74f..b5da808 100644 --- a/rel-eng/packages/rhnlib +++ b/rel-eng/packages/rhnlib @@ -1 +1 @@ -2.5.68-1 client/rhel/rhnlib/ +2.5.69-1 client/rhel/rhnlib/

1 0

Changes to 'refs/tags/rhn-client-tools-2.1.10-1'
by Milan Zazrivec 09 Oct '13

09 Oct '13

Tag 'rhn-client-tools-2.1.10-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-10-09 14:30 +0000 Tagging package [rhn-client-tools] version [2.1.10-1] in directory [client/rhel/rhn-client-tools/]. Changes since spacewalk-proxy-installer-2.1.6-1: Milan Zazrivec (3): 1017249 - GUI rhn_register: string polish 1017249 - TUI rhn_register: string polish Automatic commit of package [rhn-client-tools] release [2.1.10-1]. --- client/rhel/rhn-client-tools/data/rh_register.glade | 2 +- client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 8 +++----- rel-eng/packages/rhn-client-tools | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Milan Zazrivec 09 Oct '13

09 Oct '13

client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 47fd9a7fe87e2b0d225ebc5b1da24b199136d57b Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Oct 9 16:30:08 2013 +0200 Automatic commit of package [rhn-client-tools] release [2.1.10-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index fb850c5..1b97940 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 2.1.9 +Version: 2.1.10 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -357,6 +357,10 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Wed Oct 09 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.10-1 +- 1017249 - TUI rhn_register: string polish +- 1017249 - GUI rhn_register: string polish + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.9-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index a11c1f6..aca9d37 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -2.1.9-1 client/rhel/rhn-client-tools/ +2.1.10-1 client/rhel/rhn-client-tools/

1 0

2 commits - client/rhel
by Milan Zazrivec 09 Oct '13

09 Oct '13

client/rhel/rhn-client-tools/data/rh_register.glade | 2 +- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) New commits: commit b9c07e442f309cffec29d1ce656fa11fcf69182c Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Oct 9 16:26:08 2013 +0200 1017249 - TUI rhn_register: string polish The term "re-register" is technically incorrect. diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 23f41fd..41f7b27 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -129,11 +129,9 @@ SYSTEM_ALREADY_SETUP = _("System Already Registered") SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:") SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") -RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered with RHN Classic/Red Hat Satellite" - " using Red Hat certficate-based technology.\n\n" - "The tool you are using is attempting to re-register " - "using Red Hat Satellite or Red Hat Satellite Proxy technology. Red Hat recommends " - "(except in a few cases) that customers only register with Red Hat Satellie once.\n\n" +RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered using Red Hat Subscription Management.\n\n" + "Your system is being registered again using Red Hat Satellite" + " or Red Hat Satellite Proxy technology. Red Hat recommends that customers only register once.\n\n" "To learn more about RHN Classic/Red Hat Satellite registration and technologies please consult this" " Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563") commit dc73d00b07fed3d06d405db52e7ee7395024573b Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Oct 9 16:02:44 2013 +0200 1017249 - GUI rhn_register: string polish The term "re-register" is technically incorrect. diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade index d3b2ba7..c9c5b0a 100644 --- a/client/rhel/rhn-client-tools/data/rh_register.glade +++ b/client/rhel/rhn-client-tools/data/rh_register.glade @@ -4978,7 +4978,7 @@ Are you sure you would like to continue?</property> <child> <widget class="GtkLabel" id="label73"> <property name="visible">True</property> - <property name="label" translatable="yes">The tool you are using is attempting to re-register using RHN Classic technology. Red Hat recommends (except in a few cases) that customers only register with RHN once.</property> + <property name="label" translatable="yes">Your system is being registered again using RHN Classic technology. Red Hat recommends that customers only register once.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property>

1 0

Changes to 'refs/tags/spacewalk-proxy-installer-2.1.6-1'
by mkollar 09 Oct '13

09 Oct '13

Tag 'spacewalk-proxy-installer-2.1.6-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-09 12:55 +0000 Tagging package [spacewalk-proxy-installer] version [2.1.6-1] in directory [proxy/installer/]. Changes since spacewalk-web-2.1.24-1: Matej Kollar (1): Automatic commit of package [spacewalk-proxy-installer] release [2.1.6-1]. --- proxy/installer/spacewalk-proxy-installer.spec | 8 +++++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---

1 0

proxy/installer rel-eng/packages
by mkollar 09 Oct '13

09 Oct '13

proxy/installer/spacewalk-proxy-installer.spec | 8 +++++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 33cde7234dc5bf42364ca47d4e1693abc8e498e9 Author: Matej Kollar <mkollar(a)redhat.com> Date: Wed Oct 9 14:55:56 2013 +0200 Automatic commit of package [spacewalk-proxy-installer] release [2.1.6-1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index 669f4bb..ea2d3d9 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 2.1.5 +Version: 2.1.6 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -97,6 +97,12 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn %doc LICENSE answers.txt %changelog +* Wed Oct 09 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.6-1 +- Honour behavior described in help +- Revert "Removed set_value as getopt made it redundant" +- Removing unhealthy options RHN_PARENT and CA_CHAIN +- fixed typo + * Mon Oct 07 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.5-1 - Removed set_value as getopt made it redundant - 516296 - Allow truly non-interactive proxy install diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index 5b4c4ce..076d8e8 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -2.1.5-1 proxy/installer/ +2.1.6-1 proxy/installer/

1 0

Changes to 'refs/tags/spacewalk-web-2.1.24-1'
by Michael Mraka 09 Oct '13

09 Oct '13

Tag 'spacewalk-web-2.1.24-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-09 12:01 +0000 Tagging package [spacewalk-web] version [2.1.24-1] in directory [web/]. Changes since spacewalk-utils-2.1.21-1: Michael Mraka (1): Automatic commit of package [spacewalk-web] release [2.1.24-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Michael Mraka 09 Oct '13

09 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 05f430344eb708a00260dd59e134f5619260f060 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 9 14:01:23 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.24-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index dce5e38..607a390 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.23-1 web/ +2.1.24-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 2df736f..cf986d8 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.23 +Version: 2.1.24 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -271,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Oct 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.24-1 +- cleaning up old svn Ids + * Mon Oct 07 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.23-1 - Revert "removing Perl reboot system page" - Revert "removing Perl code associated with reboot system page"

1 0

Changes to 'refs/tags/spacewalk-utils-2.1.21-1'
by Michael Mraka 09 Oct '13

09 Oct '13

Tag 'spacewalk-utils-2.1.21-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-09 12:00 +0000 Tagging package [spacewalk-utils] version [2.1.21-1] in directory [utils/]. Changes since spacewalk-backend-2.1.27-1: Michael Mraka (1): Automatic commit of package [spacewalk-utils] release [2.1.21-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka 09 Oct '13

09 Oct '13

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 4ebce7eb50a1163c0d767d81a5bfb4908789d359 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 9 14:00:52 2013 +0200 Automatic commit of package [spacewalk-utils] release [2.1.21-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 7514578..e483abc 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -2.1.20-1 utils/ +2.1.21-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index c796955..876d1a3 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 2.1.20 +Version: 2.1.21 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Wed Oct 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.21-1 +- cleaning up old svn Ids + * Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.20-1 - fixed pylint warning

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.27-1'
by Michael Mraka 09 Oct '13

09 Oct '13

Tag 'spacewalk-backend-2.1.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-09 11:59 +0000 Tagging package [spacewalk-backend] version [2.1.27-1] in directory [backend/]. Changes since spacewalk-branding-2.1.4-1: Matej Kollar (3): Removing unhealthy options RHN_PARENT and CA_CHAIN Revert "Removed set_value as getopt made it redundant" Honour behavior described in help Michael Mraka (2): cleaning up old svn Ids Automatic commit of package [spacewalk-backend] release [2.1.27-1]. --- backend/Makefile.backend | 1 backend/Makefile.defs | 1 backend/apache-conf/Makefile | 1 backend/common/Makefile | 1 backend/common/test/unit-test/test_gettext.py | 1 backend/common/test/unit-test/test_rhnCache.py | 1 backend/common/test/unit-test/test_rhnLib.py | 1 backend/logrotate/Makefile | 1 backend/logrotate/spacewalk-backend-app | 1 backend/logrotate/spacewalk-backend-applet | 1 backend/logrotate/spacewalk-backend-config-files | 1 backend/logrotate/spacewalk-backend-config-files-tool | 1 backend/logrotate/spacewalk-backend-package-push-server | 1 backend/logrotate/spacewalk-backend-server | 1 backend/logrotate/spacewalk-backend-tools | 1 backend/logrotate/spacewalk-backend-xmlrpc | 1 backend/po/Makefile | 1 backend/rhn-conf/Makefile | 1 backend/rhn-conf/rhn.conf | 1 backend/rhn-conf/rhn_server.conf | 1 backend/rhn-conf/rhn_server_app.conf | 1 backend/rhn-conf/rhn_server_applet.conf | 1 backend/rhn-conf/rhn_server_config-management-tool.conf | 1 backend/rhn-conf/rhn_server_config-management.conf | 1 backend/rhn-conf/rhn_server_satellite.conf | 1 backend/rhn-conf/rhn_server_upload.conf | 1 backend/rhn-conf/rhn_server_upload_package-push.conf | 1 backend/rhn-conf/rhn_server_xmlrpc.conf | 1 backend/satellite_tools/Makefile | 1 backend/satellite_tools/exporter/Makefile | 1 backend/satellite_tools/messages.py | 1 backend/server/Makefile | 1 backend/server/action/Makefile | 1 backend/server/action_extra_data/Makefile | 1 backend/server/basePackageUpload.py | 1 backend/server/config_common/Makefile | 1 backend/server/config_common/__init__.py | 1 backend/server/config_common/base_templated_document.py | 1 backend/server/config_common/templated_document.py | 1 backend/server/handlers/Makefile | 1 backend/server/handlers/__init__.py | 1 backend/server/handlers/app/Makefile | 1 backend/server/handlers/applet/Makefile | 1 backend/server/handlers/config/Makefile | 1 backend/server/handlers/config_mgmt/Makefile | 1 backend/server/handlers/config_mgmt/__init__.py | 1 backend/server/handlers/config_mgmt/rhn_config_management.py | 1 backend/server/handlers/xmlrpc/Makefile | 1 backend/server/importlib/Makefile | 1 backend/server/importlib/test/test_blob_update.py | 1 backend/server/repomd/Makefile | 1 backend/server/rhn.conf.sample | 1 backend/server/rhnPackageUpload.py | 1 backend/server/rhnSQL/Makefile | 1 backend/server/rhnSQL/sql_lib.py | 1 backend/server/rhnSQL/sql_sequence.py | 1 backend/server/rhnSQL/sql_types.py | 1 backend/server/rhnServer/Makefile | 1 backend/server/rhnServer/server_certificate.py | 1 backend/server/test/attic/rhnActivationKey.py | 1 backend/server/test/misc_functions.py | 1 backend/server/test/test_censored_db_password.py | 1 backend/server/test/unit-test/misc_functions.py | 1 backend/server/test/unit-test/rhnSQL/test_1.py | 1 backend/server/test/unit-test/rhnSQL/test_2.py | 1 backend/server/test/unit-test/rhnSQL/test_executemany.py | 1 backend/server/test/unit-test/rhnSQL/test_lob.py | 1 backend/server/test/unit-test/test_capabilities.py | 1 backend/server/test/unit-test/test_misc_functions.py | 1 backend/server/test/unit-test/test_rhnActivationKey.py | 1 backend/server/test/unit-test/test_rhnChannel.py | 1 backend/server/test/unit-test/test_rhnLib_timestamp.py | 1 backend/server/test/unit-test/test_rhnServerGroup.py | 1 backend/server/test/unit-test/test_server_registration.py | 1 backend/spacewalk-backend.spec | 6 backend/upload_server/Makefile | 1 backend/upload_server/__init__.py | 1 backend/upload_server/handlers/Makefile | 1 backend/upload_server/handlers/__init__.py | 1 backend/upload_server/handlers/package_push/Makefile | 1 backend/upload_server/handlers/package_push/__init__.py | 1 backend/upload_server/handlers/package_push/package_push.py | 1 client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools | 1 client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py | 1 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py | 1 client/debian/packages-already-in-debian/rhnlib/README | 1 client/debian/packages-already-in-debian/rhnlib/TODO | 1 client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py | 1 client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py | 1 client/debian/packages-already-in-debian/rhnlib/rhn/connections.py | 1 client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py | 1 client/debian/packages-already-in-debian/rhnlib/rhn/transports.py | 1 client/debian/packages-already-in-debian/rhnlib/setup.cfg.in | 1 client/debian/packages-already-in-debian/rhnlib/setup.py.in | 1 client/debian/packages-already-in-debian/rhnlib/test/00-connection.py | 1 client/debian/packages-already-in-debian/rhnlib/test/01-get.py | 1 client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py | 1 client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py | 1 client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py | 1 client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py | 1 client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py | 1 client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py | 1 client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py | 1 client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py | 1 client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py | 1 client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py | 1 client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py | 1 client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py | 1 client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py | 1 client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py | 1 client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py | 1 client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py | 1 client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py | 1 client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py | 1 client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py | 1 client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py | 1 client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py | 1 client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py | 1 client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py | 1 client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py | 1 client/debian/packages-already-in-debian/rhnlib/test/Makefile | 1 client/debian/packages-already-in-debian/rhnlib/test/test_server.py | 1 client/debian/packages-already-in-debian/rhnsd/man/Makefile | 1 client/debian/packages-already-in-debian/rhnsd/rhnsd.c | 1 client/rhel/rhn-client-tools/Makefile.rhn-client-tools | 1 client/rhel/rhn-client-tools/data/Makefile | 1 client/rhel/rhn-client-tools/etc-conf/Makefile | 1 client/rhel/rhn-client-tools/man/Makefile | 1 client/rhel/rhn-client-tools/src/Makefile | 1 client/rhel/rhn-client-tools/src/actions/Makefile | 1 client/rhel/rhn-client-tools/src/actions/README | 1 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile | 1 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile | 1 client/rhel/rhn-client-tools/src/up2date_client/config.py | 1 client/rhel/rhn-client-tools/src/up2date_client/getMethod.py | 1 client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 1 client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py | 1 client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py | 1 client/rhel/rhnlib/README | 1 client/rhel/rhnlib/TODO | 1 client/rhel/rhnlib/rhn/SSL.py | 1 client/rhel/rhnlib/rhn/SmartIO.py | 1 client/rhel/rhnlib/rhn/connections.py | 1 client/rhel/rhnlib/rhn/nonblocking.py | 1 client/rhel/rhnlib/rhn/transports.py | 1 client/rhel/rhnlib/setup.cfg.in | 1 client/rhel/rhnlib/setup.py.in | 1 client/rhel/rhnlib/test/00-connection.py | 1 client/rhel/rhnlib/test/01-get.py | 1 client/rhel/rhnlib/test/02-callbacks.py | 1 client/rhel/rhnlib/test/04-authenticated-proxy.py | 1 client/rhel/rhnlib/test/05-delete-packages.py | 1 client/rhel/rhnlib/test/06-leaking-ssl-fd.py | 1 client/rhel/rhnlib/test/07-leaking-ssl-fd.py | 1 client/rhel/rhnlib/test/08-leaking-fd.py | 1 client/rhel/rhnlib/test/09-test-errcodes.py | 1 client/rhel/rhnlib/test/10-tempfile.py | 1 client/rhel/rhnlib/test/11-SmartIO.py | 1 client/rhel/rhnlib/test/12-Input-Output.py | 1 client/rhel/rhnlib/test/13-safe_read.py | 1 client/rhel/rhnlib/test/14-Input-Output.py | 1 client/rhel/rhnlib/test/15-ranges.py | 1 client/rhel/rhnlib/test/16-test-ranges.py | 1 client/rhel/rhnlib/test/17-test-multivalued-headers.py | 1 client/rhel/rhnlib/test/18-split-host.py | 1 client/rhel/rhnlib/test/19-redirects.py | 1 client/rhel/rhnlib/test/20-proxy-user-agent.py | 1 client/rhel/rhnlib/test/21-proxy-user-agent.py | 1 client/rhel/rhnlib/test/22-base16values.py | 1 client/rhel/rhnlib/test/23-digest-auth.py | 1 client/rhel/rhnlib/test/24-ssl-memleak.py | 1 client/rhel/rhnlib/test/25-ssl-memleak.py | 1 client/rhel/rhnlib/test/26-ssl-bad-cert.py | 1 client/rhel/rhnlib/test/Makefile | 1 client/rhel/rhnlib/test/test_server.py | 1 client/rhel/rhnsd/man/Makefile | 1 client/rhel/rhnsd/rhnsd.c | 1 client/solaris/rhnclient/compile.py | 1 client/solaris/rhnclient/rhn/actions/__init__.py | 1 client/tools/osad/Makefile.defs | 1 client/tools/osad/Makefile.osad | 1 client/tools/osad/logrotate/Makefile | 1 client/tools/osad/osad-conf/Makefile | 1 client/tools/osad/rhn-conf/Makefile | 1 client/tools/osad/src/Makefile | 1 client/tools/rhn-kickstart/Makefile.defs | 1 client/tools/rhn-kickstart/Makefile.rhn-kickstart | 1 client/tools/rhn-kickstart/actions/Makefile | 1 client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py | 1 client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py | 1 client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py | 1 client/tools/rhn-kickstart/test/test-copy-files.py | 1 client/tools/rhncfg/Makefile.defs | 1 client/tools/rhncfg/Makefile.rhncfg | 1 client/tools/rhncfg/actions/Makefile | 1 client/tools/rhncfg/config_client/Makefile | 1 client/tools/rhncfg/config_common/Makefile | 1 client/tools/rhncfg/config_management/Makefile | 1 client/tools/rhncfg/rhncfg.spec | 1 client/tools/rhncustominfo/Makefile.defs | 1 client/tools/rhncustominfo/Makefile.rhn-custom-info | 1 client/tools/rhnpush/Makefile.rhnpush | 1 client/tools/rhnpush/rhnpush | 1 client/tools/rhnpush/rhnpush.py | 1 client/tools/rhnpush/rhnpush_v2.py | 1 client/tools/spacewalk-koan/Makefile.defs | 1 client/tools/spacewalk-koan/actions/Makefile | 1 java/conf/logrotate/rhn_web_api | 1 proxy/changes-notes-v3x.txt | 1 proxy/installer/configure-proxy.sh | 75 +++++----- proxy/installer/configure-proxy.sh.sgml | 28 --- rel-eng/packages/spacewalk-backend | 2 scripts/update_symlinks.py | 1 spacewalk/admin/Makefile.admin | 1 spacewalk/admin/rhn-config-satellite.pl | 1 spacewalk/admin/rhn-config-schema.pl | 1 spacewalk/admin/rhn-deploy-ca-cert.pl | 1 spacewalk/admin/rhn-generate-pem.pl | 1 spacewalk/admin/rhn-install-ssl-cert.pl | 1 spacewalk/admin/rhn-sat-restart-silent | 1 spacewalk/admin/validate-sat-cert.pl | 1 spacewalk/certs-tools/Makefile.certs | 1 spacewalk/certs-tools/Makefile.defs | 1 spacewalk/certs-tools/__init__.py | 1 spacewalk/certs-tools/client_config_update.py | 1 spacewalk/certs-tools/gen-rpm.sh | 1 spacewalk/certs-tools/rhn-bootstrap | 1 spacewalk/certs-tools/rhn-ssl-tool | 1 spacewalk/certs-tools/rhn_bootstrap.py | 1 spacewalk/certs-tools/rhn_bootstrap_strings.py | 1 spacewalk/certs-tools/rhn_ssl_tool.py | 1 spacewalk/certs-tools/sign.sh | 1 spacewalk/certs-tools/ssl-howto.txt | 1 spacewalk/certs-tools/sslToolCli.py | 1 spacewalk/certs-tools/sslToolConfig.py | 1 spacewalk/certs-tools/sslToolLib.py | 1 spacewalk/certs-tools/timeLib.py | 1 utils/Makefile | 1 utils/Makefile.defs | 1 web/Makefile.defs | 1 web/Makefile.spacewalk-web | 1 web/html/Makefile | 1 web/include/Makefile | 1 web/modules/Makefile | 1 web/modules/dobby/Makefile | 1 web/modules/dobby/Makefile.PL | 1 web/modules/grail/Makefile | 1 web/modules/grail/Makefile.PL | 1 web/modules/pxt/Makefile | 1 web/modules/pxt/Makefile.PL | 1 web/modules/rhn/Makefile | 1 web/modules/rhn/Makefile.PL | 1 web/modules/sniglets/Makefile | 1 web/modules/sniglets/Makefile.PL | 1 web/spacewalk-web.spec | 1 266 files changed, 49 insertions(+), 324 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 09 Oct '13

09 Oct '13

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 69353753a43bb6258b42e53c90cfb926e0d33586 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 9 13:59:34 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.27-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2fdcb79..1562ee7 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.26 +Version: 2.1.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -627,6 +627,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Wed Oct 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1 +- cleaning up old svn Ids + * Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 - Python pgsql db tests: fix broken test - Fixed errors inside of the python pgsql test suite. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 766160c..18193f9 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.26-1 backend/ +2.1.27-1 backend/

1 0

backend/Makefile.backend backend/Makefile.defs backend/apache-conf backend/common backend/logrotate backend/po backend/rhn-conf backend/satellite_tools backend/server backend/spacewalk-backend.spec backend/upload_server client/debian client/rhel client/solaris client/tools java/conf proxy/changes-notes-v3x.txt scripts/update_symlinks.py spacewalk/admin spacewalk/certs-tools utils/Makefile utils/Makefile.defs web/Makefile.defs web/Makefile.spacewalk-web web/html web/include web/modules web/spacewalk-web.spec
by Michael Mraka 09 Oct '13

09 Oct '13

backend/Makefile.backend | 1 - backend/Makefile.defs | 1 - backend/apache-conf/Makefile | 1 - backend/common/Makefile | 1 - backend/common/test/unit-test/test_gettext.py | 1 - backend/common/test/unit-test/test_rhnCache.py | 1 - backend/common/test/unit-test/test_rhnLib.py | 1 - backend/logrotate/Makefile | 1 - backend/logrotate/spacewalk-backend-app | 1 - backend/logrotate/spacewalk-backend-applet | 1 - backend/logrotate/spacewalk-backend-config-files | 1 - backend/logrotate/spacewalk-backend-config-files-tool | 1 - backend/logrotate/spacewalk-backend-package-push-server | 1 - backend/logrotate/spacewalk-backend-server | 1 - backend/logrotate/spacewalk-backend-tools | 1 - backend/logrotate/spacewalk-backend-xmlrpc | 1 - backend/po/Makefile | 1 - backend/rhn-conf/Makefile | 1 - backend/rhn-conf/rhn.conf | 1 - backend/rhn-conf/rhn_server.conf | 1 - backend/rhn-conf/rhn_server_app.conf | 1 - backend/rhn-conf/rhn_server_applet.conf | 1 - backend/rhn-conf/rhn_server_config-management-tool.conf | 1 - backend/rhn-conf/rhn_server_config-management.conf | 1 - backend/rhn-conf/rhn_server_satellite.conf | 1 - backend/rhn-conf/rhn_server_upload.conf | 1 - backend/rhn-conf/rhn_server_upload_package-push.conf | 1 - backend/rhn-conf/rhn_server_xmlrpc.conf | 1 - backend/satellite_tools/Makefile | 1 - backend/satellite_tools/exporter/Makefile | 1 - backend/satellite_tools/messages.py | 1 - backend/server/Makefile | 1 - backend/server/action/Makefile | 1 - backend/server/action_extra_data/Makefile | 1 - backend/server/basePackageUpload.py | 1 - backend/server/config_common/Makefile | 1 - backend/server/config_common/__init__.py | 1 - backend/server/config_common/base_templated_document.py | 1 - backend/server/config_common/templated_document.py | 1 - backend/server/handlers/Makefile | 1 - backend/server/handlers/__init__.py | 1 - backend/server/handlers/app/Makefile | 1 - backend/server/handlers/applet/Makefile | 1 - backend/server/handlers/config/Makefile | 1 - backend/server/handlers/config_mgmt/Makefile | 1 - backend/server/handlers/config_mgmt/__init__.py | 1 - backend/server/handlers/config_mgmt/rhn_config_management.py | 1 - backend/server/handlers/xmlrpc/Makefile | 1 - backend/server/importlib/Makefile | 1 - backend/server/importlib/test/test_blob_update.py | 1 - backend/server/repomd/Makefile | 1 - backend/server/rhn.conf.sample | 1 - backend/server/rhnPackageUpload.py | 1 - backend/server/rhnSQL/Makefile | 1 - backend/server/rhnSQL/sql_lib.py | 1 - backend/server/rhnSQL/sql_sequence.py | 1 - backend/server/rhnSQL/sql_types.py | 1 - backend/server/rhnServer/Makefile | 1 - backend/server/rhnServer/server_certificate.py | 1 - backend/server/test/attic/rhnActivationKey.py | 1 - backend/server/test/misc_functions.py | 1 - backend/server/test/test_censored_db_password.py | 1 - backend/server/test/unit-test/misc_functions.py | 1 - backend/server/test/unit-test/rhnSQL/test_1.py | 1 - backend/server/test/unit-test/rhnSQL/test_2.py | 1 - backend/server/test/unit-test/rhnSQL/test_executemany.py | 1 - backend/server/test/unit-test/rhnSQL/test_lob.py | 1 - backend/server/test/unit-test/test_capabilities.py | 1 - backend/server/test/unit-test/test_misc_functions.py | 1 - backend/server/test/unit-test/test_rhnActivationKey.py | 1 - backend/server/test/unit-test/test_rhnChannel.py | 1 - backend/server/test/unit-test/test_rhnLib_timestamp.py | 1 - backend/server/test/unit-test/test_rhnServerGroup.py | 1 - backend/server/test/unit-test/test_server_registration.py | 1 - backend/spacewalk-backend.spec | 1 - backend/upload_server/Makefile | 1 - backend/upload_server/__init__.py | 1 - backend/upload_server/handlers/Makefile | 1 - backend/upload_server/handlers/__init__.py | 1 - backend/upload_server/handlers/package_push/Makefile | 1 - backend/upload_server/handlers/package_push/__init__.py | 1 - backend/upload_server/handlers/package_push/package_push.py | 1 - client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools | 1 - client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py | 1 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py | 1 - client/debian/packages-already-in-debian/rhnlib/README | 1 - client/debian/packages-already-in-debian/rhnlib/TODO | 1 - client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py | 1 - client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py | 1 - client/debian/packages-already-in-debian/rhnlib/rhn/connections.py | 1 - client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py | 1 - client/debian/packages-already-in-debian/rhnlib/rhn/transports.py | 1 - client/debian/packages-already-in-debian/rhnlib/setup.cfg.in | 1 - client/debian/packages-already-in-debian/rhnlib/setup.py.in | 1 - client/debian/packages-already-in-debian/rhnlib/test/00-connection.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/01-get.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py | 1 - client/debian/packages-already-in-debian/rhnlib/test/Makefile | 1 - client/debian/packages-already-in-debian/rhnlib/test/test_server.py | 1 - client/debian/packages-already-in-debian/rhnsd/man/Makefile | 1 - client/debian/packages-already-in-debian/rhnsd/rhnsd.c | 1 - client/rhel/rhn-client-tools/Makefile.rhn-client-tools | 1 - client/rhel/rhn-client-tools/data/Makefile | 1 - client/rhel/rhn-client-tools/etc-conf/Makefile | 1 - client/rhel/rhn-client-tools/man/Makefile | 1 - client/rhel/rhn-client-tools/src/Makefile | 1 - client/rhel/rhn-client-tools/src/actions/Makefile | 1 - client/rhel/rhn-client-tools/src/actions/README | 1 - client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile | 1 - client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile | 1 - client/rhel/rhn-client-tools/src/up2date_client/config.py | 1 - client/rhel/rhn-client-tools/src/up2date_client/getMethod.py | 1 - client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 1 - client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py | 1 - client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py | 1 - client/rhel/rhnlib/README | 1 - client/rhel/rhnlib/TODO | 1 - client/rhel/rhnlib/rhn/SSL.py | 1 - client/rhel/rhnlib/rhn/SmartIO.py | 1 - client/rhel/rhnlib/rhn/connections.py | 1 - client/rhel/rhnlib/rhn/nonblocking.py | 1 - client/rhel/rhnlib/rhn/transports.py | 1 - client/rhel/rhnlib/setup.cfg.in | 1 - client/rhel/rhnlib/setup.py.in | 1 - client/rhel/rhnlib/test/00-connection.py | 1 - client/rhel/rhnlib/test/01-get.py | 1 - client/rhel/rhnlib/test/02-callbacks.py | 1 - client/rhel/rhnlib/test/04-authenticated-proxy.py | 1 - client/rhel/rhnlib/test/05-delete-packages.py | 1 - client/rhel/rhnlib/test/06-leaking-ssl-fd.py | 1 - client/rhel/rhnlib/test/07-leaking-ssl-fd.py | 1 - client/rhel/rhnlib/test/08-leaking-fd.py | 1 - client/rhel/rhnlib/test/09-test-errcodes.py | 1 - client/rhel/rhnlib/test/10-tempfile.py | 1 - client/rhel/rhnlib/test/11-SmartIO.py | 1 - client/rhel/rhnlib/test/12-Input-Output.py | 1 - client/rhel/rhnlib/test/13-safe_read.py | 1 - client/rhel/rhnlib/test/14-Input-Output.py | 1 - client/rhel/rhnlib/test/15-ranges.py | 1 - client/rhel/rhnlib/test/16-test-ranges.py | 1 - client/rhel/rhnlib/test/17-test-multivalued-headers.py | 1 - client/rhel/rhnlib/test/18-split-host.py | 1 - client/rhel/rhnlib/test/19-redirects.py | 1 - client/rhel/rhnlib/test/20-proxy-user-agent.py | 1 - client/rhel/rhnlib/test/21-proxy-user-agent.py | 1 - client/rhel/rhnlib/test/22-base16values.py | 1 - client/rhel/rhnlib/test/23-digest-auth.py | 1 - client/rhel/rhnlib/test/24-ssl-memleak.py | 1 - client/rhel/rhnlib/test/25-ssl-memleak.py | 1 - client/rhel/rhnlib/test/26-ssl-bad-cert.py | 1 - client/rhel/rhnlib/test/Makefile | 1 - client/rhel/rhnlib/test/test_server.py | 1 - client/rhel/rhnsd/man/Makefile | 1 - client/rhel/rhnsd/rhnsd.c | 1 - client/solaris/rhnclient/compile.py | 1 - client/solaris/rhnclient/rhn/actions/__init__.py | 1 - client/tools/osad/Makefile.defs | 1 - client/tools/osad/Makefile.osad | 1 - client/tools/osad/logrotate/Makefile | 1 - client/tools/osad/osad-conf/Makefile | 1 - client/tools/osad/rhn-conf/Makefile | 1 - client/tools/osad/src/Makefile | 1 - client/tools/rhn-kickstart/Makefile.defs | 1 - client/tools/rhn-kickstart/Makefile.rhn-kickstart | 1 - client/tools/rhn-kickstart/actions/Makefile | 1 - client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py | 1 - client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py | 1 - client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py | 1 - client/tools/rhn-kickstart/test/test-copy-files.py | 1 - client/tools/rhncfg/Makefile.defs | 1 - client/tools/rhncfg/Makefile.rhncfg | 1 - client/tools/rhncfg/actions/Makefile | 1 - client/tools/rhncfg/config_client/Makefile | 1 - client/tools/rhncfg/config_common/Makefile | 1 - client/tools/rhncfg/config_management/Makefile | 1 - client/tools/rhncfg/rhncfg.spec | 1 - client/tools/rhncustominfo/Makefile.defs | 1 - client/tools/rhncustominfo/Makefile.rhn-custom-info | 1 - client/tools/rhnpush/Makefile.rhnpush | 1 - client/tools/rhnpush/rhnpush | 1 - client/tools/rhnpush/rhnpush.py | 1 - client/tools/rhnpush/rhnpush_v2.py | 1 - client/tools/spacewalk-koan/Makefile.defs | 1 - client/tools/spacewalk-koan/actions/Makefile | 1 - java/conf/logrotate/rhn_web_api | 1 - proxy/changes-notes-v3x.txt | 1 - scripts/update_symlinks.py | 1 - spacewalk/admin/Makefile.admin | 1 - spacewalk/admin/rhn-config-satellite.pl | 1 - spacewalk/admin/rhn-config-schema.pl | 1 - spacewalk/admin/rhn-deploy-ca-cert.pl | 1 - spacewalk/admin/rhn-generate-pem.pl | 1 - spacewalk/admin/rhn-install-ssl-cert.pl | 1 - spacewalk/admin/rhn-sat-restart-silent | 1 - spacewalk/admin/validate-sat-cert.pl | 1 - spacewalk/certs-tools/Makefile.certs | 1 - spacewalk/certs-tools/Makefile.defs | 1 - spacewalk/certs-tools/__init__.py | 1 - spacewalk/certs-tools/client_config_update.py | 1 - spacewalk/certs-tools/gen-rpm.sh | 1 - spacewalk/certs-tools/rhn-bootstrap | 1 - spacewalk/certs-tools/rhn-ssl-tool | 1 - spacewalk/certs-tools/rhn_bootstrap.py | 1 - spacewalk/certs-tools/rhn_bootstrap_strings.py | 1 - spacewalk/certs-tools/rhn_ssl_tool.py | 1 - spacewalk/certs-tools/sign.sh | 1 - spacewalk/certs-tools/ssl-howto.txt | 1 - spacewalk/certs-tools/sslToolCli.py | 1 - spacewalk/certs-tools/sslToolConfig.py | 1 - spacewalk/certs-tools/sslToolLib.py | 1 - spacewalk/certs-tools/timeLib.py | 1 - utils/Makefile | 1 - utils/Makefile.defs | 1 - web/Makefile.defs | 1 - web/Makefile.spacewalk-web | 1 - web/html/Makefile | 1 - web/include/Makefile | 1 - web/modules/Makefile | 1 - web/modules/dobby/Makefile | 1 - web/modules/dobby/Makefile.PL | 1 - web/modules/grail/Makefile | 1 - web/modules/grail/Makefile.PL | 1 - web/modules/pxt/Makefile | 1 - web/modules/pxt/Makefile.PL | 1 - web/modules/rhn/Makefile | 1 - web/modules/rhn/Makefile.PL | 1 - web/modules/sniglets/Makefile | 1 - web/modules/sniglets/Makefile.PL | 1 - web/spacewalk-web.spec | 1 - 263 files changed, 263 deletions(-) New commits: commit fc044d9f5b161d4f460b7eb82240d45088d36b60 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 8 11:20:02 2013 +0200 cleaning up old svn Ids diff --git a/backend/Makefile.backend b/backend/Makefile.backend index 9703e2b..7e22789 100644 --- a/backend/Makefile.backend +++ b/backend/Makefile.backend @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ SPACEWALK_FILES = __init__ CODE_DIRS = common server upload_server satellite_tools satellite_exporter po wsgi diff --git a/backend/Makefile.defs b/backend/Makefile.defs index ba30ed5..7de3248 100644 --- a/backend/Makefile.defs +++ b/backend/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/backend/apache-conf/Makefile b/backend/apache-conf/Makefile index f0a472b0..3b75db0 100644 --- a/backend/apache-conf/Makefile +++ b/backend/apache-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the httpd configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/backend/common/Makefile b/backend/common/Makefile index 40d12ce..50c2e38 100644 --- a/backend/common/Makefile +++ b/backend/common/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/backend/common/test/unit-test/test_gettext.py b/backend/common/test/unit-test/test_gettext.py index 9a6fa79..00b9995 100644 --- a/backend/common/test/unit-test/test_gettext.py +++ b/backend/common/test/unit-test/test_gettext.py @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ import os import sys diff --git a/backend/common/test/unit-test/test_rhnCache.py b/backend/common/test/unit-test/test_rhnCache.py index 4ed1c91..daff756 100644 --- a/backend/common/test/unit-test/test_rhnCache.py +++ b/backend/common/test/unit-test/test_rhnCache.py @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ import sys import unittest diff --git a/backend/common/test/unit-test/test_rhnLib.py b/backend/common/test/unit-test/test_rhnLib.py index 30bf8a0..b5258a4 100644 --- a/backend/common/test/unit-test/test_rhnLib.py +++ b/backend/common/test/unit-test/test_rhnLib.py @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ import sys import locale diff --git a/backend/logrotate/Makefile b/backend/logrotate/Makefile index f765866..2b26567 100644 --- a/backend/logrotate/Makefile +++ b/backend/logrotate/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the logrotation configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/backend/logrotate/spacewalk-backend-app b/backend/logrotate/spacewalk-backend-app index e38d949..17235c5 100644 --- a/backend/logrotate/spacewalk-backend-app +++ b/backend/logrotate/spacewalk-backend-app @@ -1,6 +1,5 @@ # logrotation file for Spacewalk server # -# $Id$ /var/log/rhn/rhn_server_app.log { weekly diff --git a/backend/logrotate/spacewalk-backend-applet b/backend/logrotate/spacewalk-backend-applet index 16c5e6d..99dcbef 100644 --- a/backend/logrotate/spacewalk-backend-applet +++ b/backend/logrotate/spacewalk-backend-applet @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_server_applet.log { weekly diff --git a/backend/logrotate/spacewalk-backend-config-files b/backend/logrotate/spacewalk-backend-config-files index 8fd91d2..8215185 100644 --- a/backend/logrotate/spacewalk-backend-config-files +++ b/backend/logrotate/spacewalk-backend-config-files @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_config_management.log { weekly diff --git a/backend/logrotate/spacewalk-backend-config-files-tool b/backend/logrotate/spacewalk-backend-config-files-tool index ac90b0a..395fe92 100644 --- a/backend/logrotate/spacewalk-backend-config-files-tool +++ b/backend/logrotate/spacewalk-backend-config-files-tool @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_config_management_tool.log { weekly diff --git a/backend/logrotate/spacewalk-backend-package-push-server b/backend/logrotate/spacewalk-backend-package-push-server index 9ec9571..6817fe4 100644 --- a/backend/logrotate/spacewalk-backend-package-push-server +++ b/backend/logrotate/spacewalk-backend-package-push-server @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server package uploader # -# $Id$ /var/log/rhn/rhn_upload_package_push.log { weekly diff --git a/backend/logrotate/spacewalk-backend-server b/backend/logrotate/spacewalk-backend-server index dd6362b..f85063d 100644 --- a/backend/logrotate/spacewalk-backend-server +++ b/backend/logrotate/spacewalk-backend-server @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_server.log { weekly diff --git a/backend/logrotate/spacewalk-backend-tools b/backend/logrotate/spacewalk-backend-tools index 763932b..43011c1 100644 --- a/backend/logrotate/spacewalk-backend-tools +++ b/backend/logrotate/spacewalk-backend-tools @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_server_satellite.log { weekly diff --git a/backend/logrotate/spacewalk-backend-xmlrpc b/backend/logrotate/spacewalk-backend-xmlrpc index 5a1806e..072acbc 100644 --- a/backend/logrotate/spacewalk-backend-xmlrpc +++ b/backend/logrotate/spacewalk-backend-xmlrpc @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_server_xmlrpc.log { weekly diff --git a/backend/po/Makefile b/backend/po/Makefile index c6fda8b..4b176a0 100644 --- a/backend/po/Makefile +++ b/backend/po/Makefile @@ -1,6 +1,5 @@ # Makefile for the PO files (translation) catalog # -# $Id$ TOP = .. SUBDIR = locale diff --git a/backend/rhn-conf/Makefile b/backend/rhn-conf/Makefile index 6949c3c..f5c44a2 100644 --- a/backend/rhn-conf/Makefile +++ b/backend/rhn-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the RHN server configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf index 21074e6..c02896d 100644 --- a/backend/rhn-conf/rhn.conf +++ b/backend/rhn-conf/rhn.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Default configuration options for the common code # -# $Id$ #The product name product_name = Spacewalk diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf index d1b13cc..76fe50e 100644 --- a/backend/rhn-conf/rhn_server.conf +++ b/backend/rhn-conf/rhn_server.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for all backend receivers # -# $Id$ ### unexposed ### log_file = /var/log/rhn/rhn_server.log diff --git a/backend/rhn-conf/rhn_server_app.conf b/backend/rhn-conf/rhn_server_app.conf index 772ece8..8a7986a 100644 --- a/backend/rhn-conf/rhn_server_app.conf +++ b/backend/rhn-conf/rhn_server_app.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through /APP receiver # -# $Id$ ## unexposed log_file = /var/log/rhn/rhn_server_app.log diff --git a/backend/rhn-conf/rhn_server_applet.conf b/backend/rhn-conf/rhn_server_applet.conf index 71544d4..07502ac 100644 --- a/backend/rhn-conf/rhn_server_applet.conf +++ b/backend/rhn-conf/rhn_server_applet.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through the /APPLET receiver # -# $Id$ log_file = /var/log/rhn/rhn_server_applet.log # 15 min for the applet checkin diff --git a/backend/rhn-conf/rhn_server_config-management-tool.conf b/backend/rhn-conf/rhn_server_config-management-tool.conf index 20e616d..cb68f7c 100644 --- a/backend/rhn-conf/rhn_server_config-management-tool.conf +++ b/backend/rhn-conf/rhn_server_config-management-tool.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through /APP receiver # -# $Id$ ## unexposed log_file = /var/log/rhn/rhn_config_management_tool.log diff --git a/backend/rhn-conf/rhn_server_config-management.conf b/backend/rhn-conf/rhn_server_config-management.conf index 5e9f51a..8f70472 100644 --- a/backend/rhn-conf/rhn_server_config-management.conf +++ b/backend/rhn-conf/rhn_server_config-management.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through /APP receiver # -# $Id$ ## unexposed log_file = /var/log/rhn/rhn_config_management.log diff --git a/backend/rhn-conf/rhn_server_satellite.conf b/backend/rhn-conf/rhn_server_satellite.conf index fdd9ee7..e6fb2d5 100644 --- a/backend/rhn-conf/rhn_server_satellite.conf +++ b/backend/rhn-conf/rhn_server_satellite.conf @@ -2,7 +2,6 @@ # Configuration settings used by the Red Hat Satellite and the satellite-sync tool. # (i.e., Red Hat Satellite specific) # -# $Id$ # used by satellite/sync-tool: log_file = /var/log/rhn/rhn_server_satellite.log diff --git a/backend/rhn-conf/rhn_server_upload.conf b/backend/rhn-conf/rhn_server_upload.conf index 708b74c..dbe7212 100644 --- a/backend/rhn-conf/rhn_server_upload.conf +++ b/backend/rhn-conf/rhn_server_upload.conf @@ -1,4 +1,3 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through the package upload code # -# $Id$ diff --git a/backend/rhn-conf/rhn_server_upload_package-push.conf b/backend/rhn-conf/rhn_server_upload_package-push.conf index 2b1bdb0..31c1eba 100644 --- a/backend/rhn-conf/rhn_server_upload_package-push.conf +++ b/backend/rhn-conf/rhn_server_upload_package-push.conf @@ -1,6 +1,5 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through the /PKG-UPLOAD receiver # -# $Id$ log_file = /var/log/rhn/rhn_upload_package_push.log diff --git a/backend/rhn-conf/rhn_server_xmlrpc.conf b/backend/rhn-conf/rhn_server_xmlrpc.conf index d49da10..b045c64 100644 --- a/backend/rhn-conf/rhn_server_xmlrpc.conf +++ b/backend/rhn-conf/rhn_server_xmlrpc.conf @@ -1,7 +1,6 @@ # ** DO NOT EDIT ** # Spacewalk config for requests traveling through the /XMLRPC receiver # -# $Id$ log_file = /var/log/rhn/rhn_server_xmlrpc.log diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile index 8ec6be3..5809a29 100644 --- a/backend/satellite_tools/Makefile +++ b/backend/satellite_tools/Makefile @@ -1,6 +1,5 @@ # Makefile for satellite_tool for RHNS # -# $Id$ TOP = .. diff --git a/backend/satellite_tools/exporter/Makefile b/backend/satellite_tools/exporter/Makefile index 8718e81..2f1d140 100644 --- a/backend/satellite_tools/exporter/Makefile +++ b/backend/satellite_tools/exporter/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ TOP = ../.. diff --git a/backend/satellite_tools/messages.py b/backend/satellite_tools/messages.py index 05aff12..3225061 100644 --- a/backend/satellite_tools/messages.py +++ b/backend/satellite_tools/messages.py @@ -13,7 +13,6 @@ # in this software or its documentation. # # -# $Id$ """ Spacewalk Synchronization Tool Messages Copyright (c) 2002--2013 Red Hat, Inc. diff --git a/backend/server/Makefile b/backend/server/Makefile index 4b047e2..e1a8e92 100644 --- a/backend/server/Makefile +++ b/backend/server/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/backend/server/action/Makefile b/backend/server/action/Makefile index bb8d7e4..fba144b 100644 --- a/backend/server/action/Makefile +++ b/backend/server/action/Makefile @@ -1,6 +1,5 @@ # Makefile for the action handlers module # -# $Id$ TOP = ../.. SUBDIR = server/action diff --git a/backend/server/action_extra_data/Makefile b/backend/server/action_extra_data/Makefile index ec0631f..cb939af 100644 --- a/backend/server/action_extra_data/Makefile +++ b/backend/server/action_extra_data/Makefile @@ -1,6 +1,5 @@ # Makefile for the action handlers module # -# $Id$ TOP = ../.. SUBDIR = server/action_extra_data diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py index f7b649e..ba27064 100644 --- a/backend/server/basePackageUpload.py +++ b/backend/server/basePackageUpload.py @@ -12,7 +12,6 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # -# $Id$ from rhn.UserDictCase import UserDictCase from spacewalk.common import apache diff --git a/backend/server/config_common/Makefile b/backend/server/config_common/Makefile index 0104a8c..b89ceda 100644 --- a/backend/server/config_common/Makefile +++ b/backend/server/config_common/Makefile @@ -1,6 +1,5 @@ # Makefile for the config-common module # -# $Id$ TOP = ../.. SUBDIR = server/config_common diff --git a/backend/server/config_common/__init__.py b/backend/server/config_common/__init__.py index f05858c..2bbd80c 100644 --- a/backend/server/config_common/__init__.py +++ b/backend/server/config_common/__init__.py @@ -12,6 +12,5 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # -# $Id$ __all__ = [] diff --git a/backend/server/config_common/base_templated_document.py b/backend/server/config_common/base_templated_document.py index 83de3d8..5379d95 100644 --- a/backend/server/config_common/base_templated_document.py +++ b/backend/server/config_common/base_templated_document.py @@ -15,7 +15,6 @@ # # Templating code for the configuration management project # -# $Id$ import re import string diff --git a/backend/server/config_common/templated_document.py b/backend/server/config_common/templated_document.py index a14c375..e34f9fb 100644 --- a/backend/server/config_common/templated_document.py +++ b/backend/server/config_common/templated_document.py @@ -14,7 +14,6 @@ # # # -# $Id$ from base_templated_document import TemplatedDocument diff --git a/backend/server/handlers/Makefile b/backend/server/handlers/Makefile index f5f9349..303da11 100644 --- a/backend/server/handlers/Makefile +++ b/backend/server/handlers/Makefile @@ -1,6 +1,5 @@ # Makefile for the xmlrpc handlers # -# $Id$ TOP = ../.. SUBDIR = server/handlers diff --git a/backend/server/handlers/__init__.py b/backend/server/handlers/__init__.py index 326cda8..9aa506f 100644 --- a/backend/server/handlers/__init__.py +++ b/backend/server/handlers/__init__.py @@ -14,7 +14,6 @@ # # init module for the XML-RPC handlers. Bare. # -# $Id$ # we stat all dirs anyway... __all__ = [] diff --git a/backend/server/handlers/app/Makefile b/backend/server/handlers/app/Makefile index 82ade7b..a4d162b 100644 --- a/backend/server/handlers/app/Makefile +++ b/backend/server/handlers/app/Makefile @@ -1,6 +1,5 @@ # Makefile for the app module # -# $Id$ TOP = ../../.. SUBDIR = server/handlers/app diff --git a/backend/server/handlers/applet/Makefile b/backend/server/handlers/applet/Makefile index b49b9d9..6e0b3b4 100644 --- a/backend/server/handlers/applet/Makefile +++ b/backend/server/handlers/applet/Makefile @@ -1,6 +1,5 @@ # Makefile for the applet module # -# $Id$ TOP = ../../.. SUBDIR = server/handlers/applet diff --git a/backend/server/handlers/config/Makefile b/backend/server/handlers/config/Makefile index 37162d1..401fb22 100644 --- a/backend/server/handlers/config/Makefile +++ b/backend/server/handlers/config/Makefile @@ -1,6 +1,5 @@ # Makefile for the app module # -# $Id$ TOP = ../../.. SUBDIR = server/handlers/config diff --git a/backend/server/handlers/config_mgmt/Makefile b/backend/server/handlers/config_mgmt/Makefile index 9a1e8ed..7fdb910 100644 --- a/backend/server/handlers/config_mgmt/Makefile +++ b/backend/server/handlers/config_mgmt/Makefile @@ -1,6 +1,5 @@ # Makefile for the app module # -# $Id$ TOP = ../../.. SUBDIR = server/handlers/config_mgmt diff --git a/backend/server/handlers/config_mgmt/__init__.py b/backend/server/handlers/config_mgmt/__init__.py index a8c2d16..be28404 100644 --- a/backend/server/handlers/config_mgmt/__init__.py +++ b/backend/server/handlers/config_mgmt/__init__.py @@ -14,7 +14,6 @@ # # This file defines the classes available for the XMLRPC receiver # -# $Id$ __all__ = [] diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py index 7c5be03..bd0ee0b 100644 --- a/backend/server/handlers/config_mgmt/rhn_config_management.py +++ b/backend/server/handlers/config_mgmt/rhn_config_management.py @@ -15,7 +15,6 @@ # # Config file handler (management tool) # -# $Id$ import sys import difflib diff --git a/backend/server/handlers/xmlrpc/Makefile b/backend/server/handlers/xmlrpc/Makefile index 2378238..87885fe 100644 --- a/backend/server/handlers/xmlrpc/Makefile +++ b/backend/server/handlers/xmlrpc/Makefile @@ -1,6 +1,5 @@ # Makefile for the xmlrpc module # -# $Id$ TOP = ../../.. SUBDIR = server/handlers/xmlrpc diff --git a/backend/server/importlib/Makefile b/backend/server/importlib/Makefile index 635c5e3..23b91f1 100644 --- a/backend/server/importlib/Makefile +++ b/backend/server/importlib/Makefile @@ -1,6 +1,5 @@ # Makefile for the import code # -# $Id$ TOP = ../.. diff --git a/backend/server/importlib/test/test_blob_update.py b/backend/server/importlib/test/test_blob_update.py index 07158ce..2e7e7fc 100644 --- a/backend/server/importlib/test/test_blob_update.py +++ b/backend/server/importlib/test/test_blob_update.py @@ -16,7 +16,6 @@ # # Test for blob updates # -# $Id$ """ Test module for blob updates. diff --git a/backend/server/repomd/Makefile b/backend/server/repomd/Makefile index 75c95dd..be82e7d 100644 --- a/backend/server/repomd/Makefile +++ b/backend/server/repomd/Makefile @@ -1,6 +1,5 @@ # Makefile for the import code # -# $Id$ TOP = ../.. diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample index f7bd346..eff93c8 100644 --- a/backend/server/rhn.conf.sample +++ b/backend/server/rhn.conf.sample @@ -5,7 +5,6 @@ # This file will attempt to better illustrate the possible settings for # the file /etc/rhn/rhn.conf. # -# $Id$ # How this configuration scheme works: # diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py index b4aebb6..1298c31 100644 --- a/backend/server/rhnPackageUpload.py +++ b/backend/server/rhnPackageUpload.py @@ -12,7 +12,6 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # -# $Id$ import os import sys diff --git a/backend/server/rhnSQL/Makefile b/backend/server/rhnSQL/Makefile index 9bf4ad9..bce2f30 100644 --- a/backend/server/rhnSQL/Makefile +++ b/backend/server/rhnSQL/Makefile @@ -1,6 +1,5 @@ # Makefile for the rhnSQL module # -# $Id$ TOP = ../.. SUBDIR = server/rhnSQL diff --git a/backend/server/rhnSQL/sql_lib.py b/backend/server/rhnSQL/sql_lib.py index eb968d8..ae376a3 100644 --- a/backend/server/rhnSQL/sql_lib.py +++ b/backend/server/rhnSQL/sql_lib.py @@ -20,7 +20,6 @@ # check how the function/class you are about to modify is used first. # Or ask gafton. # -# $Id$ import string diff --git a/backend/server/rhnSQL/sql_sequence.py b/backend/server/rhnSQL/sql_sequence.py index 031f22c..297680c 100644 --- a/backend/server/rhnSQL/sql_sequence.py +++ b/backend/server/rhnSQL/sql_sequence.py @@ -14,7 +14,6 @@ # # This file implements teh Sequence class # -# $Id$ from spacewalk.common.rhnException import rhnException diff --git a/backend/server/rhnSQL/sql_types.py b/backend/server/rhnSQL/sql_types.py index 5b56753..1a6057b 100644 --- a/backend/server/rhnSQL/sql_types.py +++ b/backend/server/rhnSQL/sql_types.py @@ -15,7 +15,6 @@ # # Database types we support for out variables # -# $Id$ # Data types class DatabaseDataType: diff --git a/backend/server/rhnServer/Makefile b/backend/server/rhnServer/Makefile index b5d5d0d..60dc6ce 100644 --- a/backend/server/rhnServer/Makefile +++ b/backend/server/rhnServer/Makefile @@ -1,6 +1,5 @@ # Makefile for the rhnServer module # -# $Id$ TOP = ../.. SUBDIR = server/rhnServer diff --git a/backend/server/rhnServer/server_certificate.py b/backend/server/rhnServer/server_certificate.py index c5fc215..30ee545 100644 --- a/backend/server/rhnServer/server_certificate.py +++ b/backend/server/rhnServer/server_certificate.py @@ -16,7 +16,6 @@ # Classes and functions needed for handling certificates # The only really exportable item is the Certificate class # -# $Id$ import hashlib import time diff --git a/backend/server/test/attic/rhnActivationKey.py b/backend/server/test/attic/rhnActivationKey.py index 7903505..adbbaad 100644 --- a/backend/server/test/attic/rhnActivationKey.py +++ b/backend/server/test/attic/rhnActivationKey.py @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ import os import hashlib diff --git a/backend/server/test/misc_functions.py b/backend/server/test/misc_functions.py index 898e434..2be029a 100644 --- a/backend/server/test/misc_functions.py +++ b/backend/server/test/misc_functions.py @@ -16,7 +16,6 @@ # # # -# $Id$ import os import sys import time diff --git a/backend/server/test/test_censored_db_password.py b/backend/server/test/test_censored_db_password.py index 9942a4b..884a284 100644 --- a/backend/server/test/test_censored_db_password.py +++ b/backend/server/test/test_censored_db_password.py @@ -17,7 +17,6 @@ # It catches the exception and sends the traceback, but the DB password should # be censored. # Run the test and look into the email. -# $Id$ from spacewalk.server import rhnSQL from spacewalk.common.rhnConfig import initCFG diff --git a/backend/server/test/unit-test/misc_functions.py b/backend/server/test/unit-test/misc_functions.py index 6742eee..e77ee76 100644 --- a/backend/server/test/unit-test/misc_functions.py +++ b/backend/server/test/unit-test/misc_functions.py @@ -16,7 +16,6 @@ # # # -# $Id$ import time import types diff --git a/backend/server/test/unit-test/rhnSQL/test_1.py b/backend/server/test/unit-test/rhnSQL/test_1.py index a0f3074..c00e697 100644 --- a/backend/server/test/unit-test/rhnSQL/test_1.py +++ b/backend/server/test/unit-test/rhnSQL/test_1.py @@ -3,7 +3,6 @@ # # # -# $Id$ import os import string diff --git a/backend/server/test/unit-test/rhnSQL/test_2.py b/backend/server/test/unit-test/rhnSQL/test_2.py index 19a75b6..f0b78c6 100644 --- a/backend/server/test/unit-test/rhnSQL/test_2.py +++ b/backend/server/test/unit-test/rhnSQL/test_2.py @@ -3,7 +3,6 @@ # # # -# $Id$ import unittest from spacewalk.server import rhnSQL diff --git a/backend/server/test/unit-test/rhnSQL/test_executemany.py b/backend/server/test/unit-test/rhnSQL/test_executemany.py index 8940a9b..7cce482 100644 --- a/backend/server/test/unit-test/rhnSQL/test_executemany.py +++ b/backend/server/test/unit-test/rhnSQL/test_executemany.py @@ -3,7 +3,6 @@ # # # -# $Id$ raise Exception(""" diff --git a/backend/server/test/unit-test/rhnSQL/test_lob.py b/backend/server/test/unit-test/rhnSQL/test_lob.py index 74de217..cf0df2e 100644 --- a/backend/server/test/unit-test/rhnSQL/test_lob.py +++ b/backend/server/test/unit-test/rhnSQL/test_lob.py @@ -3,7 +3,6 @@ # # # -# $Id$ import unittest from spacewalk.server import rhnSQL diff --git a/backend/server/test/unit-test/test_capabilities.py b/backend/server/test/unit-test/test_capabilities.py index 2753d49..908dbdc 100644 --- a/backend/server/test/unit-test/test_capabilities.py +++ b/backend/server/test/unit-test/test_capabilities.py @@ -18,7 +18,6 @@ # # Usage: ./xxx.py <server-name> <db> # -# $Id$ import os import sys diff --git a/backend/server/test/unit-test/test_misc_functions.py b/backend/server/test/unit-test/test_misc_functions.py index cc7883f..04f038b 100644 --- a/backend/server/test/unit-test/test_misc_functions.py +++ b/backend/server/test/unit-test/test_misc_functions.py @@ -16,7 +16,6 @@ # # # -# $Id$ import sys import unittest diff --git a/backend/server/test/unit-test/test_rhnActivationKey.py b/backend/server/test/unit-test/test_rhnActivationKey.py index 01eb10a..83794fc 100644 --- a/backend/server/test/unit-test/test_rhnActivationKey.py +++ b/backend/server/test/unit-test/test_rhnActivationKey.py @@ -16,7 +16,6 @@ # # # -# $Id$ import sys import time diff --git a/backend/server/test/unit-test/test_rhnChannel.py b/backend/server/test/unit-test/test_rhnChannel.py index 1e0474a..a0d363e 100644 --- a/backend/server/test/unit-test/test_rhnChannel.py +++ b/backend/server/test/unit-test/test_rhnChannel.py @@ -16,7 +16,6 @@ # # # -# $Id$ import sys import time diff --git a/backend/server/test/unit-test/test_rhnLib_timestamp.py b/backend/server/test/unit-test/test_rhnLib_timestamp.py index 64ecec7..65ee2f8 100644 --- a/backend/server/test/unit-test/test_rhnLib_timestamp.py +++ b/backend/server/test/unit-test/test_rhnLib_timestamp.py @@ -16,7 +16,6 @@ # # # -# $Id$ import sys import time diff --git a/backend/server/test/unit-test/test_rhnServerGroup.py b/backend/server/test/unit-test/test_rhnServerGroup.py index 90a3e14..61638f1 100644 --- a/backend/server/test/unit-test/test_rhnServerGroup.py +++ b/backend/server/test/unit-test/test_rhnServerGroup.py @@ -16,7 +16,6 @@ # # # -# $Id$ import sys import unittest diff --git a/backend/server/test/unit-test/test_server_registration.py b/backend/server/test/unit-test/test_server_registration.py index 77fe59d..10288de 100644 --- a/backend/server/test/unit-test/test_server_registration.py +++ b/backend/server/test/unit-test/test_server_registration.py @@ -16,7 +16,6 @@ # # Tests verious codepaths for server registration # -# $Id$ import sys import unittest diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 30dbcba..2fdcb79 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -626,7 +626,6 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/exportLib.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* -# $Id$ %changelog * Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 - Python pgsql db tests: fix broken test diff --git a/backend/upload_server/Makefile b/backend/upload_server/Makefile index 3975fcb..e28a41e 100644 --- a/backend/upload_server/Makefile +++ b/backend/upload_server/Makefile @@ -1,6 +1,5 @@ # Makefile for the xmlrpc handlers # -# $Id$ TOP = ../ SUBDIR = upload_server diff --git a/backend/upload_server/__init__.py b/backend/upload_server/__init__.py index 326cda8..9aa506f 100644 --- a/backend/upload_server/__init__.py +++ b/backend/upload_server/__init__.py @@ -14,7 +14,6 @@ # # init module for the XML-RPC handlers. Bare. # -# $Id$ # we stat all dirs anyway... __all__ = [] diff --git a/backend/upload_server/handlers/Makefile b/backend/upload_server/handlers/Makefile index d60966b..8405a86 100644 --- a/backend/upload_server/handlers/Makefile +++ b/backend/upload_server/handlers/Makefile @@ -1,6 +1,5 @@ # Makefile for the xmlrpc handlers # -# $Id$ TOP = ../.. SUBDIR = upload_server/handlers diff --git a/backend/upload_server/handlers/__init__.py b/backend/upload_server/handlers/__init__.py index 326cda8..9aa506f 100644 --- a/backend/upload_server/handlers/__init__.py +++ b/backend/upload_server/handlers/__init__.py @@ -14,7 +14,6 @@ # # init module for the XML-RPC handlers. Bare. # -# $Id$ # we stat all dirs anyway... __all__ = [] diff --git a/backend/upload_server/handlers/package_push/Makefile b/backend/upload_server/handlers/package_push/Makefile index f41a6ba..aa9a9b6 100644 --- a/backend/upload_server/handlers/package_push/Makefile +++ b/backend/upload_server/handlers/package_push/Makefile @@ -1,6 +1,5 @@ # Makefile for the xmlrpc module # -# $Id$ TOP = ../../.. SUBDIR = upload_server/handlers/package_push diff --git a/backend/upload_server/handlers/package_push/__init__.py b/backend/upload_server/handlers/package_push/__init__.py index 6f1e1ab..4bb7ad8 100644 --- a/backend/upload_server/handlers/package_push/__init__.py +++ b/backend/upload_server/handlers/package_push/__init__.py @@ -15,7 +15,6 @@ # # This file defines the classes available for the XMLRPC receiver # -# $Id$ __all__ = [] diff --git a/backend/upload_server/handlers/package_push/package_push.py b/backend/upload_server/handlers/package_push/package_push.py index 3652607..03af466 100644 --- a/backend/upload_server/handlers/package_push/package_push.py +++ b/backend/upload_server/handlers/package_push/package_push.py @@ -16,7 +16,6 @@ # in this software or its documentation. # # -# $Id$ import os import base64 diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools b/client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools index ec8a70f..2f2146b 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools +++ b/client/debian/packages-already-in-debian/rhn-client-tools/Makefile.rhn-client-tools @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= MANPATH ?= /usr/share/man diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile index f04bc2b..534c93f 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/data/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= / diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile index 544d0f8..9054968 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/etc-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile index 21fc2b8..eb3303d 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/man/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ # INSTALL scripts INSTALL = install --verbose diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile index 2d6434e..9eace0a 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= VERSION ?= diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile index fec4eff..66fac7c 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ ACTIONS = up2date_config hardware reboot \ rhnsd systemid __init__ diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README index 98d17b3..ba9a927 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/README @@ -149,6 +149,5 @@ to work correctly. Adrian -$Id$ diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile index 1de5aca..fd6fb6f 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ MODULES = rhn_login_gui \ rhn_register_firstboot_gui_window \ diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile index 6d1aea4..7df6c77 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ TOPMODULE = rhn_register MODULES = rhn_login_gui \ diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py index ee6d5aa..9896d07 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py @@ -5,7 +5,6 @@ # Cristian Gafton <gafton(a)redhat.com> # Adrian Likins <alikins(a)redhat.com> # -# $Id$ """ This module includes the Config and Up2date Config classes use by the up2date agent to hold config info. diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py index 3c467d9..90aefa5 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py @@ -6,7 +6,6 @@ # An allowable xmlrpc method is retrieved given a base location, a # hierarchical route to the class/module, and method name. # -# $Id$ import os import string diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py index 1ad3db4..711febe 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py @@ -1,5 +1,4 @@ # -# $Id$ import os import sys diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py index 20ed1e9..f9ceafe 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py @@ -1,5 +1,4 @@ # -# $Id$ import rhnserver import config diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py index 1fe5c95..a391d08 100644 --- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py +++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py @@ -1,5 +1,4 @@ # -# $Id$ import time import config diff --git a/client/debian/packages-already-in-debian/rhnlib/README b/client/debian/packages-already-in-debian/rhnlib/README index 2d1a297..446f9e0 100644 --- a/client/debian/packages-already-in-debian/rhnlib/README +++ b/client/debian/packages-already-in-debian/rhnlib/README @@ -5,7 +5,6 @@ Copyright (C) 2002--2013 Red Hat, Inc. This library is distributed under the terms of the GNU Public License (GPL). -$Id$ 0. HISTORY diff --git a/client/debian/packages-already-in-debian/rhnlib/TODO b/client/debian/packages-already-in-debian/rhnlib/TODO index a23fa39..c92d0b8 100644 --- a/client/debian/packages-already-in-debian/rhnlib/TODO +++ b/client/debian/packages-already-in-debian/rhnlib/TODO @@ -1,4 +1,3 @@ -$Id$ - Check nonblocking support for HTTPS as well. - Allow for multi-valued headers diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py b/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py index f10865c..50c2c71 100644 --- a/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py +++ b/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py @@ -5,7 +5,6 @@ # # Author: Mihai Ibanescu <misa(a)redhat.com> -# $Id$ """ rhn.SSL builds an abstraction on top of the objects provided by pyOpenSSL diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py b/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py index 03c02af..6a96a9b 100644 --- a/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py +++ b/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py @@ -5,7 +5,6 @@ # # Author: Mihai Ibanescu <misa(a)redhat.com> -# $Id$ """ This module implements the SmartIO class """ diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py b/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py index 0fe65b6..07bc235 100644 --- a/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py +++ b/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py @@ -5,7 +5,6 @@ # # Author: Mihai Ibanescu <misa(a)redhat.com> -# $Id$ import base64 diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py b/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py index 5c2abaf..f404529 100644 --- a/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py +++ b/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py @@ -1,7 +1,6 @@ # # # -# $Id$ import select import fcntl diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py b/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py index e3194e4..c708cab4 100644 --- a/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py +++ b/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py @@ -8,7 +8,6 @@ # - Cristian Gafton <gafton(a)redhat.com> # - Erik Troan <ewt(a)redhat.com> -# $Id$ # Transport objects import os diff --git a/client/debian/packages-already-in-debian/rhnlib/setup.cfg.in b/client/debian/packages-already-in-debian/rhnlib/setup.cfg.in index 7d25d00..0c7fe54 100644 --- a/client/debian/packages-already-in-debian/rhnlib/setup.cfg.in +++ b/client/debian/packages-already-in-debian/rhnlib/setup.cfg.in @@ -1,5 +1,4 @@ # Configuration file for distutils -# $Id$ [bdist_rpm] release = @RELEASE@ packager = Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla> diff --git a/client/debian/packages-already-in-debian/rhnlib/setup.py.in b/client/debian/packages-already-in-debian/rhnlib/setup.py.in index 2e6c626..1e3c429 100644 --- a/client/debian/packages-already-in-debian/rhnlib/setup.py.in +++ b/client/debian/packages-already-in-debian/rhnlib/setup.py.in @@ -1,7 +1,6 @@ #!/usr/bin/python # # -# $Id$ from distutils.core import setup diff --git a/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py b/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py index 7e13b8f..874b6fb 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY [SYSTEMID] diff --git a/client/debian/packages-already-in-debian/rhnlib/test/01-get.py b/client/debian/packages-already-in-debian/rhnlib/test/01-get.py index d32fd1d..6b5ba23 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/01-get.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/01-get.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py b/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py index bf7d3a5..d73b974 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py b/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py index ba1e40b..4ccbe6c 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY:PORT [SYSTEMID] [PROXY_USER] [PROXY_PASS] diff --git a/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py b/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py index 887e871..c1717ef 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py @@ -2,7 +2,6 @@ # # tests uploads over SSL # -# $Id$ # # USAGE: $0 SERVER SYSTEMID # OUTPUT: return code = 0 diff --git a/client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py b/client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py index 0cb2f50..e50f3c4 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/06-leaking-ssl-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py b/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py index 3561041..83ab994 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py b/client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py index 16c70b0..1921dfa 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/08-leaking-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py b/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py index e1f1c40..2b2e58e 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py @@ -2,7 +2,6 @@ # # munge the headers to produce an error message # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py b/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py index f088c0e..0f20072 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py @@ -3,7 +3,6 @@ # Test for tempfile creation # Use lsof to see how many open files we have # -# $Id$ import sys import os diff --git a/client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py b/client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py index ea60a15..81d270b 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/11-SmartIO.py @@ -2,7 +2,6 @@ # # Test for SmartIO objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py b/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py index 9ebef25..704f53a 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py b/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py index 1ec7c09..d316cae 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py @@ -2,7 +2,6 @@ # # Test _smart_read over a slow socket # -# $Id$ import sys import os diff --git a/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py b/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py index 42be61c..05e14e6 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ # # 2004-11-29: fails, but it looks like it never worked. Need to investigate diff --git a/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py b/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py index dc69136..7ae9193 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py b/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py index 9a4238f..cf01876 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py b/client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py index 2a0437f..f87e531 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/17-test-multivalued-headers.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys diff --git a/client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py b/client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py index 458b8da..47a9dd7 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/18-split-host.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys diff --git a/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py b/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py index dd72eab..017bffb 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py b/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py index 155c662..66390ba 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY diff --git a/client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py b/client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py index ec5cb61..61ddfbf 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/21-proxy-user-agent.py @@ -2,7 +2,6 @@ # # tests rhn.rpclib.Server(), connection through proxy # -# $Id$ # # USAGE: $0 SERVER PROXY [SYSTEMID] diff --git a/client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py b/client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py index b6c03ec..b117358 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/22-base16values.py @@ -2,7 +2,6 @@ # # Checking if the values encoded in hex (base 16) are properly decoded. # -# $Id$ import os import sys diff --git a/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py b/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py index 6eb3eb7..9db83c0 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py @@ -2,7 +2,6 @@ # # Test case for digest authentication # -# $Id$ # # USAGE: (echo -n) | $0 PORT # diff --git a/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py b/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py index 036a19f..a6b460b 100755 --- a/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ # # USAGE: $0 SERVER CERT """ diff --git a/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py b/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py index 5859fd6..d25a84b 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ """ Tests a memory leak in the applet """ diff --git a/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py b/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py index bd87a28..72c3786 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ """ Negative test - make sure we raise an exception when the wrong SSL cert is used diff --git a/client/debian/packages-already-in-debian/rhnlib/test/Makefile b/client/debian/packages-already-in-debian/rhnlib/test/Makefile index d96915d..8f7c678 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/Makefile +++ b/client/debian/packages-already-in-debian/rhnlib/test/Makefile @@ -1,4 +1,3 @@ -# $Id$ PY_VERSION = $(shell python -c "import sys, string; print string.split(sys.version)[0]") FILES = $(wildcard *.py) diff --git a/client/debian/packages-already-in-debian/rhnlib/test/test_server.py b/client/debian/packages-already-in-debian/rhnlib/test/test_server.py index ff6145c..6943a89 100644 --- a/client/debian/packages-already-in-debian/rhnlib/test/test_server.py +++ b/client/debian/packages-already-in-debian/rhnlib/test/test_server.py @@ -1,7 +1,6 @@ #!/usr/bin/python # # -# $Id$ import unittest from rhn.rpclib import Server diff --git a/client/debian/packages-already-in-debian/rhnsd/man/Makefile b/client/debian/packages-already-in-debian/rhnsd/man/Makefile index 388d9d5..eff8db9 100644 --- a/client/debian/packages-already-in-debian/rhnsd/man/Makefile +++ b/client/debian/packages-already-in-debian/rhnsd/man/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ # INSTALL scripts INSTALL = install --verbose diff --git a/client/debian/packages-already-in-debian/rhnsd/rhnsd.c b/client/debian/packages-already-in-debian/rhnsd/rhnsd.c index 7c6711b..d5a6849 100644 --- a/client/debian/packages-already-in-debian/rhnsd/rhnsd.c +++ b/client/debian/packages-already-in-debian/rhnsd/rhnsd.c @@ -5,7 +5,6 @@ * Cristian Gafton <gafton(a)redhat.com> * * Distributed under GPLv2 - * $Id$ */ #include <features.h> diff --git a/client/rhel/rhn-client-tools/Makefile.rhn-client-tools b/client/rhel/rhn-client-tools/Makefile.rhn-client-tools index ec8a70f..2f2146b 100644 --- a/client/rhel/rhn-client-tools/Makefile.rhn-client-tools +++ b/client/rhel/rhn-client-tools/Makefile.rhn-client-tools @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= MANPATH ?= /usr/share/man diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile index f04bc2b..534c93f 100644 --- a/client/rhel/rhn-client-tools/data/Makefile +++ b/client/rhel/rhn-client-tools/data/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= / diff --git a/client/rhel/rhn-client-tools/etc-conf/Makefile b/client/rhel/rhn-client-tools/etc-conf/Makefile index 544d0f8..9054968 100644 --- a/client/rhel/rhn-client-tools/etc-conf/Makefile +++ b/client/rhel/rhn-client-tools/etc-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= diff --git a/client/rhel/rhn-client-tools/man/Makefile b/client/rhel/rhn-client-tools/man/Makefile index 21fc2b8..eb3303d 100644 --- a/client/rhel/rhn-client-tools/man/Makefile +++ b/client/rhel/rhn-client-tools/man/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ # INSTALL scripts INSTALL = install --verbose diff --git a/client/rhel/rhn-client-tools/src/Makefile b/client/rhel/rhn-client-tools/src/Makefile index ec55eb3..07a130a 100644 --- a/client/rhel/rhn-client-tools/src/Makefile +++ b/client/rhel/rhn-client-tools/src/Makefile @@ -1,6 +1,5 @@ # Makefile for Update Agent # -# $Id$ PREFIX ?= VERSION ?= diff --git a/client/rhel/rhn-client-tools/src/actions/Makefile b/client/rhel/rhn-client-tools/src/actions/Makefile index fec4eff..66fac7c 100644 --- a/client/rhel/rhn-client-tools/src/actions/Makefile +++ b/client/rhel/rhn-client-tools/src/actions/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ ACTIONS = up2date_config hardware reboot \ rhnsd systemid __init__ diff --git a/client/rhel/rhn-client-tools/src/actions/README b/client/rhel/rhn-client-tools/src/actions/README index 98d17b3..ba9a927 100644 --- a/client/rhel/rhn-client-tools/src/actions/README +++ b/client/rhel/rhn-client-tools/src/actions/README @@ -149,6 +149,5 @@ to work correctly. Adrian -$Id$ diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile index 1de5aca..fd6fb6f 100644 --- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile +++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ MODULES = rhn_login_gui \ rhn_register_firstboot_gui_window \ diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile index 6d1aea4..7df6c77 100644 --- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile +++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ TOPMODULE = rhn_register MODULES = rhn_login_gui \ diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py index 4c5c464..ce29178 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/config.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py @@ -5,7 +5,6 @@ # Cristian Gafton <gafton(a)redhat.com> # Adrian Likins <alikins(a)redhat.com> # -# $Id$ """ This module includes the Config and Up2date Config classes use by the up2date agent to hold config info. diff --git a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py index 39da7fb..567f5cc 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py @@ -6,7 +6,6 @@ # An allowable xmlrpc method is retrieved given a base location, a # hierarchical route to the class/module, and method name. # -# $Id$ import os import string diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py index 80b7c69..b3a7836 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py @@ -1,5 +1,4 @@ # -# $Id$ import os import sys diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py index 3110e25..e505849 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py @@ -1,5 +1,4 @@ # -# $Id$ import rhnserver import config diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py index 1fe5c95..a391d08 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py @@ -1,5 +1,4 @@ # -# $Id$ import time import config diff --git a/client/rhel/rhnlib/README b/client/rhel/rhnlib/README index e8f71e6..b46c6f3 100644 --- a/client/rhel/rhnlib/README +++ b/client/rhel/rhnlib/README @@ -5,7 +5,6 @@ Copyright (C) 2002--2013 Red Hat, Inc. This library is distributed under the terms of the GNU Public License (GPL). -$Id$ 0. HISTORY diff --git a/client/rhel/rhnlib/TODO b/client/rhel/rhnlib/TODO index a23fa39..c92d0b8 100644 --- a/client/rhel/rhnlib/TODO +++ b/client/rhel/rhnlib/TODO @@ -1,4 +1,3 @@ -$Id$ - Check nonblocking support for HTTPS as well. - Allow for multi-valued headers diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py index 471d008..8211b28 100644 --- a/client/rhel/rhnlib/rhn/SSL.py +++ b/client/rhel/rhnlib/rhn/SSL.py @@ -18,7 +18,6 @@ # version. If you delete this exception statement from all source # files in the program, then also delete it here. -# $Id$ """ rhn.SSL builds an abstraction on top of the objects provided by pyOpenSSL diff --git a/client/rhel/rhnlib/rhn/SmartIO.py b/client/rhel/rhnlib/rhn/SmartIO.py index 02d1945..d16295c 100644 --- a/client/rhel/rhnlib/rhn/SmartIO.py +++ b/client/rhel/rhnlib/rhn/SmartIO.py @@ -5,7 +5,6 @@ # # Author: Mihai Ibanescu <misa(a)redhat.com> -# $Id$ """ This module implements the SmartIO class """ diff --git a/client/rhel/rhnlib/rhn/connections.py b/client/rhel/rhnlib/rhn/connections.py index 281aac8..fae7662 100644 --- a/client/rhel/rhnlib/rhn/connections.py +++ b/client/rhel/rhnlib/rhn/connections.py @@ -5,7 +5,6 @@ # # Author: Mihai Ibanescu <misa(a)redhat.com> -# $Id$ import base64 diff --git a/client/rhel/rhnlib/rhn/nonblocking.py b/client/rhel/rhnlib/rhn/nonblocking.py index 5c2abaf..f404529 100644 --- a/client/rhel/rhnlib/rhn/nonblocking.py +++ b/client/rhel/rhnlib/rhn/nonblocking.py @@ -1,7 +1,6 @@ # # # -# $Id$ import select import fcntl diff --git a/client/rhel/rhnlib/rhn/transports.py b/client/rhel/rhnlib/rhn/transports.py index d6c46b3..4f9f5a5 100644 --- a/client/rhel/rhnlib/rhn/transports.py +++ b/client/rhel/rhnlib/rhn/transports.py @@ -8,7 +8,6 @@ # - Cristian Gafton <gafton(a)redhat.com> # - Erik Troan <ewt(a)redhat.com> -# $Id$ # Transport objects import os diff --git a/client/rhel/rhnlib/setup.cfg.in b/client/rhel/rhnlib/setup.cfg.in index 7d25d00..0c7fe54 100644 --- a/client/rhel/rhnlib/setup.cfg.in +++ b/client/rhel/rhnlib/setup.cfg.in @@ -1,5 +1,4 @@ # Configuration file for distutils -# $Id$ [bdist_rpm] release = @RELEASE@ packager = Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla> diff --git a/client/rhel/rhnlib/setup.py.in b/client/rhel/rhnlib/setup.py.in index e6c57ff..f0140fd 100644 --- a/client/rhel/rhnlib/setup.py.in +++ b/client/rhel/rhnlib/setup.py.in @@ -1,7 +1,6 @@ #!/usr/bin/python # # -# $Id$ from distutils.core import setup diff --git a/client/rhel/rhnlib/test/00-connection.py b/client/rhel/rhnlib/test/00-connection.py index 7e13b8f..874b6fb 100755 --- a/client/rhel/rhnlib/test/00-connection.py +++ b/client/rhel/rhnlib/test/00-connection.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY [SYSTEMID] diff --git a/client/rhel/rhnlib/test/01-get.py b/client/rhel/rhnlib/test/01-get.py index d32fd1d..6b5ba23 100644 --- a/client/rhel/rhnlib/test/01-get.py +++ b/client/rhel/rhnlib/test/01-get.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/02-callbacks.py b/client/rhel/rhnlib/test/02-callbacks.py index bf7d3a5..d73b974 100755 --- a/client/rhel/rhnlib/test/02-callbacks.py +++ b/client/rhel/rhnlib/test/02-callbacks.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/04-authenticated-proxy.py b/client/rhel/rhnlib/test/04-authenticated-proxy.py index ba1e40b..4ccbe6c 100755 --- a/client/rhel/rhnlib/test/04-authenticated-proxy.py +++ b/client/rhel/rhnlib/test/04-authenticated-proxy.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY:PORT [SYSTEMID] [PROXY_USER] [PROXY_PASS] diff --git a/client/rhel/rhnlib/test/05-delete-packages.py b/client/rhel/rhnlib/test/05-delete-packages.py index 887e871..c1717ef 100644 --- a/client/rhel/rhnlib/test/05-delete-packages.py +++ b/client/rhel/rhnlib/test/05-delete-packages.py @@ -2,7 +2,6 @@ # # tests uploads over SSL # -# $Id$ # # USAGE: $0 SERVER SYSTEMID # OUTPUT: return code = 0 diff --git a/client/rhel/rhnlib/test/06-leaking-ssl-fd.py b/client/rhel/rhnlib/test/06-leaking-ssl-fd.py index 0cb2f50..e50f3c4 100644 --- a/client/rhel/rhnlib/test/06-leaking-ssl-fd.py +++ b/client/rhel/rhnlib/test/06-leaking-ssl-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py index 3561041..83ab994 100644 --- a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py +++ b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/rhel/rhnlib/test/08-leaking-fd.py b/client/rhel/rhnlib/test/08-leaking-fd.py index 16c70b0..1921dfa 100644 --- a/client/rhel/rhnlib/test/08-leaking-fd.py +++ b/client/rhel/rhnlib/test/08-leaking-fd.py @@ -2,7 +2,6 @@ # # tests leaking file descriptors # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/rhel/rhnlib/test/09-test-errcodes.py b/client/rhel/rhnlib/test/09-test-errcodes.py index e1f1c40..2b2e58e 100755 --- a/client/rhel/rhnlib/test/09-test-errcodes.py +++ b/client/rhel/rhnlib/test/09-test-errcodes.py @@ -2,7 +2,6 @@ # # munge the headers to produce an error message # -# $Id$ # # USAGE: $0 SERVER SYSTEMID diff --git a/client/rhel/rhnlib/test/10-tempfile.py b/client/rhel/rhnlib/test/10-tempfile.py index f088c0e..0f20072 100755 --- a/client/rhel/rhnlib/test/10-tempfile.py +++ b/client/rhel/rhnlib/test/10-tempfile.py @@ -3,7 +3,6 @@ # Test for tempfile creation # Use lsof to see how many open files we have # -# $Id$ import sys import os diff --git a/client/rhel/rhnlib/test/11-SmartIO.py b/client/rhel/rhnlib/test/11-SmartIO.py index ea60a15..81d270b 100644 --- a/client/rhel/rhnlib/test/11-SmartIO.py +++ b/client/rhel/rhnlib/test/11-SmartIO.py @@ -2,7 +2,6 @@ # # Test for SmartIO objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/12-Input-Output.py b/client/rhel/rhnlib/test/12-Input-Output.py index 9ebef25..704f53a 100644 --- a/client/rhel/rhnlib/test/12-Input-Output.py +++ b/client/rhel/rhnlib/test/12-Input-Output.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/13-safe_read.py b/client/rhel/rhnlib/test/13-safe_read.py index 1ec7c09..d316cae 100755 --- a/client/rhel/rhnlib/test/13-safe_read.py +++ b/client/rhel/rhnlib/test/13-safe_read.py @@ -2,7 +2,6 @@ # # Test _smart_read over a slow socket # -# $Id$ import sys import os diff --git a/client/rhel/rhnlib/test/14-Input-Output.py b/client/rhel/rhnlib/test/14-Input-Output.py index 42be61c..05e14e6 100644 --- a/client/rhel/rhnlib/test/14-Input-Output.py +++ b/client/rhel/rhnlib/test/14-Input-Output.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ # # 2004-11-29: fails, but it looks like it never worked. Need to investigate diff --git a/client/rhel/rhnlib/test/15-ranges.py b/client/rhel/rhnlib/test/15-ranges.py index dc69136..7ae9193 100644 --- a/client/rhel/rhnlib/test/15-ranges.py +++ b/client/rhel/rhnlib/test/15-ranges.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/16-test-ranges.py b/client/rhel/rhnlib/test/16-test-ranges.py index 9a4238f..cf01876 100644 --- a/client/rhel/rhnlib/test/16-test-ranges.py +++ b/client/rhel/rhnlib/test/16-test-ranges.py @@ -2,7 +2,6 @@ # # Tests the encodings in Input and Output objects # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/17-test-multivalued-headers.py b/client/rhel/rhnlib/test/17-test-multivalued-headers.py index 2a0437f..f87e531 100644 --- a/client/rhel/rhnlib/test/17-test-multivalued-headers.py +++ b/client/rhel/rhnlib/test/17-test-multivalued-headers.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys diff --git a/client/rhel/rhnlib/test/18-split-host.py b/client/rhel/rhnlib/test/18-split-host.py index 458b8da..47a9dd7 100755 --- a/client/rhel/rhnlib/test/18-split-host.py +++ b/client/rhel/rhnlib/test/18-split-host.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys diff --git a/client/rhel/rhnlib/test/19-redirects.py b/client/rhel/rhnlib/test/19-redirects.py index dd72eab..017bffb 100755 --- a/client/rhel/rhnlib/test/19-redirects.py +++ b/client/rhel/rhnlib/test/19-redirects.py @@ -2,7 +2,6 @@ # # # -# $Id$ import sys sys.path.append('..') diff --git a/client/rhel/rhnlib/test/20-proxy-user-agent.py b/client/rhel/rhnlib/test/20-proxy-user-agent.py index 155c662..66390ba 100755 --- a/client/rhel/rhnlib/test/20-proxy-user-agent.py +++ b/client/rhel/rhnlib/test/20-proxy-user-agent.py @@ -2,7 +2,6 @@ # # # -# $Id$ # # Usage: $0 SERVER PROXY diff --git a/client/rhel/rhnlib/test/21-proxy-user-agent.py b/client/rhel/rhnlib/test/21-proxy-user-agent.py index ec5cb61..61ddfbf 100755 --- a/client/rhel/rhnlib/test/21-proxy-user-agent.py +++ b/client/rhel/rhnlib/test/21-proxy-user-agent.py @@ -2,7 +2,6 @@ # # tests rhn.rpclib.Server(), connection through proxy # -# $Id$ # # USAGE: $0 SERVER PROXY [SYSTEMID] diff --git a/client/rhel/rhnlib/test/22-base16values.py b/client/rhel/rhnlib/test/22-base16values.py index b6c03ec..b117358 100644 --- a/client/rhel/rhnlib/test/22-base16values.py +++ b/client/rhel/rhnlib/test/22-base16values.py @@ -2,7 +2,6 @@ # # Checking if the values encoded in hex (base 16) are properly decoded. # -# $Id$ import os import sys diff --git a/client/rhel/rhnlib/test/23-digest-auth.py b/client/rhel/rhnlib/test/23-digest-auth.py index 6eb3eb7..9db83c0 100755 --- a/client/rhel/rhnlib/test/23-digest-auth.py +++ b/client/rhel/rhnlib/test/23-digest-auth.py @@ -2,7 +2,6 @@ # # Test case for digest authentication # -# $Id$ # # USAGE: (echo -n) | $0 PORT # diff --git a/client/rhel/rhnlib/test/24-ssl-memleak.py b/client/rhel/rhnlib/test/24-ssl-memleak.py index 036a19f..a6b460b 100755 --- a/client/rhel/rhnlib/test/24-ssl-memleak.py +++ b/client/rhel/rhnlib/test/24-ssl-memleak.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ # # USAGE: $0 SERVER CERT """ diff --git a/client/rhel/rhnlib/test/25-ssl-memleak.py b/client/rhel/rhnlib/test/25-ssl-memleak.py index 5859fd6..d25a84b 100644 --- a/client/rhel/rhnlib/test/25-ssl-memleak.py +++ b/client/rhel/rhnlib/test/25-ssl-memleak.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ """ Tests a memory leak in the applet """ diff --git a/client/rhel/rhnlib/test/26-ssl-bad-cert.py b/client/rhel/rhnlib/test/26-ssl-bad-cert.py index bd87a28..72c3786 100644 --- a/client/rhel/rhnlib/test/26-ssl-bad-cert.py +++ b/client/rhel/rhnlib/test/26-ssl-bad-cert.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -# $Id$ """ Negative test - make sure we raise an exception when the wrong SSL cert is used diff --git a/client/rhel/rhnlib/test/Makefile b/client/rhel/rhnlib/test/Makefile index d96915d..8f7c678 100644 --- a/client/rhel/rhnlib/test/Makefile +++ b/client/rhel/rhnlib/test/Makefile @@ -1,4 +1,3 @@ -# $Id$ PY_VERSION = $(shell python -c "import sys, string; print string.split(sys.version)[0]") FILES = $(wildcard *.py) diff --git a/client/rhel/rhnlib/test/test_server.py b/client/rhel/rhnlib/test/test_server.py index ff6145c..6943a89 100644 --- a/client/rhel/rhnlib/test/test_server.py +++ b/client/rhel/rhnlib/test/test_server.py @@ -1,7 +1,6 @@ #!/usr/bin/python # # -# $Id$ import unittest from rhn.rpclib import Server diff --git a/client/rhel/rhnsd/man/Makefile b/client/rhel/rhnsd/man/Makefile index 388d9d5..eff8db9 100644 --- a/client/rhel/rhnsd/man/Makefile +++ b/client/rhel/rhnsd/man/Makefile @@ -1,6 +1,5 @@ # Makefile for installing man pages for the up2date client # -# $Id$ # INSTALL scripts INSTALL = install --verbose diff --git a/client/rhel/rhnsd/rhnsd.c b/client/rhel/rhnsd/rhnsd.c index 5f0711d..ccebcad 100644 --- a/client/rhel/rhnsd/rhnsd.c +++ b/client/rhel/rhnsd/rhnsd.c @@ -5,7 +5,6 @@ * Cristian Gafton <gafton(a)redhat.com> * * Distributed under GPLv2 - * $Id$ */ #include <features.h> diff --git a/client/solaris/rhnclient/compile.py b/client/solaris/rhnclient/compile.py index 847debb..ac9818d 100755 --- a/client/solaris/rhnclient/compile.py +++ b/client/solaris/rhnclient/compile.py @@ -18,7 +18,6 @@ # opposed to the Python one, this script returns error codes when a # compile fails, so it can be used from Makefiles # -# $Id$ import os import sys diff --git a/client/solaris/rhnclient/rhn/actions/__init__.py b/client/solaris/rhnclient/rhn/actions/__init__.py index 96ac67e..9885cbb 100755 --- a/client/solaris/rhnclient/rhn/actions/__init__.py +++ b/client/solaris/rhnclient/rhn/actions/__init__.py @@ -2,7 +2,6 @@ # RHN Action exporter # Copyright (c) 1999-2005 Red Hat, Inc. Distributed under GPL. -# $Id$ def do_call(method, params): """Find and execute an allowable xmlrpc method. diff --git a/client/tools/osad/Makefile.defs b/client/tools/osad/Makefile.defs index 760d918..10c1f3c 100644 --- a/client/tools/osad/Makefile.defs +++ b/client/tools/osad/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/client/tools/osad/Makefile.osad b/client/tools/osad/Makefile.osad index f8424cd..e24b8cc 100644 --- a/client/tools/osad/Makefile.osad +++ b/client/tools/osad/Makefile.osad @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ PKGNAME = osad VERSION = $(shell echo `awk '{ print $$1 }' version`) diff --git a/client/tools/osad/logrotate/Makefile b/client/tools/osad/logrotate/Makefile index c13952a..ebae345 100644 --- a/client/tools/osad/logrotate/Makefile +++ b/client/tools/osad/logrotate/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the logrotation configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/osad/osad-conf/Makefile b/client/tools/osad/osad-conf/Makefile index 4c628fe..585e7e6 100644 --- a/client/tools/osad/osad-conf/Makefile +++ b/client/tools/osad/osad-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the RHN server configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/osad/rhn-conf/Makefile b/client/tools/osad/rhn-conf/Makefile index 6fea6b2..41eb5ad 100644 --- a/client/tools/osad/rhn-conf/Makefile +++ b/client/tools/osad/rhn-conf/Makefile @@ -1,6 +1,5 @@ # Makefile for installation of the RHN server configuration files # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/osad/src/Makefile b/client/tools/osad/src/Makefile index 1463de9..844487c 100644 --- a/client/tools/osad/src/Makefile +++ b/client/tools/osad/src/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/rhn-kickstart/Makefile.defs b/client/tools/rhn-kickstart/Makefile.defs index 2f22d1b..86fef3f 100644 --- a/client/tools/rhn-kickstart/Makefile.defs +++ b/client/tools/rhn-kickstart/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/client/tools/rhn-kickstart/Makefile.rhn-kickstart b/client/tools/rhn-kickstart/Makefile.rhn-kickstart index 878d7ea..84afcb8 100644 --- a/client/tools/rhn-kickstart/Makefile.rhn-kickstart +++ b/client/tools/rhn-kickstart/Makefile.rhn-kickstart @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ NAME = rhn-kickstart diff --git a/client/tools/rhn-kickstart/actions/Makefile b/client/tools/rhn-kickstart/actions/Makefile index 3ff0cdf..d4b89c5 100644 --- a/client/tools/rhn-kickstart/actions/Makefile +++ b/client/tools/rhn-kickstart/actions/Makefile @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ TOP = .. ROOT = /usr/share/rhn diff --git a/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py b/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py index 19db3e1..3cf10be 100644 --- a/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py +++ b/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py @@ -15,7 +15,6 @@ # # Kickstart-related exceptions. # -# $Id$ class KickstartException(Exception): """General kickstart exception.""" diff --git a/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py b/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py index 3f2b18b..6f27423 100644 --- a/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py +++ b/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py @@ -15,7 +15,6 @@ # # Kickstart functions for Xen guests. # -# $Id$ import os import random diff --git a/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py b/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py index 7427046..19fbb4b 100644 --- a/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py +++ b/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py @@ -15,7 +15,6 @@ # # Kickstart-related exceptions. # -# $Id$ from kickstart_exceptions import KickstartException diff --git a/client/tools/rhn-kickstart/test/test-copy-files.py b/client/tools/rhn-kickstart/test/test-copy-files.py index 5e6598f..3d67156 100644 --- a/client/tools/rhn-kickstart/test/test-copy-files.py +++ b/client/tools/rhn-kickstart/test/test-copy-files.py @@ -15,7 +15,6 @@ # # Copy files # -# $Id$ from kickstart import kickstart diff --git a/client/tools/rhncfg/Makefile.defs b/client/tools/rhncfg/Makefile.defs index 3bb7bc5..f75b530 100644 --- a/client/tools/rhncfg/Makefile.defs +++ b/client/tools/rhncfg/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/client/tools/rhncfg/Makefile.rhncfg b/client/tools/rhncfg/Makefile.rhncfg index b921c31..e747da8 100644 --- a/client/tools/rhncfg/Makefile.rhncfg +++ b/client/tools/rhncfg/Makefile.rhncfg @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = . diff --git a/client/tools/rhncfg/actions/Makefile b/client/tools/rhncfg/actions/Makefile index abdff57..e3e0011 100644 --- a/client/tools/rhncfg/actions/Makefile +++ b/client/tools/rhncfg/actions/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/rhncfg/config_client/Makefile b/client/tools/rhncfg/config_client/Makefile index 6de314f..5e9b585 100644 --- a/client/tools/rhncfg/config_client/Makefile +++ b/client/tools/rhncfg/config_client/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/rhncfg/config_common/Makefile b/client/tools/rhncfg/config_common/Makefile index bcb1b74..22063a0 100644 --- a/client/tools/rhncfg/config_common/Makefile +++ b/client/tools/rhncfg/config_common/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/rhncfg/config_management/Makefile b/client/tools/rhncfg/config_management/Makefile index f40e8e7..c4db256 100644 --- a/client/tools/rhncfg/config_management/Makefile +++ b/client/tools/rhncfg/config_management/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk backend # -# $Id$ # what is the backend top dir TOP = .. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index 902c002..84ca5b77 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -118,7 +118,6 @@ fi %{_mandir}/man8/rhn-actions-control.8* %ghost %attr(600,root,root) %{_localstatedir}/log/rhncfg-actions -# $Id$ %changelog * Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.64-1 - Adding fallback support for numeric UID/GID diff --git a/client/tools/rhncustominfo/Makefile.defs b/client/tools/rhncustominfo/Makefile.defs index 3c9dc85..096af01 100644 --- a/client/tools/rhncustominfo/Makefile.defs +++ b/client/tools/rhncustominfo/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/client/tools/rhncustominfo/Makefile.rhn-custom-info b/client/tools/rhncustominfo/Makefile.rhn-custom-info index d04240b..c99356e 100644 --- a/client/tools/rhncustominfo/Makefile.rhn-custom-info +++ b/client/tools/rhncustominfo/Makefile.rhn-custom-info @@ -1,6 +1,5 @@ # Makefile for rhncustominfo # -# $Id$ # what is the backend top dir TOP = . diff --git a/client/tools/rhnpush/Makefile.rhnpush b/client/tools/rhnpush/Makefile.rhnpush index 247aa1e..3061a7d 100644 --- a/client/tools/rhnpush/Makefile.rhnpush +++ b/client/tools/rhnpush/Makefile.rhnpush @@ -1,6 +1,5 @@ # Makefile for the rhnpush module # -# $Id$ INSTALL = install -D -p --verbose INSTALL_BIN = $(INSTALL) -m 755 diff --git a/client/tools/rhnpush/rhnpush b/client/tools/rhnpush/rhnpush index 6ef6a61..48142ff 100755 --- a/client/tools/rhnpush/rhnpush +++ b/client/tools/rhnpush/rhnpush @@ -2,7 +2,6 @@ # # Wrapper for rhnpush.py # -# $Id$ import os import sys diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py index 4f32dde..6697bb2 100755 --- a/client/tools/rhnpush/rhnpush.py +++ b/client/tools/rhnpush/rhnpush.py @@ -14,7 +14,6 @@ # # -# $Id$ """ Management tool for the Spacewalk Proxy. diff --git a/client/tools/rhnpush/rhnpush_v2.py b/client/tools/rhnpush/rhnpush_v2.py index 42e1f53..46f10a0 100644 --- a/client/tools/rhnpush/rhnpush_v2.py +++ b/client/tools/rhnpush/rhnpush_v2.py @@ -16,7 +16,6 @@ # # Package uploading tool # -# $Id$ import base64 diff --git a/client/tools/spacewalk-koan/Makefile.defs b/client/tools/spacewalk-koan/Makefile.defs index 5a20fe7..edbefcb 100644 --- a/client/tools/spacewalk-koan/Makefile.defs +++ b/client/tools/spacewalk-koan/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/client/tools/spacewalk-koan/actions/Makefile b/client/tools/spacewalk-koan/actions/Makefile index 3ff0cdf..d4b89c5 100644 --- a/client/tools/spacewalk-koan/actions/Makefile +++ b/client/tools/spacewalk-koan/actions/Makefile @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ TOP = .. ROOT = /usr/share/rhn diff --git a/java/conf/logrotate/rhn_web_api b/java/conf/logrotate/rhn_web_api index 4a7808a..4a54a27 100644 --- a/java/conf/logrotate/rhn_web_api +++ b/java/conf/logrotate/rhn_web_api @@ -1,6 +1,5 @@ # logrotation file for Spacewalk Server # -# $Id$ /var/log/rhn/rhn_web_api.log { weekly diff --git a/proxy/changes-notes-v3x.txt b/proxy/changes-notes-v3x.txt index 60e78e9..eb556ff 100644 --- a/proxy/changes-notes-v3x.txt +++ b/proxy/changes-notes-v3x.txt @@ -1,6 +1,5 @@ This document outlines some of the big changes occuring for Spacewalk Proxy 3.* ------------------------------------------------------------------------- -$Id$ Changes in the Spacewalk Proxy architexture required dramatic changes in the config files. Most everything was simplified. diff --git a/scripts/update_symlinks.py b/scripts/update_symlinks.py index 7c0bb03..bd735ac 100755 --- a/scripts/update_symlinks.py +++ b/scripts/update_symlinks.py @@ -16,7 +16,6 @@ # # Test for blob updates # -# $Id$ """ This script is meant to be used by spacewalk users upgrading from 1.0 to 1.1. diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin index 7cf65e6..bdfb8de 100644 --- a/spacewalk/admin/Makefile.admin +++ b/spacewalk/admin/Makefile.admin @@ -15,7 +15,6 @@ # # Makefile for Red Hat Satellite admin scripts # -# $Id$ BINDIR = /usr/bin SBINDIR = /usr/sbin diff --git a/spacewalk/admin/rhn-config-satellite.pl b/spacewalk/admin/rhn-config-satellite.pl index c6bc238..d1c18b1 100755 --- a/spacewalk/admin/rhn-config-satellite.pl +++ b/spacewalk/admin/rhn-config-satellite.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use warnings; diff --git a/spacewalk/admin/rhn-config-schema.pl b/spacewalk/admin/rhn-config-schema.pl index 494d0fd..45938b7 100755 --- a/spacewalk/admin/rhn-config-schema.pl +++ b/spacewalk/admin/rhn-config-schema.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use warnings; diff --git a/spacewalk/admin/rhn-deploy-ca-cert.pl b/spacewalk/admin/rhn-deploy-ca-cert.pl index b698077..d6b7423 100755 --- a/spacewalk/admin/rhn-deploy-ca-cert.pl +++ b/spacewalk/admin/rhn-deploy-ca-cert.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use warnings; diff --git a/spacewalk/admin/rhn-generate-pem.pl b/spacewalk/admin/rhn-generate-pem.pl index 0845b47..61eb7fc 100644 --- a/spacewalk/admin/rhn-generate-pem.pl +++ b/spacewalk/admin/rhn-generate-pem.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use warnings; diff --git a/spacewalk/admin/rhn-install-ssl-cert.pl b/spacewalk/admin/rhn-install-ssl-cert.pl index 6531bc2..e64f767 100755 --- a/spacewalk/admin/rhn-install-ssl-cert.pl +++ b/spacewalk/admin/rhn-install-ssl-cert.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use warnings; diff --git a/spacewalk/admin/rhn-sat-restart-silent b/spacewalk/admin/rhn-sat-restart-silent index 1954708..0ff948d 100644 --- a/spacewalk/admin/rhn-sat-restart-silent +++ b/spacewalk/admin/rhn-sat-restart-silent @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ # We do this, because Runtime.exec in the java code seems to only allocate a buffer so big for stdout # and since we are restarting ourself, we can not flush the buffer in order diff --git a/spacewalk/admin/validate-sat-cert.pl b/spacewalk/admin/validate-sat-cert.pl index aadc8b8..d4685ad 100755 --- a/spacewalk/admin/validate-sat-cert.pl +++ b/spacewalk/admin/validate-sat-cert.pl @@ -14,7 +14,6 @@ # in this software or its documentation. # # -# $Id$ use strict; use lib '/var/www/lib'; diff --git a/spacewalk/certs-tools/Makefile.certs b/spacewalk/certs-tools/Makefile.certs index 7cf1311..104174a 100644 --- a/spacewalk/certs-tools/Makefile.certs +++ b/spacewalk/certs-tools/Makefile.certs @@ -14,7 +14,6 @@ # # Makefile for the backend directory # -# $Id$ SUBDIR = certs diff --git a/spacewalk/certs-tools/Makefile.defs b/spacewalk/certs-tools/Makefile.defs index 738779a..8a83e49 100644 --- a/spacewalk/certs-tools/Makefile.defs +++ b/spacewalk/certs-tools/Makefile.defs @@ -15,7 +15,6 @@ # # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/spacewalk/certs-tools/__init__.py b/spacewalk/certs-tools/__init__.py index 2471807..16ee96b 100644 --- a/spacewalk/certs-tools/__init__.py +++ b/spacewalk/certs-tools/__init__.py @@ -13,6 +13,5 @@ # in this software or its documentation. # # -# $Id$ __all__ = [] diff --git a/spacewalk/certs-tools/client_config_update.py b/spacewalk/certs-tools/client_config_update.py index e9d941c..8a295c8 100755 --- a/spacewalk/certs-tools/client_config_update.py +++ b/spacewalk/certs-tools/client_config_update.py @@ -23,7 +23,6 @@ # # Author: Todd Warner <taw(a)redhat.com> # -# $Id$ """ Client configuration mapping script that writes to an RHN Update Agent-type diff --git a/spacewalk/certs-tools/gen-rpm.sh b/spacewalk/certs-tools/gen-rpm.sh index 1dccbe7..ebc2402 100755 --- a/spacewalk/certs-tools/gen-rpm.sh +++ b/spacewalk/certs-tools/gen-rpm.sh @@ -15,7 +15,6 @@ # # Builds an rpm out of command line options # -# $Id$ PATH=$PATH:/usr/bin diff --git a/spacewalk/certs-tools/rhn-bootstrap b/spacewalk/certs-tools/rhn-bootstrap index bcb50e7..ff35add 100755 --- a/spacewalk/certs-tools/rhn-bootstrap +++ b/spacewalk/certs-tools/rhn-bootstrap @@ -18,7 +18,6 @@ # # Author: Todd Warner <taw(a)redhat.com> # -# $Id$ ## language imports import sys diff --git a/spacewalk/certs-tools/rhn-ssl-tool b/spacewalk/certs-tools/rhn-ssl-tool index 1bb9777..c16f3b7 100755 --- a/spacewalk/certs-tools/rhn-ssl-tool +++ b/spacewalk/certs-tools/rhn-ssl-tool @@ -24,7 +24,6 @@ # # Author: Todd Warner <taw(a)redhat.com> # -# $Id$ ## language imports diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py index 3d98369..9438c9f 100644 --- a/spacewalk/certs-tools/rhn_bootstrap.py +++ b/spacewalk/certs-tools/rhn_bootstrap.py @@ -19,7 +19,6 @@ # # Author: Todd Warner <taw(a)redhat.com> # -# $Id$ ## language imports import os diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py index 3e4423e..99d3c77 100644 --- a/spacewalk/certs-tools/rhn_bootstrap_strings.py +++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py @@ -15,7 +15,6 @@ # # shell script function library for rhn-bootstrap # -# $Id$ import os.path diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py index afe4d48..59bfa21 100755 --- a/spacewalk/certs-tools/rhn_ssl_tool.py +++ b/spacewalk/certs-tools/rhn_ssl_tool.py @@ -29,7 +29,6 @@ # # Author: Todd Warner <taw(a)redhat.com> # -# $Id$ ## language imports diff --git a/spacewalk/certs-tools/sign.sh b/spacewalk/certs-tools/sign.sh index 8e60f93..7fa8138 100755 --- a/spacewalk/certs-tools/sign.sh +++ b/spacewalk/certs-tools/sign.sh @@ -22,7 +22,6 @@ # RHN-ORG-TRUSTED-SSL-CERT (or ca.cert) is packaged as # rhn-org-trusted-ssl-cert-*.rpm # -# $Id$ TOPDIR=$(cd $(dirname $0) && pwd) diff --git a/spacewalk/certs-tools/ssl-howto.txt b/spacewalk/certs-tools/ssl-howto.txt index 9498ba4..4c8f2c3 100644 --- a/spacewalk/certs-tools/ssl-howto.txt +++ b/spacewalk/certs-tools/ssl-howto.txt @@ -1,7 +1,6 @@ More expansive description of how we create CA keys/certs and httpd-server keys/cert-reqs/certs: ------------------------------------------------------------------------------ -$Id$ XXX Needs to be updated XXX diff --git a/spacewalk/certs-tools/sslToolCli.py b/spacewalk/certs-tools/sslToolCli.py index 1e85c74..b675ad4 100644 --- a/spacewalk/certs-tools/sslToolCli.py +++ b/spacewalk/certs-tools/sslToolCli.py @@ -15,7 +15,6 @@ # # rhn-ssl-tool command line option module # -# $Id$ ## FIXME: the logic here is *WAY* too complicated. Need to simplify -taw diff --git a/spacewalk/certs-tools/sslToolConfig.py b/spacewalk/certs-tools/sslToolConfig.py index 7f13999..0b75f38 100644 --- a/spacewalk/certs-tools/sslToolConfig.py +++ b/spacewalk/certs-tools/sslToolConfig.py @@ -15,7 +15,6 @@ # # rhn-ssl-tool openssl.cnf style file manipulation class # -# $Id$ ## FIXME: the logic here is *WAY* too complicated. Need to simplify -taw diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py index e3e92dd..28ebb02 100644 --- a/spacewalk/certs-tools/sslToolLib.py +++ b/spacewalk/certs-tools/sslToolLib.py @@ -15,7 +15,6 @@ # # rhn-ssl-tool general library # -# $Id$ ## language imports import os diff --git a/spacewalk/certs-tools/timeLib.py b/spacewalk/certs-tools/timeLib.py index 3b42656..8f82cb9 100644 --- a/spacewalk/certs-tools/timeLib.py +++ b/spacewalk/certs-tools/timeLib.py @@ -20,7 +20,6 @@ # NOTE: translating seconds to years is an approximation. I.e., xxx secs * # 365 not really right. Some years do not come out to 365 days. # -# $Id$ # # The Unix Epoch is/was: 1970-01-01 00:00:00 diff --git a/utils/Makefile b/utils/Makefile index 0096ff8..b76d1de 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,6 +1,5 @@ # Makefile for spacewalk-utils # -# $Id$ NAME := spacewalk-utils diff --git a/utils/Makefile.defs b/utils/Makefile.defs index 5fd08e2..6191623 100644 --- a/utils/Makefile.defs +++ b/utils/Makefile.defs @@ -1,6 +1,5 @@ # Common pathnames and programs for the Spacewalk project # -# $Id$ # if not defined, definit as a noop TOP ?= . diff --git a/web/Makefile.defs b/web/Makefile.defs index d8bca5e..a5b651f 100644 --- a/web/Makefile.defs +++ b/web/Makefile.defs @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ # perl setup PERL = /usr/bin/perl diff --git a/web/Makefile.spacewalk-web b/web/Makefile.spacewalk-web index 900f537..7d58f79 100644 --- a/web/Makefile.spacewalk-web +++ b/web/Makefile.spacewalk-web @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ # global defines which control this build and where we deploy files PREFIX = diff --git a/web/html/Makefile b/web/html/Makefile index ccf016f..d815a1b 100644 --- a/web/html/Makefile +++ b/web/html/Makefile @@ -1,6 +1,5 @@ # Makefile for installing the html files for RHN # -# $Id$ TOP = .. diff --git a/web/include/Makefile b/web/include/Makefile index 2095184..07833a5 100644 --- a/web/include/Makefile +++ b/web/include/Makefile @@ -1,6 +1,5 @@ # Makefile for installing the html files for RHN # -# $Id$ TOP = .. diff --git a/web/modules/Makefile b/web/modules/Makefile index 4562953..fd60ffd 100644 --- a/web/modules/Makefile +++ b/web/modules/Makefile @@ -1,6 +1,5 @@ # Makefile for the backend directory # -# $Id$ TOP = .. diff --git a/web/modules/dobby/Makefile b/web/modules/dobby/Makefile index 392f26c..137f9de 100644 --- a/web/modules/dobby/Makefile +++ b/web/modules/dobby/Makefile @@ -1,6 +1,5 @@ # dummy Makefile for perl module # -# $Id$ TOP = ../.. export TOP diff --git a/web/modules/dobby/Makefile.PL b/web/modules/dobby/Makefile.PL index 4532953..0c9b1ed 100644 --- a/web/modules/dobby/Makefile.PL +++ b/web/modules/dobby/Makefile.PL @@ -1,7 +1,6 @@ #!/usr/bin/perl # perl makefile for the dobby module # -# $Id$ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence diff --git a/web/modules/grail/Makefile b/web/modules/grail/Makefile index 392f26c..137f9de 100644 --- a/web/modules/grail/Makefile +++ b/web/modules/grail/Makefile @@ -1,6 +1,5 @@ # dummy Makefile for perl module # -# $Id$ TOP = ../.. export TOP diff --git a/web/modules/grail/Makefile.PL b/web/modules/grail/Makefile.PL index f05d96f..b3c8426 100644 --- a/web/modules/grail/Makefile.PL +++ b/web/modules/grail/Makefile.PL @@ -1,7 +1,6 @@ #!/usr/bin/perl # perl makefile for the grail module # -# $Id$ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence diff --git a/web/modules/pxt/Makefile b/web/modules/pxt/Makefile index 392f26c..137f9de 100644 --- a/web/modules/pxt/Makefile +++ b/web/modules/pxt/Makefile @@ -1,6 +1,5 @@ # dummy Makefile for perl module # -# $Id$ TOP = ../.. export TOP diff --git a/web/modules/pxt/Makefile.PL b/web/modules/pxt/Makefile.PL index 849bb5a..8b9a12c 100644 --- a/web/modules/pxt/Makefile.PL +++ b/web/modules/pxt/Makefile.PL @@ -1,7 +1,6 @@ #!/usr/bin/perl # perl makefile for the pxt module # -# $Id$ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence diff --git a/web/modules/rhn/Makefile b/web/modules/rhn/Makefile index 392f26c..137f9de 100644 --- a/web/modules/rhn/Makefile +++ b/web/modules/rhn/Makefile @@ -1,6 +1,5 @@ # dummy Makefile for perl module # -# $Id$ TOP = ../.. export TOP diff --git a/web/modules/rhn/Makefile.PL b/web/modules/rhn/Makefile.PL index 2131646..f1606b6 100644 --- a/web/modules/rhn/Makefile.PL +++ b/web/modules/rhn/Makefile.PL @@ -1,7 +1,6 @@ #!/usr/bin/perl # perl makefile for the cypress module # -# $Id$ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence diff --git a/web/modules/sniglets/Makefile b/web/modules/sniglets/Makefile index 392f26c..137f9de 100644 --- a/web/modules/sniglets/Makefile +++ b/web/modules/sniglets/Makefile @@ -1,6 +1,5 @@ # dummy Makefile for perl module # -# $Id$ TOP = ../.. export TOP diff --git a/web/modules/sniglets/Makefile.PL b/web/modules/sniglets/Makefile.PL index b8076cc..2b259b5 100644 --- a/web/modules/sniglets/Makefile.PL +++ b/web/modules/sniglets/Makefile.PL @@ -1,7 +1,6 @@ #!/usr/bin/perl # perl makefile for the cypress module # -# $Id$ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 5961f9c..2df736f 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -270,7 +270,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/spacewalk/web %doc LICENSE -# $Id$ %changelog * Mon Oct 07 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.23-1 - Revert "removing Perl reboot system page"

1 0

3 commits - proxy/installer
by mkollar 09 Oct '13

09 Oct '13

proxy/installer/configure-proxy.sh | 75 +++++++++++++++++--------------- proxy/installer/configure-proxy.sh.sgml | 28 ----------- 2 files changed, 44 insertions(+), 59 deletions(-) New commits: commit 232c9f72c6c2b79c7900924b39502c94f65047b9 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 7 17:33:39 2013 +0200 Honour behavior described in help diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 6dfb18e..affebfb 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -163,6 +163,11 @@ if [[ $INTERACTIVE == 0 \ exit 1 fi +if [[ $INTERACTIVE == 0 && -z $ANSWER_FILE ]]; then + echo "Option --non-interactive is for use only with option --answer-file." + exit 1 +fi + ACCUMULATED_ANSWERS="" generate_answers() { commit af4525277614b70ba6aeef55471f6b323e6f646f Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 7 17:15:35 2013 +0200 Revert "Removed set_value as getopt made it redundant" This reverts commit acf4e0dd94e425e9e4d94549642c74d64392bf0f. Some users wanted this, even though it is fundamentally wrong. By this we are guessing that someone made mistake and forgot to pass required arguments. diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 34eadf6..6dfb18e 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -90,6 +90,16 @@ parse_answer_file() { done } +set_value() { + local OPTION="$1" + local VAR="$2" + local ARG="$3" + [[ "$ARG" =~ ^- ]] \ + && echo "$0: option $OPTION requires argument! Use answer file if your argument starts with '-'." \ + && print_help + eval "$(printf "%q=%q" "$VAR" "$ARG")" +} + INTERACTIVE=1 CNAME_INDEX=0 @@ -105,34 +115,34 @@ eval set -- "$OPTS" while : ; do case "$1" in --help|-h) print_help;; - --answer-file) ANSWER_FILE="$2"; + --answer-file) set_value "$1" ANSWER_FILE "$2"; parse_answer_file "$ANSWER_FILE"; shift;; --non-interactive) INTERACTIVE=0;; - --version) VERSION="$2"; shift;; - --traceback-email) TRACEBACK_EMAIL="$2"; shift;; + --version) set_value "$1" VERSION "$2"; shift;; + --traceback-email) set_value "$1" TRACEBACK_EMAIL "$2"; shift;; --use-ssl) USE_SSL="${2:-1}"; shift;; --force-own-ca) FORCE_OWN_CA=1;; - --http-proxy) HTTP_PROXY="$2"; shift;; - --http-username) HTTP_USERNAME="$2"; shift;; - --http-password) HTTP_PASSWORD="$2"; shift;; - --ssl-build-dir) SSL_BUILD_DIR="$2"; shift;; - --ssl-org) SSL_ORG="$2"; shift;; - --ssl-orgunit) SSL_ORGUNIT="$2"; shift;; - --ssl-common) SSL_COMMON="$2"; shift;; - --ssl-city) SSL_CITY="$2"; shift;; - --ssl-state) SSL_STATE="$2"; shift;; - --ssl-country) SSL_COUNTRY="$2"; shift;; - --ssl-email) SSL_EMAIL="$2"; shift;; - --ssl-password) SSL_PASSWORD="$2"; shift;; + --http-proxy) set_value "$1" HTTP_PROXY "$2"; shift;; + --http-username) set_value "$1" HTTP_USERNAME "$2"; shift;; + --http-password) set_value "$1" HTTP_PASSWORD "$2"; shift;; + --ssl-build-dir) set_value "$1" SSL_BUILD_DIR "$2"; shift;; + --ssl-org) set_value "$1" SSL_ORG "$2"; shift;; + --ssl-orgunit) set_value "$1" SSL_ORGUNIT "$2"; shift;; + --ssl-common) set_value "$1" SSL_COMMON "$2"; shift;; + --ssl-city) set_value "$1" SSL_CITY "$2"; shift;; + --ssl-state) set_value "$1" SSL_STATE "$2"; shift;; + --ssl-country) set_value "$1" SSL_COUNTRY "$2"; shift;; + --ssl-email) set_value "$1" SSL_EMAIL "$2"; shift;; + --ssl-password) set_value "$1" SSL_PASSWORD "$2"; shift;; --ssl-cname) SSL_CNAME_PARSED[CNAME_INDEX++]="--set-cname=$2"; shift;; - --install-monitoring) INSTALL_MONITORING="${2:-Y}"; shift;; + --install-monitoring) set_value "$1" INSTALL_MONITORING "${2:-Y}"; shift;; --enable-scout) ENABLE_SCOUT="${2:-1}"; shift;; - --monitoring-parent) MONITORING_PARENT="$2"; shift;; - --monitoring-parent-ip) MONITORING_PARENT_IP="$2"; shift;; + --monitoring-parent) set_value "$1" MONITORING_PARENT "$2"; shift;; + --monitoring-parent-ip) set_value "$1" MONITORING_PARENT_IP "$2"; shift;; --populate-config-channel) POPULATE_CONFIG_CHANNEL="${2:-Y}"; shift;; --start-services) START_SERVICES="${2:-Y}"; shift;; - --rhn-user) RHN_USER="$2"; shift;; - --rhn-password) RHN_PASSWORD="$2"; shift;; + --rhn-user) set_value "$1" RHN_USER "$2"; shift;; + --rhn-password) set_value "$1" RHN_PASSWORD "$2"; shift;; --) shift; if [ $# -gt 0 ] ; then echo "Error: Extra arguments found: $@" commit b81c5aec47f665837a6d8a0f9af20ab3213e01a5 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 7 15:53:34 2013 +0200 Removing unhealthy options RHN_PARENT and CA_CHAIN Setting those during script run is too late. diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index eac2d6d..34eadf6 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -14,8 +14,6 @@ options: Indicates the location of an answer file to be use for answering questions asked during the installation process. See man page for for an example and documentation. - --ca-chain=CA_CHAIN - The CA cert used to verify the ssl connection to parent. --enable-scout Enable monitoring scout. --force-own-ca @@ -31,8 +29,7 @@ options: --install-monitoring Install and enable monitoring. --monitoring-parent=MONITORING_PARENT - Name of the parent for your scout. Usually the same value as in - RHN_PARENT. + Name of the parent for your scout. Usually RHN parent. --monitoring-parent-ip=MONITORING_PARENT_IP IP address of MONITORING_PARENT --non-interactive @@ -41,8 +38,6 @@ options: --populate-config-channel Create config chanel and save configuration files to that channel. Configuration channel name is rhn_proxy_config_\${SYSTEM_ID}. - --rhn-parent=RHN_PARENT - Your parent Spacewalk server. --rhn-password=RHN_PASSWORD Red Hat Network or Spacewalk password. --rhn-user=RHN_USER @@ -98,7 +93,7 @@ parse_answer_file() { INTERACTIVE=1 CNAME_INDEX=0 -OPTS=$(getopt --longoptions=help,answer-file:,non-interactive,version:,rhn-parent:,traceback-email:,use-ssl::,ca-chain:,force-own-ca,http-proxy:,http-username:,http-password:,ssl-build-dir:,ssl-org:,ssl-orgunit:,ssl-common:,ssl-city:,ssl-state:,ssl-country:,ssl-email:,ssl-password:,ssl-cname:,install-monitoring::,enable-scout::,monitoring-parent:,monitoring-parent-ip:,populate-config-channel::,start-services:: -n ${0##*/} -- h "$@") +OPTS=$(getopt --longoptions=help,answer-file:,non-interactive,version:,traceback-email:,use-ssl::,force-own-ca,http-proxy:,http-username:,http-password:,ssl-build-dir:,ssl-org:,ssl-orgunit:,ssl-common:,ssl-city:,ssl-state:,ssl-country:,ssl-email:,ssl-password:,ssl-cname:,install-monitoring::,enable-scout::,monitoring-parent:,monitoring-parent-ip:,populate-config-channel::,start-services:: -n ${0##*/} -- h "$@") if [ $? != 0 ] ; then print_help @@ -114,10 +109,8 @@ while : ; do parse_answer_file "$ANSWER_FILE"; shift;; --non-interactive) INTERACTIVE=0;; --version) VERSION="$2"; shift;; - --rhn-parent) RHN_PARENT="$2"; shift;; --traceback-email) TRACEBACK_EMAIL="$2"; shift;; --use-ssl) USE_SSL="${2:-1}"; shift;; - --ca-chain) CA_CHAIN="$2"; shift;; --force-own-ca) FORCE_OWN_CA=1;; --http-proxy) HTTP_PROXY="$2"; shift;; --http-username) HTTP_USERNAME="$2"; shift;; @@ -294,7 +287,9 @@ if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then exit 1 fi -default_or_input "RHN Parent" RHN_PARENT $(awk -F= '/serverURL=/ {split($2, a, "/")} END { print a[3]}' $SYSCONFIG_DIR/up2date) +UP2DATE_FILE=$SYSCONFIG_DIR/up2date +RHN_PARENT=$(awk -F= '/serverURL=/ {split($2, a, "/")} END {print a[3]}' $UP2DATE_FILE) +echo "Using RHN parent (from $UP2DATE_FILE): $RHN_PARENT" if [ "$RHN_PARENT" == "rhn.redhat.com" ]; then RHN_PARENT="xmlrpc.rhn.redhat.com" @@ -304,7 +299,8 @@ if [ "$RHN_PARENT" == "rhn.redhat.com" ]; then WARNING fi -default_or_input "CA Chain" CA_CHAIN $(awk -F'[=;]' '/sslCACert=/ {a=$2} END { print a}' $SYSCONFIG_DIR/up2date) +CA_CHAIN=$(awk -F'[=;]' '/sslCACert=/ {a=$2} END {print a}' $UP2DATE_FILE) +echo "Using CA Chain (from $UP2DATE_FILE): $CA_CHAIN" if [ 0$FORCE_OWN_CA -eq 0 ] && \ ! is_hosted "$RHN_PARENT" && \ @@ -315,7 +311,6 @@ Please do copy your CA key and public certificate from $RHN_PARENT to /root/ssl-build directory. You may want to execute this command: scp 'root@$RHN_PARENT:/root/ssl-build/{RHN-ORG-PRIVATE-SSL-KEY,RHN-ORG-TRUSTED-SSL-CERT,rhn-ca-openssl.cnf}' $SSL_BUILD_DIR CA_KEYS - generate_answers exit 1 fi @@ -323,7 +318,6 @@ check_ca_conf if ! /sbin/runuser nobody -s /bin/sh --command="[ -r $CA_CHAIN ]" ; then echo Error: File $CA_CHAIN is not readable by nobody user. - generate_answers exit 1 fi diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/configure-proxy.sh.sgml index b2dee09..3903d2a 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -64,12 +64,6 @@ provide a required response, default answer is used.</para> </para> <variablelist> <varlistentry> - <term>--ca-chain=CA_CHAIN</term> - <listitem> - <para>The CA cert used to verify the ssl connection to parent.</para> - </listitem> - </varlistentry> - <varlistentry> <term>--enable-scout=1</term> <listitem> <para>1 to enable monitoring scout, 0 otherwise.</para> @@ -108,7 +102,7 @@ provide a required response, default answer is used.</para> <varlistentry> <term>--monitoring-parent=MONITORING_PARENT</term> <listitem> - <para>Name of the parent for your scout. Usually the same value as in RHN_PARENT.</para> + <para>Name of the parent for your scout. Usually RHN parent.</para> </listitem> </varlistentry> <varlistentry> @@ -124,12 +118,6 @@ provide a required response, default answer is used.</para> </listitem> </varlistentry> <varlistentry> - <term>--rhn-parent=RHN_PARENT</term> - <listitem> - <para>Your parent Spacewalk server.</para> - </listitem> - </varlistentry> - <varlistentry> <term>--rhn-password=RHN_PASSWORD</term> <listitem> <para>Red Hat Network or Spacewalk password.</para> @@ -240,12 +228,6 @@ provide a required response, default answer is used.</para> </listitem> </varlistentry> <varlistentry> - <term>RHN_PARENT</term> - <listitem> - <para>Your parent Spacewalk server.</para> - </listitem> - </varlistentry> - <varlistentry> <term>RHN_PASSWORD</term> <listitem> <para>Red Hat Network or Spacewalk password.</para> @@ -270,12 +252,6 @@ provide a required response, default answer is used.</para> </listitem> </varlistentry> <varlistentry> - <term>CA_CHAIN</term> - <listitem> - <para>The CA cert used to verify the ssl connection to parent.</para> - </listitem> - </varlistentry> - <varlistentry> <term>FORCE_OWN_CA</term> <listitem> <para>Do not use parent CA and force to create your own.</para> @@ -382,7 +358,7 @@ provide a required response, default answer is used.</para> <varlistentry> <term>MONITORING_PARENT</term> <listitem> - <para>Name of the parent for your scout. Usually the same value as in RHN_PARENT.</para> + <para>Name of the parent for your scout. Usually RHN parent.</para> </listitem> </varlistentry> <varlistentry>

1 0

Changes to 'refs/tags/spacewalk-branding-2.1.4-1'
by StephenHerr 08 Oct '13

08 Oct '13

Tag 'spacewalk-branding-2.1.4-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-10-08 20:22 +0000 Tagging package [spacewalk-branding] version [2.1.4-1] in directory [branding/]. Changes since spacewalk-java-2.1.53-1: Stephen Herr (2): 1006142 - non-roman character languages had bad wrapping for thin table columns Automatic commit of package [spacewalk-branding] release [2.1.4-1]. --- branding/css/rhn-listview.css | 2 +- branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---

1 0

branding/spacewalk-branding.spec rel-eng/packages
by StephenHerr 08 Oct '13

08 Oct '13

branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 4c345c72dc8588b91d4f83f43f46d8896acce67d Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 8 16:22:51 2013 -0400 Automatic commit of package [spacewalk-branding] release [2.1.4-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 38a93dc..27e50fc 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} Summary: Spacewalk branding data @@ -74,6 +74,10 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Oct 08 2013 Stephen Herr <sherr(a)redhat.com> 2.1.4-1 +- 1006142 - non-roman character languages had bad wrapping for thin table + columns + * Tue Sep 10 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.3-1 - 1006406 - fix encodig in branding diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 0f971e9..c28e28c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.3-1 branding/ +2.1.4-1 branding/

1 0

branding/css
by StephenHerr 08 Oct '13

08 Oct '13

branding/css/rhn-listview.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0e56c62ec8ec350dc4f7938b23cd68449703c2e Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 8 16:21:16 2013 -0400 1006142 - non-roman character languages had bad wrapping for thin table columns diff --git a/branding/css/rhn-listview.css b/branding/css/rhn-listview.css index d74d9f8..e019e7c 100644 --- a/branding/css/rhn-listview.css +++ b/branding/css/rhn-listview.css @@ -10,8 +10,8 @@ table.list-doubleheader tr + tr th:last-child { } th.thin-column, td.thin-column { - width: 1%; text-align: center; + white-space: nowrap; } .list-checkbox {

1 0

Changes to 'refs/tags/spacewalk-java-2.1.53-1'
by Michael Mraka 07 Oct '13

07 Oct '13

Tag 'spacewalk-java-2.1.53-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-07 13:54 +0000 Tagging package [spacewalk-java] version [2.1.53-1] in directory [java/]. Changes since spacewalk-proxy-installer-2.1.5-1: Jiri Mikulka (1): fixed typo Michael Mraka (3): 1012951 - Revert "removing unused string with trans-id 'file_lists.removed'" 1012951 - Revert "removing unused string with trans-id 'file_lists.added'" Automatic commit of package [spacewalk-java] release [2.1.53-1]. --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 12 ++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 14 ++++++++++ java/spacewalk-java.spec | 8 +++++ proxy/installer/configure-proxy.sh | 2 - proxy/installer/configure-proxy.sh.sgml | 4 +- rel-eng/packages/spacewalk-java | 2 - 20 files changed, 233 insertions(+), 5 deletions(-) ---

1 0

3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 07 Oct '13

07 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 12 ++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 14 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 14 ++++++++++ java/spacewalk-java.spec | 8 +++++ rel-eng/packages/spacewalk-java | 2 - 18 files changed, 230 insertions(+), 2 deletions(-) New commits: commit 237f28a799fa4d1a24ac86d3f5bce3ba3b3fda6b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 7 15:54:51 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.53-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 063aad4..0ba8ab9 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.52 +Version: 2.1.53 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Oct 07 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.53-1 +- 1012951 - Revert "removing unused string with trans-id 'file_lists.added'" +- 1012951 - Revert "removing unused string with trans-id 'file_lists.removed'" +- 1006127 - Make Search button translatable +- 1006182 - Make ISS Master and Slave tabs less confusing + * Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.52-1 - 1002590 - unified way how we call rhn-search cleanindex - Serializers for Taskomatic: log serialization errors diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index c84995b..17cd3f7 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.52-1 java/ +2.1.53-1 java/ commit 8e2e8b0b9cb7d05923305c2e5d6e79e260a83f2d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 7 15:51:41 2013 +0200 1012951 - Revert "removing unused string with trans-id 'file_lists.added'" This reverts commit cecafba500cbad28ebaf194468404bb05403f5b2 diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 8abecaa..d68fe7d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -6173,6 +6173,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} ফাইল সংরক্ষণের তালিকা অপসারণ করা হয়েছে।</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ফাইল সংরক্ষণের তালিকা যোগ করা হয়েছে।</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index fbfe718..8f5f9eb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -6455,6 +6455,13 @@ Benutzers vor dem Versuch, den Account zu deaktivieren.</target> </context-group> <target>{0} Dateierhaltungsliste(n) wurde(n) entfernt.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Dateierhaltungsliste(n) wurde(n) hinzugefügt.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index df3ec2f..27c217e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -5531,6 +5531,12 @@ user before attempting to deactivate their account.</source> <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> </context-group> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index b9b2043..8a52501 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -6455,6 +6455,13 @@ de este usuario antes de intentar desactivar esta cuenta.</target> </context-group> <target>{0} Lista(s) de preservación de archivos eliminada(s).</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Lista(s) de preservación de archivos añadida(s).</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index fe01d4f..237754c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -6457,6 +6457,13 @@ utilisateur avant de désactiver son compte.</target> </context-group> <target>{0} liste(s) de conservation de fichiers supprimée(s).</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} liste(s) de conservation de fichiers ajoutée(s).</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 9db8aef..2ae9213 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -6166,6 +6166,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} ફાઈલ બચાવ યાદી(ઓ) દૂર કરી દેવાઈ.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ફાઈલ બચાવ યાદી(ઓ) ઉમેરાઈ ગઈ.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index edfcbc7..400f2aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -6166,6 +6166,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} फाइल संरक्षण सूची हटाया गया.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} फाइल संरक्षण सूची अद्यतन.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 526fd22..2b63f4b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -6454,6 +6454,13 @@ utente prima di disabilitare l'account in questione.</target> </context-group> <target>{0} Elenco di conservazione dei file rimosso.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Elenco di conservazione dei file aggiunto.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 35b217b..92d6cdd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -6455,6 +6455,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} ファイル保持一覧が削除されました。</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ファイル保持一覧が追加されました。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index c67acd8..105011d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -6455,6 +6455,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} 파일 보관 목록이 삭제되었습니다. </target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} 파일 보관 목록이 추가되었습니다. </target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index 3ba0156..895aff0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -6168,6 +6168,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} ਫਾਇਲ ਸੁਰੱਖਿਆ ਸੂਚੀ ਹਟਾਈ ਗਈ।</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ਫਾਇਲ ਸੁਰੱਖਿਆ ਸੂਚੀ ਅੱਪਡੇਟ ਕੀਤੀ।</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index bb35356..e721bd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -6442,6 +6442,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} Lista(s) de Preservação de Arquivos removida.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Lista(s) de Preservação de Arquivos adicionada.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index b140fde..1fb13d0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -6451,6 +6451,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>Удален списков сохранения файлов: {0}</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>Добавлено списков восстановления файлов: {0}</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index 982b570..eb620cc 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -6166,6 +6166,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} கோப்பு பாதுகாப்பு பட்டியல்(கள்) நீக்கப்பட்டன.</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} கோப்பு பாதுகாப்பு பட்டியல்(கள்) சேர்க்கப்பட்டன.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index 78da343..b8c32f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -6455,6 +6455,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} 个文件保留列表被删除。</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} 个文件保留列表被添加。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index ae1bacf..e1f24b7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -6454,6 +6454,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>已移除 {0} 個檔案保存清單。</target> </trans-unit> + <trans-unit id="file_lists.added"> + <source>{0} File Preservation List(s) added.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>已新增 {0} 個檔案保存清單。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- commit 868d3b462d7b0fbbe070c99376a85250a8e9d0e4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Oct 7 15:32:50 2013 +0200 1012951 - Revert "removing unused string with trans-id 'file_lists.removed'" This reverts commit 0398c2a8ae07ebbafbc2b17f3f5bba680e5e2cc3 diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 4b0ed00..8abecaa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -6166,6 +6166,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} অ্যাক্টিভেশন-কি মুছে ফেলা হয়েছে।</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ফাইল সংরক্ষণের তালিকা অপসারণ করা হয়েছে।</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 6744577..fbfe718 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -6448,6 +6448,13 @@ Benutzers vor dem Versuch, den Account zu deaktivieren.</target> </context-group> <target>{0} Aktivierungs-Schlüssel entfernt.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Dateierhaltungsliste(n) wurde(n) entfernt.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index b7c7f17..df3ec2f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -5525,6 +5525,12 @@ user before attempting to deactivate their account.</source> <context context-type="sourcefile">/rhn/kickstart/ActivationKeys.do</context> </context-group> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 3746877..b9b2043 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -6448,6 +6448,13 @@ de este usuario antes de intentar desactivar esta cuenta.</target> </context-group> <target>{0} Llave(s) de activación eliminada(s).</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Lista(s) de preservación de archivos eliminada(s).</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index 457e089..fe01d4f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -6450,6 +6450,13 @@ utilisateur avant de désactiver son compte.</target> </context-group> <target>{0} clé(s) d'activation supprimée(s)</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} liste(s) de conservation de fichiers supprimée(s).</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index caf2deb..9db8aef 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -6159,6 +6159,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} સક્રિયકરણ કીઓ દૂર થઈ.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ફાઈલ બચાવ યાદી(ઓ) દૂર કરી દેવાઈ.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 5cc0623..edfcbc7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -6159,6 +6159,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} सक्रियकरण कुंजी हटायी गई.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} फाइल संरक्षण सूची हटाया गया.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 9e9df84..526fd22 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -6447,6 +6447,13 @@ utente prima di disabilitare l'account in questione.</target> </context-group> <target>Chiave/i di attivazione {0} rimossa/e.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Elenco di conservazione dei file rimosso.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 7c969af..35b217b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -6448,6 +6448,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} アクティベーションキーが削除されました。</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ファイル保持一覧が削除されました。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 3902aa8..c67acd8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -6448,6 +6448,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} 개의 활성키가 삭제되었습니다.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} 파일 보관 목록이 삭제되었습니다. </target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index b94331a..3ba0156 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -6161,6 +6161,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} ਸਰਗਰਮ ਕੁੰਜੀਆਂ ਹਟਾਈਆਂ ਗਈਆਂ।</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} ਫਾਇਲ ਸੁਰੱਖਿਆ ਸੂਚੀ ਹਟਾਈ ਗਈ।</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index 37b89c1..bb35356 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -6435,6 +6435,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} Chave(s) de Ativação removida(s).</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} Lista(s) de Preservação de Arquivos removida.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index 5ef9e97..b140fde 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -6444,6 +6444,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>Удалено ключей активации: {0}</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>Удален списков сохранения файлов: {0}</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index 4c30fe6..982b570 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -6159,6 +6159,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0} செயல்படுத்தும் விசைகள் நீக்கப்பட்டன.</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} கோப்பு பாதுகாப்பு பட்டியல்(கள்) நீக்கப்பட்டன.</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index 41faa5c..78da343 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -6448,6 +6448,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>{0}个激活码被删除。</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>{0} 个文件保留列表被删除。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: ------------------------- diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index ea4c9b0..ae1bacf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -6447,6 +6447,13 @@ user before attempting to deactivate their account.</source> </context-group> <target>已移除 {0} 個啟動金鑰。</target> </trans-unit> + <trans-unit id="file_lists.removed"> + <source>{0} File Preservation List(s) removed.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/FilePreservationLists.do</context> + </context-group> + <target>已移除 {0} 個檔案保存清單。</target> + </trans-unit> <trans-unit id="taskomatic.msg.awolservers"> <source>Systems Not Checking In: -------------------------

1 0

proxy/installer
by Jiří Mikulka 07 Oct '13

07 Oct '13

proxy/installer/configure-proxy.sh | 2 +- proxy/installer/configure-proxy.sh.sgml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit e4945ee1b2b492dc7b93e1c8848dd100c7074950 Author: Jiri Mikulka <jmikulka(a)redhat.com> Date: Mon Oct 7 14:49:34 2013 +0200 fixed typo diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index f22ee58..eac2d6d 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -46,7 +46,7 @@ options: --rhn-password=RHN_PASSWORD Red Hat Network or Spacewalk password. --rhn-user=RHN_USER - Red Hat Network or Spacewalk user acount. + Red Hat Network or Spacewalk user account. --ssl-build-dir=SSL_BUILD_DIR The directory where we build SSL certificate. Default is /root/ssl-build --ssl-city=SSL_CITY diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/configure-proxy.sh.sgml index ea22ccd..b2dee09 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -138,7 +138,7 @@ provide a required response, default answer is used.</para> <varlistentry> <term>--rhn-user=RHN_USER</term> <listitem> - <para>Red Hat Network or Spacewalk user acount.</para> + <para>Red Hat Network or Spacewalk user account.</para> </listitem> </varlistentry> <varlistentry> @@ -254,7 +254,7 @@ provide a required response, default answer is used.</para> <varlistentry> <term>RHN_USER</term> <listitem> - <para>Red Hat Network or Spacewalk user acount.</para> + <para>Red Hat Network or Spacewalk user account.</para> </listitem> </varlistentry> <varlistentry>

1 0

Changes to 'refs/tags/spacewalk-proxy-installer-2.1.5-1'
by mkollar 07 Oct '13

07 Oct '13

Tag 'spacewalk-proxy-installer-2.1.5-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-10-07 11:15 +0000 Tagging package [spacewalk-proxy-installer] version [2.1.5-1] in directory [proxy/installer/]. Changes since spacewalk-web-2.1.23-1: Dimitar Yordanov (1): 516296 - Allow truly non-interactive proxy install Matej Kollar (3): Order list of options in help Removed set_value as getopt made it redundant Automatic commit of package [spacewalk-proxy-installer] release [2.1.5-1]. --- proxy/installer/configure-proxy.sh | 76 ++++++++++++++----------- proxy/installer/configure-proxy.sh.sgml | 24 +++++++ proxy/installer/spacewalk-proxy-installer.spec | 12 +++ rel-eng/packages/spacewalk-proxy-installer | 2 4 files changed, 79 insertions(+), 35 deletions(-) ---

1 0

proxy/installer rel-eng/packages
by mkollar 07 Oct '13

07 Oct '13

proxy/installer/spacewalk-proxy-installer.spec | 12 +++++++++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 0132596e3d8a4abbf9d5d3495fe42891a623e327 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 7 13:15:46 2013 +0200 Automatic commit of package [spacewalk-proxy-installer] release [2.1.5-1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index c08768c..669f4bb 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -97,6 +97,16 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn %doc LICENSE answers.txt %changelog +* Mon Oct 07 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.5-1 +- Removed set_value as getopt made it redundant +- 516296 - Allow truly non-interactive proxy install +- Order list of options in help +- Allow user to save entered data as answer file +- There is no up2date anymore +- Eliminating eval where possible +- Some seemingly unimportant spaces +- Tabs vs. Spaces War + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1 - removed trailing whitespaces diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index 9e50351..5b4c4ce 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -2.1.4-1 proxy/installer/ +2.1.5-1 proxy/installer/

1 0

proxy/installer
by mkollar 07 Oct '13

07 Oct '13

proxy/installer/configure-proxy.sh | 54 +++++++++++++++---------------------- 1 file changed, 23 insertions(+), 31 deletions(-) New commits: commit acf4e0dd94e425e9e4d94549642c74d64392bf0f Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Oct 7 13:09:39 2013 +0200 Removed set_value as getopt made it redundant diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index af40a92..f22ee58 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -95,14 +95,6 @@ parse_answer_file() { done } -set_value() { - local OPTION="$1" - local VAR="$2" - local ARG="$3" - [[ "$ARG" =~ ^- ]] && echo "$0: option $OPTION requires argument!" && print_help - eval "$(printf "%q=%q" "$VAR" "$ARG")" -} - INTERACTIVE=1 CNAME_INDEX=0 @@ -118,36 +110,36 @@ eval set -- "$OPTS" while : ; do case "$1" in --help|-h) print_help;; - --answer-file) set_value "$1" ANSWER_FILE "$2"; + --answer-file) ANSWER_FILE="$2"; parse_answer_file "$ANSWER_FILE"; shift;; --non-interactive) INTERACTIVE=0;; - --version) set_value "$1" VERSION "$2"; shift;; - --rhn-parent) set_value "$1" RHN_PARENT "$2"; shift;; - --traceback-email) set_value "$1" TRACEBACK_EMAIL "$2"; shift;; + --version) VERSION="$2"; shift;; + --rhn-parent) RHN_PARENT="$2"; shift;; + --traceback-email) TRACEBACK_EMAIL="$2"; shift;; --use-ssl) USE_SSL="${2:-1}"; shift;; - --ca-chain) set_value "$1" CA_CHAIN "$2"; shift;; + --ca-chain) CA_CHAIN="$2"; shift;; --force-own-ca) FORCE_OWN_CA=1;; - --http-proxy) set_value "$1" HTTP_PROXY "$2"; shift;; - --http-username) set_value "$1" HTTP_USERNAME "$2"; shift;; - --http-password) set_value "$1" HTTP_PASSWORD "$2"; shift;; - --ssl-build-dir) set_value "$1" SSL_BUILD_DIR "$2"; shift;; - --ssl-org) set_value "$1" SSL_ORG "$2"; shift;; - --ssl-orgunit) set_value "$1" SSL_ORGUNIT "$2"; shift;; - --ssl-common) set_value "$1" SSL_COMMON "$2"; shift;; - --ssl-city) set_value "$1" SSL_CITY "$2"; shift;; - --ssl-state) set_value "$1" SSL_STATE "$2"; shift;; - --ssl-country) set_value "$1" SSL_COUNTRY "$2"; shift;; - --ssl-email) set_value "$1" SSL_EMAIL "$2"; shift;; - --ssl-password) set_value "$1" SSL_PASSWORD "$2"; shift;; - --ssl-cname) set_value "$1" "SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname" "$2"; shift;; - --install-monitoring) set_value "$1" INSTALL_MONITORING="${2:-Y}"; shift;; + --http-proxy) HTTP_PROXY="$2"; shift;; + --http-username) HTTP_USERNAME="$2"; shift;; + --http-password) HTTP_PASSWORD="$2"; shift;; + --ssl-build-dir) SSL_BUILD_DIR="$2"; shift;; + --ssl-org) SSL_ORG="$2"; shift;; + --ssl-orgunit) SSL_ORGUNIT="$2"; shift;; + --ssl-common) SSL_COMMON="$2"; shift;; + --ssl-city) SSL_CITY="$2"; shift;; + --ssl-state) SSL_STATE="$2"; shift;; + --ssl-country) SSL_COUNTRY="$2"; shift;; + --ssl-email) SSL_EMAIL="$2"; shift;; + --ssl-password) SSL_PASSWORD="$2"; shift;; + --ssl-cname) SSL_CNAME_PARSED[CNAME_INDEX++]="--set-cname=$2"; shift;; + --install-monitoring) INSTALL_MONITORING="${2:-Y}"; shift;; --enable-scout) ENABLE_SCOUT="${2:-1}"; shift;; - --monitoring-parent) set_value "$1" MONITORING_PARENT "$2"; shift;; - --monitoring-parent-ip) set_value "$1" MONITORING_PARENT_IP "$2"; shift;; + --monitoring-parent) MONITORING_PARENT="$2"; shift;; + --monitoring-parent-ip) MONITORING_PARENT_IP="$2"; shift;; --populate-config-channel) POPULATE_CONFIG_CHANNEL="${2:-Y}"; shift;; --start-services) START_SERVICES="${2:-Y}"; shift;; - --rhn-user) set_value "$1" RHN_USER "$2"; shift;; - --rhn-password) set_value "$1" RHN_PASSWORD "$2"; shift;; + --rhn-user) RHN_USER="$2"; shift;; + --rhn-password) RHN_PASSWORD="$2"; shift;; --) shift; if [ $# -gt 0 ] ; then echo "Error: Extra arguments found: $@"

1 0

2 commits - proxy/installer
by mkollar 07 Oct '13

07 Oct '13

proxy/installer/configure-proxy.sh | 26 ++++++++++++++++++++++---- proxy/installer/configure-proxy.sh.sgml | 24 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) New commits: commit 436d16359ede3af9966c11b92c961b6c14debbc2 Author: Dimitar Yordanov <dyordano(a)redhat.com> Date: Fri Oct 4 16:28:55 2013 +0200 516296 - Allow truly non-interactive proxy install diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 03603ba..af40a92 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -43,6 +43,10 @@ options: Configuration channel name is rhn_proxy_config_\${SYSTEM_ID}. --rhn-parent=RHN_PARENT Your parent Spacewalk server. + --rhn-password=RHN_PASSWORD + Red Hat Network or Spacewalk password. + --rhn-user=RHN_USER + Red Hat Network or Spacewalk user acount. --ssl-build-dir=SSL_BUILD_DIR The directory where we build SSL certificate. Default is /root/ssl-build --ssl-city=SSL_CITY @@ -142,6 +146,8 @@ while : ; do --monitoring-parent-ip) set_value "$1" MONITORING_PARENT_IP "$2"; shift;; --populate-config-channel) POPULATE_CONFIG_CHANNEL="${2:-Y}"; shift;; --start-services) START_SERVICES="${2:-Y}"; shift;; + --rhn-user) set_value "$1" RHN_USER "$2"; shift;; + --rhn-password) set_value "$1" RHN_PASSWORD "$2"; shift;; --) shift; if [ $# -gt 0 ] ; then echo "Error: Extra arguments found: $@" @@ -154,6 +160,14 @@ while : ; do shift done +# params dep check +if [[ $INTERACTIVE == 0 \ + && ( -z $POPULATE_CONFIG_CHANNEL || $( yes_no $POPULATE_CONFIG_CHANNEL ) == 1 ) \ + && ( -z $RHN_USER || -z $RHN_PASSWORD ) ]]; then + echo "Error: When --populate-config-channel is set to Yes both --rhn-user and --rhn-password have to be provided." + exit 1 +fi + ACCUMULATED_ANSWERS="" generate_answers() { @@ -574,9 +588,13 @@ default_or_input "Create and populate configuration channel $CHANNEL_LABEL?" POP POPULATE_CONFIG_CHANNEL=$(yes_no $POPULATE_CONFIG_CHANNEL) if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then RHNCFG_STATUS=1 + default_or_input "RHN username:" RHN_USER '' while [ $RHNCFG_STATUS != 0 ] ; do - CONFIG_CHANNELS=$(rhncfg-manager list-channels --server-name "$RHN_PARENT") + CONFIG_CHANNELS=$(rhncfg-manager list-channels ${RHN_USER:+--username="${RHN_USER}"} ${RHN_PASSWORD:+--password="${RHN_PASSWORD}"} --server-name="$RHN_PARENT") RHNCFG_STATUS=$? + # In case of incorrect username/password, we want to re-ask user + unset RHN_USER + unset RHN_PASSWORD done if ! grep -q -E "^ +$CHANNEL_LABEL$" <<<"$CONFIG_CHANNELS" ; then rhncfg-manager create-channel --server-name "$RHN_PARENT" "$CHANNEL_LABEL" diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/configure-proxy.sh.sgml index 84cb473..ea22ccd 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -130,6 +130,18 @@ provide a required response, default answer is used.</para> </listitem> </varlistentry> <varlistentry> + <term>--rhn-password=RHN_PASSWORD</term> + <listitem> + <para>Red Hat Network or Spacewalk password.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>--rhn-user=RHN_USER</term> + <listitem> + <para>Red Hat Network or Spacewalk user acount.</para> + </listitem> + </varlistentry> + <varlistentry> <term>--ssl-build-dir=SSL_BUILD_DIR</term> <listitem> <para>The directory where we build SSL certificate. Default is /root/ssl-build.</para> @@ -234,6 +246,18 @@ provide a required response, default answer is used.</para> </listitem> </varlistentry> <varlistentry> + <term>RHN_PASSWORD</term> + <listitem> + <para>Red Hat Network or Spacewalk password.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>RHN_USER</term> + <listitem> + <para>Red Hat Network or Spacewalk user acount.</para> + </listitem> + </varlistentry> + <varlistentry> <term>TRACEBACK_EMAIL</term> <listitem> <para>Email to which tracebacks should be sent.</para> commit 1a49f35d2832d98170921a45dd0225815eb7750d Author: Matej Kollar <mkollar(a)redhat.com> Date: Fri Oct 4 16:04:25 2013 +0200 Order list of options in help diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 066b14b..03603ba 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -30,14 +30,14 @@ options: The username for an authenticated proxy. --install-monitoring Install and enable monitoring. - --non-interactive - For use only with --answer-file. If the --answer-file doesn't - provide a required response, default answer is used. --monitoring-parent=MONITORING_PARENT Name of the parent for your scout. Usually the same value as in RHN_PARENT. --monitoring-parent-ip=MONITORING_PARENT_IP IP address of MONITORING_PARENT + --non-interactive + For use only with --answer-file. If the --answer-file doesn't + provide a required response, default answer is used. --populate-config-channel Create config chanel and save configuration files to that channel. Configuration channel name is rhn_proxy_config_\${SYSTEM_ID}.

1 0

Changes to 'bootstrap-css'
by Silvio Moioli 07 Oct '13

07 Oct '13

New branch 'bootstrap-css' available with the following commits: commit 8da10be160991ace212f490377d333e385715c0a Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 2 18:08:08 2013 +0200 TB3: Spacewalk Configuration: General, Monitoring forms commit 924ba8f701591e17a4c869870a55c3b9777d1a12 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 2 17:24:26 2013 +0200 TB3: Admin/Organizations/org/Subscriptions/System Entitlements form commit 2b555d591dc7acf6ad3f9de0564c3d21023381a9 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 2 17:07:03 2013 +0200 Remove script elements referencing prototype/scriptaculous commit 37be9563c9abd114413bcf5adcb4d93695f6d944 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 2 16:55:43 2013 +0200 Fixed Uncaught SyntaxError: Unexpected token ) Also added a semicolon to the function call in the onclick handler. commit ac4ec379705cfe1759955d3738c73d6881707743 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 2 16:54:24 2013 +0200 Cleaned up images.jsp Removed obsolete script reference, removed xhtml tag, fixed indentation. commit 4c49f4dd800cb1f089f45c3ba3785b04a9ac2151 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Oct 2 16:53:14 2013 +0200 Migrated images.js from prototype to jquery commit 0cb137a7f70c4f5608c9b81005f258c852f0af7b Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 2 16:18:28 2013 +0200 TB3: Admin/Organizations/org/Details form commit 9aec89dad3e9b6246aee0d2955cdb52d31e7a9f7 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Oct 2 15:49:39 2013 +0200 Systems selected Clear button commit d6a327770dbff8e9cd693ad823a6e2fe135e59fd Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Oct 2 15:34:32 2013 +0200 Menu fixed Menu auto-collapsing bug fixed commit e060dc9d3a11c7782645c9b84c7253b5bd6bb7eb Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Oct 2 15:16:32 2013 +0200 TB3: Admin/Organizations/Create New Organization commit e1d218417495276bde51eaafe664a8fc73b114b2 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Oct 2 13:47:01 2013 +0200 Columns fixed Columns size now take the 100% height with Jquery commit 555dc398417fb7352a5d357cd8029e105ed4c75e Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 1 17:31:35 2013 +0200 Jquery files for login, UL lists and SSM toolbar commit 3b5c7b3df265b63206bf838425ea562508f7b708 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 1 17:13:50 2013 +0200 Use if .. else .. for better readability commit 1426b413799c7bc20c63725a2793e4d4436859db Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Oct 1 17:12:30 2013 +0200 port to JQuery /rhn/audit/Search.do commit bf99bfdc9f550de4b5daf026259cf61a3658c757 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 30 16:12:35 2013 +0200 Port to JQuery: Javascript snippet that prevents form submission with ENTER commit 1410cf3d39084cdcf417a84c2c8c3cdbbf0cff16 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 25 12:05:44 2013 +0200 Use icons instead of images commit 117ae377674126ea1c86d866807ba4dea279f08c Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 25 09:03:48 2013 +0200 Port to JQuery commit 41fdb8c6ff306660d6ff8ed9eed2ae2d60e9c279 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 25 09:03:22 2013 +0200 port to JQuery commit 50113b9b4a0882b6eba79dc1c60e73ff38cebe83 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 25 09:00:22 2013 +0200 add jquery as a replacement for prototypewq commit a55e96fa24644034f3ba42dcfe07ead5d28895d4 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 25 08:59:55 2013 +0200 remove prototype commit 518183729ebafd2d1c61ef24d903dc87968f48fb Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 1 16:56:13 2013 +0200 colors for icons security, warning, updates, and enhancement icons have colours defined in the variables.less file commit b36036387d61d18c3d47907455963c6893b89245 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 1 16:49:07 2013 +0200 Legends All icons have ben updated with FontAwesome and Spacewalk icon Font commit 1d53886ad3535a7c86c3a05c71e955ef812ea6d0 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 1 16:38:01 2013 +0200 TB3: Admin/Organizations/Organization Configuration form commit 998dfcf5771b0e23c6f21ad24a380326275e3e52 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 1 15:57:33 2013 +0200 Remove trailing whitespace commit a02fee8b5b0847a099d4c255a93fd5b19746666d Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Oct 1 15:56:43 2013 +0200 Make the footer stick to the bottom even if there is no content commit f1087dfd1415b4638977478955232f2c0582b5c9 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Oct 1 15:31:33 2013 +0200 Footer fixed (less) Changes in the Less files to stick the footer to the bottom of the page. Still waiting to commit changes in the jsp files commit bd430a0d57fdb6068da466c46a22d980aac1c01a Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 1 14:07:58 2013 +0200 TB3: Monitoring/Probe Suites/Edit Probe form commit 8e00d414eb6fcda87d5c69230d593d8d4ae21028 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 1 13:30:43 2013 +0200 TB3: Removed commented image-based ranking controls. commit d79dc1887247989746cb3e81a26de1f501f99ed1 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Sep 30 16:42:42 2013 +0200 Fix javascript errors in case there is no pagination commit 691c9dd8a818f172dac0acbc24363d1be24640e1 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 30 16:28:00 2013 +0200 TB3: Ranking channels form commit d937f27e7360b2eb9b13d2ac0ce2421788520238 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Sep 30 16:00:27 2013 +0200 Fix markup of the SSM system selection counter commit 6d4a2a205c625b818c93d06cdbd033f04ba9c830 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 30 14:42:19 2013 +0200 TB3: Added style to dropdown on Wizard profile, step 1. commit bc3aec34651ef106cd9f2b2bcd7ed56e91ae1cbb Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 30 14:29:14 2013 +0200 TB3: Systems/Custom System Info/Edit custom key form commit 86f061d6177c59d936297058e6d38ebbcd2717d1 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 30 14:10:09 2013 +0200 TB3: Systems/Kickstart/Create GPG key form commit 5e747b77cfcdc24bc25ef2f08ba73ff0431a2b4d Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Sep 30 12:01:50 2013 +0200 tables class changed spacewalk-table changed to table-rounded commit 4247d32bcf60ebe4061b25acabd465cdb1b59c98 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Sep 27 17:05:11 2013 +0200 TB3: Systems/Kickstart Snippets/Create-Edit form commit 1286356bd7b5803503ab6227ee42a908e77b1129 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Fri Sep 27 16:52:59 2013 +0200 New less files and new style for tables I ordered the content of spacewalk.less by creating a mixinx.less and variables.less files. The tables have an special class called "spacewalk-table" commit ec9e95d2a3638b64e8e610a6252dce9a642d9508 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Sep 27 16:19:15 2013 +0200 TB3: Provisioning/preservation form commit cc7321999f19c242e49e19a685fb58ffe0fd7e8d Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 26 17:04:31 2013 +0200 TB3: Systems/Kickstart/Distributions form commit 53f7b01fd5316fbf47ce375e1dd0beb6bdb6247f Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 26 16:23:30 2013 +0200 TB3: Systems/Kickstart/GPG and SSL Keys form commit 3269657bb95f6b9f829b17656069f4a0f530e10b Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 26 14:56:24 2013 +0200 TB3: Kickstart wizard profile, first step. commit 66bb0c714d17adef299243c27f89007cf82f9413 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 26 14:15:13 2013 +0200 TB3: Systems/Advanced Search form commit cf458824f77a565f1f5a085103e8e68becd08ff2 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 26 14:14:55 2013 +0200 TB3: System group create form. commit bbdb90fd359086c4ef98118617ae7401391a10c0 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Thu Sep 26 12:38:09 2013 +0200 Red borders removed red borders gone commit dcb7ca471141e87b468126f8db3ef25b1b72cd00 Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Sep 26 10:25:25 2013 +0200 Move spacewalk-bar inside the <nav> in header.jsp commit be2075eeae3bc0c43f641498a32e8dabb235ce3e Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Sep 25 16:25:37 2013 +0200 New Less changes in the left menu and tooldbars commit 3bf2ec6a66c7689878799e1250a7db76c51b7aca Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 25 16:22:45 2013 +0200 TB3: Create monitoring probe form commit 4f5d44c2b80abfb0be8a37c97eae4830efd035b7 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 25 13:57:25 2013 +0200 TB3: Systems/Custom Info/Create Key commit 29859afa895c487fd15c8282830d975b7cbd6e38 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 25 12:47:25 2013 +0200 TB3: Systems/Note Edit commit bcc600ffd943748dc3efdc35524788a738246867 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 25 12:23:11 2013 +0200 TB3: Systems/Details/Hardware commit b39f47659cfe4e814b73a2e63e5a0c9217899f94 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Sep 24 16:26:59 2013 +0200 TB3: Ported upload local file form commit df3a3d5fc8f73f90995cdf113d58045606c20016 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Sep 24 15:55:32 2013 +0200 TB3: Ported upload local file form commit 2b68e39125adbb1082c91402a3cadb98120c91e5 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Sep 24 08:40:06 2013 +0200 Fix single system selection and overview ajax pages: <script> is not a self closing tag commit 5c22b1d3cfc63cdd64c24b46981fabd6b2e8fb48 Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 17:19:23 2013 +0200 Re-introduce the custom login_banner functionality commit cc6ee26940e6ad491b60a661d9e9775db820311b Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 16:10:07 2013 +0200 Fix indentation commit 2c18a93c4f552b49201fc9d5ef85c1a767811a60 Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 16:05:44 2013 +0200 Remove xhtml tag on the relogin page commit ddb207180a9ee48e528f5013d79363cc7579df92 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Sep 20 15:32:58 2013 +0200 Removed XHTML definition commit 460472c0d2ad784215df348dc9f78f1c65e339d5 Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 15:32:31 2013 +0200 Add a placeholder to the password field commit 67fad6d95edbb08689608f0949e661a07f147fc8 Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 15:32:11 2013 +0200 Center the content on login screen commit daae3df9145499e8cdd88f5408dcdfd4dcaa2b80 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 14:40:02 2013 +0200 Port system-header.jspf custom html to use the available rhn:toolbar as it should be. commit 71c09ce697bb9db986fd78233b324ebd91c6cb42 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 10:50:58 2013 +0200 add toolbar.create.customdata string commit 92c92cbd6227c11709e25ab33feacbf329e38dc1 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 10:47:03 2013 +0200 use a font-awesome icon instead of an icon image commit f298e6a3b4c871ae7fc62853d3ce6ee5d6352aa1 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 10:46:53 2013 +0200 add the new icon attributes to rhn-taglib.tld commit 3b6f0492d0fa5e08c268ff24c06369430ed2a795 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 10:33:55 2013 +0200 port copy pasted html to the rhn:toolbar tag commit 1ff9a93cfe2bcf917771c4bff47f0080ecc32d86 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Sep 20 10:32:56 2013 +0200 - add support for icon in addition to an image - render the html the css expects commit 2b21c69c83ba2e66463234783c659359446d4ca9 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Sep 19 16:29:39 2013 +0200 Use badges for the probes count commit e0f04526a000d96162ef6b456bcbf3dbe06108aa Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 11:10:08 2013 +0200 Fix the relogin screen commit ccb5d264b54e43ee1203f2abc8b5d92067069cdf Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Sep 20 10:38:37 2013 +0200 Fix and clean up the login screen commit 045aaa714268eeabb5e2c63a734a1a730ea62526 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 19 17:09:05 2013 +0200 TB3: SUSE Studio credentials form ported commit b8792f68a88c013ea772a9af0059a894de74a245 Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Thu Sep 19 16:49:03 2013 +0200 Toolbar + overview + margin fixed Margin bug from Bootstrap 3 fixed. Toolbar styled. Overview hover style commit 1c10f44b978af33f286ab28cfba16c0323c2071c Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 19 16:04:20 2013 +0200 TB3: Change E-mail form. commit a23f6e31d91ed834cd057d9ceb440a03a5d8323f Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 19 15:23:02 2013 +0200 TB3: Ported personal address form commit 74faf1039a6bc6408dbc2fa4f036edc92a948e47 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 19 13:59:17 2013 +0200 TB3: Ported form users/EditAddress.do commit e270a2259ce702126cb917641dd22d1f0983c000 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Sep 19 12:57:20 2013 +0200 TB3: Account info form finished. commit 7ff3bd7e18b083948c9241a291188b6b9c3e4d7f Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 18 18:34:20 2013 +0200 TB3: User info and account info form commit 56e384d02232fdcf82384682dce4f39458f15bbc Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 17:25:58 2013 +0200 Show the spacewalk-bar only if the user is authenticated commit f0c7ec60332c50e0d3252dce75e8e7ab9edccb6d Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Wed Sep 18 17:24:08 2013 +0200 footer Footer right margin deleted commit 005e18b32a66b6548ad38a3e674ebdc8a9e4c093 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 18 17:15:22 2013 +0200 TB3: Single system remote command form commit beac446f7a8178b153a098ba79f28515d1fde5e7 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Sep 18 17:15:02 2013 +0200 TB3: Single system Properties form commit 4dc0b49bc660b14837af7a05f67f86732662c0ef Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Wed Sep 18 16:21:09 2013 +0200 Update of spacewalk Less Styles for login form and system management panel applied commit 43b120e44b7dd8cf7096f9deb364a0f3154c8621 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 16:00:07 2013 +0200 Remove the search button text commit 6e784e25001934ae427010591be071cf47f7d912 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 15:58:03 2013 +0200 Removed colons before the user and org name commit 3de42b81db4cb6bf2d901ce223cb381fe1250e54 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 15:13:39 2013 +0200 Fix legend on the Overview page commit d469cd9af2f00d0f34a31c6ac21cf5b7a415e644 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 14:47:38 2013 +0200 add the bootstrap less files until we generate css at build time commit 825522dee3ca8180c7e50b772eddc6232dfd2a8d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 14:47:09 2013 +0200 use fontawesome icons on the probe list commit 48461e3d9467b93b33a05ed559da4097f2821bfd Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Wed Sep 18 14:31:32 2013 +0200 Fixed error in the font I fixed a typo in the @import commit 1bf829f819db7cc7687caac7117c09eff561a6eb Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 13:50:24 2013 +0200 Add missing form-control class and a placeholder string commit 03d358b98ca4149799b242d546b11f35dd09788c Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Sep 18 13:46:51 2013 +0200 Move SSM bar outside of the <header> commit eeb1b9df31805b534e776faeab432d0f347305c1 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 13:17:10 2013 +0200 typo: it is alert-info commit 0030573d4dc4df0d0d1404daa62bcce389fd0277 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 13:15:59 2013 +0200 Use less files for bootstrap and the main css. We need to look at a way to precompile them for production. commit a6a349c718ccba1833955dd4e427b64fda390a93 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 11:32:19 2013 +0200 rename font icons to have name convention spacewalk-icon-$name commit 45bde4f7bb328c29ea21a3f55e95a9c5d433b52f Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Sep 18 10:57:42 2013 +0200 Probe list uses the content-nav manually with html and sets the class active/no active using controller context variables. commit 3b9c06fa7b26df37d08464ebb93f72ec53e53786 Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Tue Sep 17 17:19:56 2013 +0200 CSS update Submenue styles added + class nav-spacewalk renamed to spacewalk-main-nav commit 26a7ee7a20d4aa309ae89d748c68c8b5cc77bb91 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Sep 17 16:44:54 2013 +0200 Port the dialog renderer (aka content-nav) to use nav-tabs commit 7de620e96647f607f1281dbdf933338968a4ae22 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 16:36:42 2013 +0200 Refactor nav-spacewalk to spacewalk-main-nav commit d7ce6edd07765125e55f91404fc72b9bbe15530a Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 16:36:09 2013 +0200 Fix footer css classes and remove inline style commit 818b84ea6ed18c22ff48ca79783d956e98f094a8 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 15:56:59 2013 +0200 Fix container class commit 8e81ec6f5cd641209d4cf1b79b842fa47ab042db Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 15:46:33 2013 +0200 Remove inline style and clean up css and script elements commit 2a3f377e81e457fc1a2ed3873f24b085c6845562 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 15:39:49 2013 +0200 Fix search icon and add class nav-spacewalk to the top navigation commit 86207ca5d5dc0b59278e787fea18f61383e31ff3 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 15:29:13 2013 +0200 Fix column classes commit 3cea2606db2f3b4be5c345bb80b15b8cffc88040 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Sep 17 15:43:19 2013 +0200 TB3: Filter in ListView for single columns. ToDO: Multiple columns. commit a171412b83948e2e03365bb1aee0ea8661b07fe3 Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Sep 17 12:22:08 2013 +0200 TB3: Perl headers prepared. commit a8124714a2723f23c47cb0f9bd608074f0364a3d Author: Cynthia Sanchez <csanschez(a)suse.com> Date: Tue Sep 17 14:47:54 2013 +0200 updated spacewalk theme commit 610fee9a44f9eccb73fe03ff9eedbd5f1e84ca79 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 14:09:00 2013 +0200 Fix header elements and classes commit 428fec7379d5582be82e7f438c4fd5f9a599f2ae Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Sep 17 13:24:30 2013 +0200 Convert div into nav for the navigation on the left side commit 0c37c6758990e111d4664fa809db4241c9aa737c Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Sep 17 12:00:35 2013 +0200 add the new Spacewalk branding, commented, so that can be enabled on local development. commit d6d47ce682601f9d9b6b403d9f9b47b51c6b1153 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Sep 16 17:53:36 2013 +0200 Remove unnecessary ids, classes and code commit c25f40f0eb072d9af02f0df9ef63dd1456f4a11f Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Sep 16 17:31:39 2013 +0200 First version of the top navigation bar commit dd706f9664991be07fcc582ebcc711a718c809f0 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 16 17:20:07 2013 +0200 TB3: Search buttons commit 4247434dc39465265ebfb055ede306c5f033d083 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 16 16:39:50 2013 +0200 bootstrap 3 does not provide indentation for stacked pills commit 09f91d334e82268eaa19d070158d18cf3a917a08 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 16 16:37:17 2013 +0200 add table styles commit a5d29c804cc404a0d5d0cc40b373bd3d35f9d419 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 16 16:10:22 2013 +0200 Side navigation is now generating unsorted nesten lists. commit 57db6595c87069b6e5d89624befea09f96c23377 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Sep 16 14:48:01 2013 +0200 Side navigation for Bootstrap 3.0 commit 1e71be1d4d6546e5a6d2084b7caa8abbdc381bf5 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 16 14:25:58 2013 +0200 use the grid to layout aside and section commit 5c5f2c4e655c6130d219ed9318797bc8fb5e6950 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 16 12:58:08 2013 +0200 Cleanup the header include. TODO: the action bar has to be moved out of the header into the section (main content) commit ab4c1b2cc8dbc38b705845ab3bfa84b7546d255d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Mon Sep 16 12:01:22 2013 +0200 Use a standard page layout (html5)

1 0

Branch 'bootstrap-css' - 0 commits -
by Silvio Moioli 07 Oct '13

07 Oct '13

Rebased ref, commits from common ancestor:

1 0

Changes to 'refs/tags/spacewalk-web-2.1.23-1'
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

Tag 'spacewalk-web-2.1.23-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-07 07:47 +0000 Tagging package [spacewalk-web] version [2.1.23-1] in directory [web/]. Changes since spacewalk-setup-2.1.6-1: Tomas Kasparek (3): Revert "removing Perl code associated with reboot system page" Revert "removing Perl reboot system page" Automatic commit of package [spacewalk-web] release [2.1.23-1]. --- rel-eng/packages/spacewalk-web | 2 - web/html/network/systems/details/reboot_confirm.pxt | 39 ++++++++++++++++++++ web/modules/sniglets/Sniglets/Servers.pm | 27 +++++++++++++ web/spacewalk-web.spec | 6 ++- 4 files changed, 72 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit ca83576b11c64af686b1687123ae0c0bffe28a60 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Oct 7 09:47:45 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.23-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index c478bea..dce5e38 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.22-1 web/ +2.1.23-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index a3121f1..5961f9c 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.22 +Version: 2.1.23 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -272,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Mon Oct 07 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.23-1 +- Revert "removing Perl reboot system page" +- Revert "removing Perl code associated with reboot system page" + * Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1 - 1013629 - clean up old help links

1 0

2 commits - web/html web/modules
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

web/html/network/systems/details/reboot_confirm.pxt | 39 ++++++++++++++++++++ web/modules/sniglets/Sniglets/Servers.pm | 27 +++++++++++++ 2 files changed, 66 insertions(+) New commits: commit 58509da1827988432eccd90064a1d6e63c0cd531 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Oct 7 09:31:26 2013 +0200 Revert "removing Perl reboot system page" This reverts commit 76f8d2125a17b30ce893faca3c24b1ef477f378c. diff --git a/web/html/network/systems/details/reboot_confirm.pxt b/web/html/network/systems/details/reboot_confirm.pxt new file mode 100644 index 0000000..898ff1f --- /dev/null +++ b/web/html/network/systems/details/reboot_confirm.pxt @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf8"?> +<pxt-passthrough> + +<pxt-use class="Grail::Frame" /> +<pxt-use class="Sniglets::Servers" /> +<pxt-use class="Sniglets::Sets" /> +<pxt-use class="Sniglets::HTML" /> +<pxt-use class="Sniglets::ServerActions" /> + + +<grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> +<pxt-formvar> + <pxt-include-late file="/network/components/systems/system_details_toolbar.pxi" /> +</pxt-formvar> + + <rhn-navi-nav prefix="system_details" file="/nav/system_detail.xml" style="contentnav" /> + +<pxt-include-late file="/network/components/message_queues/local.pxi" /> + +<rhn-up2date-at-least version="2.9.3" release="2.2.1AS"> + +<h2>System Reboot Confirmation</h2> + +<p>This will schedule a reboot of this system.</p> + + +<pxt-form method="post"> +<p>If you are <strong>certain</strong> you wish to do this, you may schedule the reboot to take place as soon as possible, or no earlier than a specified time:</p> + +<rhn-schedule-action-interface action="schedule_errata_updates" callback="rhn:reboot_server_cb" label="Schedule Reboot" /> + +<pxt-hidden name="sid" /> + +</pxt-form> + +</rhn-up2date-at-least> + +</grail-canvas-template> +</pxt-passthrough> commit 2e61832fd9363a9c0c01e64ec38c07fc147405b2 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Oct 7 09:31:18 2013 +0200 Revert "removing Perl code associated with reboot system page" This reverts commit 09cd32cbfa33bfcade4364bc3c0eee053844ee33. diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 2b5bc13..1f3482c 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -72,6 +72,8 @@ sub register_callbacks { my $class = shift; my $pxt = shift; + $pxt->register_callback('rhn:reboot_server_cb' => \&reboot_server_cb); + $pxt->register_callback('rhn:server_prefs_form_cb' => \&server_prefs_form_cb); $pxt->register_callback('rhn:ssm_change_system_prefs_cb' => \&ssm_change_system_prefs_cb); @@ -343,6 +345,31 @@ sub server_history_event_details { return $params{__block__}; } +sub reboot_server_cb { + my $pxt = shift; + my $sid = $pxt->param('sid'); + die "no server id" unless $sid; + + my $server = RHN::Server->lookup(-id => $sid); + die "no server obj" unless $server; + + my $earliest_date = Sniglets::ServerActions->parse_date_pickbox($pxt); + my $action_id = RHN::Scheduler->schedule_reboot(-org_id => $pxt->user->org_id, + -user_id => $pxt->user->id, + -earliest => $earliest_date, + -server_id => $sid); + + + my $pretty_earliest_date = $pxt->user->convert_time($earliest_date); + warn("asdfasdfasdf"); +# my $message = sprintf(<<EOM, $server->name, $server->name, $action_id); +#Reboot scheduled for system <strong>%s</strong> for $pretty_earliest_date. To cancel the reboot, remove <strong>%s</strong> from <a href="/rhn/schedule/InProgressSystems.do?aid=%d"><strong>the list of systems to be rebooted</strong></a>. +#EOM +# +# $pxt->push_message(site_info => $message); + $pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid&message=system.reboot.scheduled&messagep1=" . $server->name . "&messagep2=" . $pretty_earliest_date . "&messagep3=" . $action_id); +} + my @user_server_prefs = ( { name => 'receive_notifications', label => 'Receive Notifications of Updates/Errata' }, { name => 'include_in_daily_summary',

1 0

Changes to 'refs/tags/spacewalk-setup-2.1.6-1'
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

Tag 'spacewalk-setup-2.1.6-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-07 06:33 +0000 Tagging package [spacewalk-setup] version [2.1.6-1] in directory [spacewalk/setup/]. Changes since rhncfg-5.10.64-1: Tomas Kasparek (2): setting up configuration for editarea for apache >= 2.4 Automatic commit of package [spacewalk-setup] release [2.1.6-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/bin/spacewalk-setup | 12 ++++++++++++ spacewalk/setup/share/editarea.conf.1 | 7 +++++++ spacewalk/setup/spacewalk-setup.spec | 6 +++++- 4 files changed, 25 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/setup
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 77b531f2f8f0d0a2f83fe4f6e40701e275288394 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Oct 7 08:33:04 2013 +0200 Automatic commit of package [spacewalk-setup] release [2.1.6-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 059e679..c8f3d4d 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -2.1.5-1 spacewalk/setup/ +2.1.6-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 2b8e4c5..40ca911 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,7 +1,7 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: spacewalk-setup -Version: 2.1.5 +Version: 2.1.6 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -103,6 +103,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Mon Oct 07 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.6-1 +- setting up configuration for editarea for apache >= 2.4 + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.5-1 - Grammar error occurred

1 0

spacewalk/setup
by Tomáš Kašpárek 07 Oct '13

07 Oct '13

spacewalk/setup/bin/spacewalk-setup | 12 ++++++++++++ spacewalk/setup/share/editarea.conf.1 | 7 +++++++ spacewalk/setup/spacewalk-setup.spec | 1 + 3 files changed, 20 insertions(+) New commits: commit d02add4b1ce892588f509069966eddfb50aeea77 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Thu Oct 3 15:22:35 2013 +0200 setting up configuration for editarea for apache >= 2.4 editarea is used on Spacewalk. When using Fedora 19 & apache 2.4 getting /editarea/edit_area_full.js results in Forbidden. Apache auth is now done in a set of modules for 2.4. According to the documentation https://httpd.apache.org/docs/2.4/upgrading.html 2.2 configuration: Order deny,allow Deny from all 2.4 configuration: Require all denied I am not sure why the default changed, as httpd/conf.d/editarea.conf did not had a configuration before, but adding the corresponding 2.4 part fixes the problem. diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 5194806..8c826bb 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -31,6 +31,7 @@ use Spacewalk::Setup (); use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); use IO::Socket (); use RHN::DB (); +use File::Copy; my $DEBUG; $DEBUG = 0; @@ -138,6 +139,9 @@ Spacewalk::Setup::update_monitoring_ack_enqueuer(\%opts, \%answers); print Spacewalk::Setup::loc("* Configuring apache SSL virtual host.\n"); setup_ssl_vhost(\%opts, \%answers); +print Spacewalk::Setup::loc("* Configuring editarea.\n"); +setup_editarea(); + print Spacewalk::Setup::loc("* Configuring tomcat.\n"); setup_tomcat(\%opts, \%answers); @@ -537,6 +541,14 @@ sub setup_ssl_vhost { return; } +sub setup_editarea { + my $conf_file = "/etc/httpd/conf.d/editarea.conf"; + if( -e $conf_file) { + Spacewalk::Setup::backup_file("/etc/httpd/conf.d", "editarea.conf"); + } + copy(Spacewalk::Setup::SHARED_DIR . "/editarea.conf.1", $conf_file); +} + sub setup_tomcat { my $opts = shift; my $answers = shift; diff --git a/spacewalk/setup/share/editarea.conf.1 b/spacewalk/setup/share/editarea.conf.1 new file mode 100644 index 0000000..ab90b9c --- /dev/null +++ b/spacewalk/setup/share/editarea.conf.1 @@ -0,0 +1,7 @@ +alias /editarea /usr/share/editarea + +<IfVersion >= 2.4> +<Directory /usr/share/editarea> +Require all granted +</Directory> +</IfVersion> diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 5a6d9a7..2b8e4c5 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -57,6 +57,7 @@ install -m 0755 share/embedded_diskspace_check.py %{buildroot}/%{_datadir}/space install -m 0644 share/sudoers.* %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/ssl.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/tomcat.* %{buildroot}/%{_datadir}/spacewalk/setup/ +install -m 0644 share/editarea.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/web.xml.patch %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/

1 0

Changes to 'refs/tags/rhncfg-5.10.64-1'
by Michael Mraka 04 Oct '13

04 Oct '13

Tag 'rhncfg-5.10.64-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-04 13:35 +0000 Tagging package [rhncfg] version [5.10.64-1] in directory [client/tools/rhncfg/]. Changes since rhnlib-2.5.68-1: Matej Kollar (5): Tabs vs. Spaces War Some seemingly unimportant spaces Eliminating eval where possible There is no up2date anymore Allow user to save entered data as answer file Michael Mraka (2): Adding fallback support for numeric UID/GID Automatic commit of package [rhncfg] release [5.10.64-1]. --- client/tools/rhncfg/config_common/transactions.py | 16 client/tools/rhncfg/rhncfg.spec | 5 proxy/installer/configure-proxy.sh | 393 +++++++++++----------- rel-eng/packages/rhncfg | 2 4 files changed, 223 insertions(+), 193 deletions(-) ---

1 0

2 commits - client/tools rel-eng/packages
by Michael Mraka 04 Oct '13

04 Oct '13

client/tools/rhncfg/config_common/transactions.py | 16 +++++++++++----- client/tools/rhncfg/rhncfg.spec | 5 ++++- rel-eng/packages/rhncfg | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) New commits: commit 1f2cf61849cc039cea5dae14dc9121def578e44c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 15:35:24 2013 +0200 Automatic commit of package [rhncfg] release [5.10.64-1]. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index b1259d9..902c002 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -8,7 +8,7 @@ Group: Applications/System License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.63 +Version: 5.10.64 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -120,6 +120,9 @@ fi # $Id$ %changelog +* Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.64-1 +- Adding fallback support for numeric UID/GID + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.63-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg index 2c630bd..db0dade 100644 --- a/rel-eng/packages/rhncfg +++ b/rel-eng/packages/rhncfg @@ -1 +1 @@ -5.10.63-1 client/tools/rhncfg/ +5.10.64-1 client/tools/rhncfg/ commit 2844654af3ca8d80fc438acf7f552e0489f7cb3e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 15:31:14 2013 +0200 Adding fallback support for numeric UID/GID if lookup fails and username/groupname is numeric Nick Piacentine <npiace(a)mars.asu.edu> diff --git a/client/tools/rhncfg/config_common/transactions.py b/client/tools/rhncfg/config_common/transactions.py index 8e3f3d3..b449ac2 100644 --- a/client/tools/rhncfg/config_common/transactions.py +++ b/client/tools/rhncfg/config_common/transactions.py @@ -125,10 +125,13 @@ class DeployTransaction: try: user_record = pwd.getpwnam(file_info['username']) + uid = user_record[2] except Exception, e: - raise cfg_exceptions.UserNotFound(file_info['username']), None, sys.exc_info()[2] - - uid = user_record[2] + #Check if username is an int + try: + uid = int(file_info['username']) + except ValueError: + raise cfg_exceptions.UserNotFound(file_info['username']), None, sys.exc_info()[2] else: #default to root (3.2 sats) uid = 0 @@ -139,10 +142,13 @@ class DeployTransaction: # determine gid try: group_record = grp.getgrnam(file_info['groupname']) + gid = group_record[2] except Exception, e: - raise cfg_exceptions.GroupNotFound(file_info['groupname']), None, sys.exc_info()[2] + try: + gid = int(file_info['groupname']) + except ValueError: + raise cfg_exceptions.GroupNotFound(file_info['groupname']), None, sys.exc_info()[2] - gid = group_record[2] else: #default to root (3.2 sats) gid = 0

1 0

5 commits - proxy/installer
by mkollar 04 Oct '13

04 Oct '13

proxy/installer/configure-proxy.sh | 393 +++++++++++++++++++------------------ 1 file changed, 207 insertions(+), 186 deletions(-) New commits: commit 26c23c7a2de9259a8874f615ba942705659d681c Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Oct 3 08:16:28 2013 +0200 Allow user to save entered data as answer file diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 848ab2a..066b14b 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -154,6 +154,24 @@ while : ; do shift done +ACCUMULATED_ANSWERS="" + +generate_answers() { + if [ "$INTERACTIVE" = 1 -a ! -z "$ACCUMULATED_ANSWERS" ]; then + local WRITE_ANSWERS + echo "There were some answers you had to enter manually." + echo "Would you like to have written those into file" + echo -n "formatted as answers file? [Y/n]: " + read WRITE_ANSWERS + WRITE_ANSWERS=$(yes_no ${WRITE_ANSWERS:-Y}) + if [ "$WRITE_ANSWERS" = 1 ]; then + local tmp=$(mktemp proxy-answers.txt.XXXXX) + echo "Writing $tmp" + echo "# Answer file generated by ${0##*/} at $(date)$ACCUMULATED_ANSWERS" > $tmp + fi + fi +} + default_or_input() { local MSG="$1" local VARIABLE="$2" @@ -170,11 +188,12 @@ default_or_input() { echo -n "$MSG [$DEFAULT]: " if [ "$INTERACTIVE" = "1" -a -z "$VARIABLE_ISSET" ]; then read INPUT + ACCUMULATED_ANSWERS+=$(printf "\n%q=%q" "$VARIABLE" "${INPUT:-$DEFAULT}") elif [ -z "$VARIABLE_ISSET" ]; then - echo $DEFAULT + echo "$DEFAULT" else DEFAULT=${!VARIABLE} - echo $DEFAULT + echo "$DEFAULT" fi if [ -z "$INPUT" ]; then INPUT="$DEFAULT" @@ -203,6 +222,7 @@ config_error() { --http-proxy-password="$HTTP_PASSWORD" \ --ca-cert="$CA_CHAIN" \ --deactivate --non-interactive + generate_answers exit $1 fi } @@ -231,6 +251,7 @@ in section. Then re-run this script again. WARNING + generate_answers exit 3 fi } @@ -288,6 +309,7 @@ Please do copy your CA key and public certificate from $RHN_PARENT to /root/ssl-build directory. You may want to execute this command: scp 'root@$RHN_PARENT:/root/ssl-build/{RHN-ORG-PRIVATE-SSL-KEY,RHN-ORG-TRUSTED-SSL-CERT,rhn-ca-openssl.cnf}' $SSL_BUILD_DIR CA_KEYS + generate_answers exit 1 fi @@ -295,6 +317,7 @@ check_ca_conf if ! /sbin/runuser nobody -s /bin/sh --command="[ -r $CA_CHAIN ]" ; then echo Error: File $CA_CHAIN is not readable by nobody user. + generate_answers exit 1 fi @@ -591,3 +614,5 @@ else echo Skipping start of services. echo Use "/usr/sbin/rhn-proxy start" to manualy start proxy. fi + +generate_answers commit dc75b28866902d6cf860d795b787804b145faf70 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 1 17:47:03 2013 +0200 There is no up2date anymore diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index fd07463..848ab2a 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -235,17 +235,12 @@ WARNING fi } -#do we have yum or up2date? -YUM_OR_UPDATE="up2date -i" -UPGRADE="up2date -u" -if [ -f /usr/bin/yum ]; then - YUM_OR_UPDATE="yum install" - UPGRADE="yum upgrade" - # add -y for non-interactive installation - if [ "$INTERACTIVE" = "0" ]; then - YUM_OR_UPDATE="$YUM_OR_UPDATE -y" - UPGRADE="$UPGRADE -y" - fi +YUM="yum install" +UPGRADE="yum upgrade" +# add -y for non-interactive installation +if [ "$INTERACTIVE" = "0" ]; then + YUM="$YUM -y" + UPGRADE="$UPGRADE -y" fi SYSCONFIG_DIR=/etc/sysconfig/rhn RHNCONF_DIR=/etc/rhn @@ -377,7 +372,7 @@ if [ -x /usr/sbin/rhn-proxy ]; then /usr/sbin/rhn-proxy stop fi -$YUM_OR_UPDATE spacewalk-proxy-management +$YUM spacewalk-proxy-management # check if package install successfully rpm -q spacewalk-proxy-management >/dev/null if [ $? -ne 0 ]; then @@ -396,14 +391,14 @@ else echo "You do not have monitoring installed." echo "Do you want to install monitoring scout?" - default_or_input "Will run '$YUM_OR_UPDATE spacewalk-proxy-monitoring'." INSTALL_MONITORING 'Y/n' + default_or_input "Will run '$YUM spacewalk-proxy-monitoring'." INSTALL_MONITORING 'Y/n' INSTALL_MONITORING=$(yes_no $INSTALL_MONITORING) if [ "$INSTALL_MONITORING" = "1" ]; then - $YUM_OR_UPDATE spacewalk-proxy-monitoring + $YUM spacewalk-proxy-monitoring MONITORING=$? fi else - $YUM_OR_UPDATE spacewalk-proxy-monitoring + $YUM spacewalk-proxy-monitoring # check if package install successfully rpm -q spacewalk-proxy-monitoring >/dev/null if [ $? -ne 0 ]; then commit 453273cb322ed9cb6524f6dbd4cc82d2e7d88a2f Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 1 14:37:16 2013 +0200 Eliminating eval where possible Eval is evil. On few places eval remained, maily becasue older bash do not have -g option for declare builtin. Otherwise construction declare -g "$VAR"="$ARG" would be nicer and safer diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 83952bd..fd07463 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -96,7 +96,7 @@ set_value() { local VAR="$2" local ARG="$3" [[ "$ARG" =~ ^- ]] && echo "$0: option $OPTION requires argument!" && print_help - eval "$VAR=$ARG" + eval "$(printf "%q=%q" "$VAR" "$ARG")" } INTERACTIVE=1 @@ -108,6 +108,7 @@ if [ $? != 0 ] ; then print_help fi +# It is getopt's responsibility to make this safe eval set -- "$OPTS" while : ; do @@ -159,7 +160,7 @@ default_or_input() { local DEFAULT="$3" local INPUT - local CURRENT_VALUE=$(eval "echo \$$VARIABLE") + local CURRENT_VALUE=${!VARIABLE} #in following code is used not so common expansion #var_a=${var_b:-word} #which is like: var_a = $var_b ? word @@ -172,13 +173,13 @@ default_or_input() { elif [ -z "$VARIABLE_ISSET" ]; then echo $DEFAULT else - eval "DEFAULT=\$$VARIABLE" + DEFAULT=${!VARIABLE} echo $DEFAULT fi if [ -z "$INPUT" ]; then INPUT="$DEFAULT" fi - eval "$VARIABLE='$INPUT'" + eval "$(printf "%q=%q" "$VARIABLE" "$INPUT")" } yes_no() { commit bebb316e76dd3be8ad9ee34e75e9e5246e03bf06 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 1 14:08:54 2013 +0200 Some seemingly unimportant spaces diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index fdb9ac2..83952bd 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -5,7 +5,7 @@ if [ 0$UID -gt 0 ]; then exit 1 fi -print_help () { +print_help() { cat <<HELP usage: configure-proxy.sh [options] @@ -78,7 +78,7 @@ HELP exit 1 } -parse_answer_file () { +parse_answer_file() { local FILE="$1" local ALIAS if [ ! -r "$FILE" ] ; then @@ -153,7 +153,7 @@ while : ; do shift done -default_or_input () { +default_or_input() { local MSG="$1" local VARIABLE="$2" local DEFAULT="$3" @@ -192,7 +192,7 @@ yes_no() { esac } -config_error () { +config_error() { if [ $1 -gt 0 ]; then echo "$2 Installation interrupted." /usr/bin/rhn-proxy-activate \ @@ -207,13 +207,13 @@ config_error () { } # Return 0 if rhnParent is Hosted. Otherwise return 1. -is_hosted () { +is_hosted() { [ "$1" = "xmlrpc.rhn.redhat.com" -o \ $( PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print '$1' in cfg['hostedWhitelist']" ) = "True" ] return $? } -check_ca_conf () { +check_ca_conf() { if [ -f /root/ssl-build/rhn-ca-openssl.cnf ] \ && awk '/^[[:space:]]*\[[[:space:]]*[_[:alnum:]]*[[:space:]]*]/ {CORRECT_SECTION=0} \ /^[[:space:]]*\[[[:space:]]*CA_default[[:space:]]*]/ {CORRECT_SECTION=1} \ commit 02cd16eb604aa239acabcb117b943dc05873ea41 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Oct 1 14:05:35 2013 +0200 Tabs vs. Spaces War + I tried to unify 4 spaces indentation. diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 83b0693..fdb9ac2 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -1,12 +1,12 @@ #!/bin/bash if [ 0$UID -gt 0 ]; then - echo Run as root. - exit 1 + echo Run as root. + exit 1 fi print_help () { - cat <<HELP + cat <<HELP usage: configure-proxy.sh [options] options: @@ -20,7 +20,7 @@ options: Enable monitoring scout. --force-own-ca Do not use parent CA and force to create your own. - -h, --help + -h, --help show this help message and exit --http-password=HTTP_PASSWORD The password to use for an authenticated proxy. @@ -75,7 +75,7 @@ options: --version=VERSION Version of Spacewalk Proxy Server you want to activate. HELP - exit 1 + exit 1 } parse_answer_file () { @@ -105,7 +105,7 @@ CNAME_INDEX=0 OPTS=$(getopt --longoptions=help,answer-file:,non-interactive,version:,rhn-parent:,traceback-email:,use-ssl::,ca-chain:,force-own-ca,http-proxy:,http-username:,http-password:,ssl-build-dir:,ssl-org:,ssl-orgunit:,ssl-common:,ssl-city:,ssl-state:,ssl-country:,ssl-email:,ssl-password:,ssl-cname:,install-monitoring::,enable-scout::,monitoring-parent:,monitoring-parent-ip:,populate-config-channel::,start-services:: -n ${0##*/} -- h "$@") if [ $? != 0 ] ; then - print_help + print_help fi eval set -- "$OPTS" @@ -154,62 +154,62 @@ while : ; do done default_or_input () { - local MSG="$1" - local VARIABLE="$2" - local DEFAULT="$3" - - local INPUT - local CURRENT_VALUE=$(eval "echo \$$VARIABLE") - #in following code is used not so common expansion - #var_a=${var_b:-word} - #which is like: var_a = $var_b ? word - DEFAULT=${CURRENT_VALUE:-$DEFAULT} - local VARIABLE_ISSET=$(set | grep "^$VARIABLE=") - - echo -n "$MSG [$DEFAULT]: " - if [ "$INTERACTIVE" = "1" -a -z "$VARIABLE_ISSET" ]; then - read INPUT - elif [ -z "$VARIABLE_ISSET" ]; then - echo $DEFAULT - else - eval "DEFAULT=\$$VARIABLE" - echo $DEFAULT - fi - if [ -z "$INPUT" ]; then - INPUT="$DEFAULT" - fi - eval "$VARIABLE='$INPUT'" + local MSG="$1" + local VARIABLE="$2" + local DEFAULT="$3" + + local INPUT + local CURRENT_VALUE=$(eval "echo \$$VARIABLE") + #in following code is used not so common expansion + #var_a=${var_b:-word} + #which is like: var_a = $var_b ? word + DEFAULT=${CURRENT_VALUE:-$DEFAULT} + local VARIABLE_ISSET=$(set | grep "^$VARIABLE=") + + echo -n "$MSG [$DEFAULT]: " + if [ "$INTERACTIVE" = "1" -a -z "$VARIABLE_ISSET" ]; then + read INPUT + elif [ -z "$VARIABLE_ISSET" ]; then + echo $DEFAULT + else + eval "DEFAULT=\$$VARIABLE" + echo $DEFAULT + fi + if [ -z "$INPUT" ]; then + INPUT="$DEFAULT" + fi + eval "$VARIABLE='$INPUT'" } yes_no() { - case "$1" in - Y|y|Y/n|n/Y|1) - echo 1 - ;; - *) - echo 0 - ;; - esac + case "$1" in + Y|y|Y/n|n/Y|1) + echo 1 + ;; + *) + echo 0 + ;; + esac } config_error () { - if [ $1 -gt 0 ]; then - echo "$2 Installation interrupted." - /usr/bin/rhn-proxy-activate \ - --server="$RHN_PARENT" \ - --http-proxy="$HTTP_PROXY" \ - --http-proxy-username="$HTTP_USERNAME" \ - --http-proxy-password="$HTTP_PASSWORD" \ - --ca-cert="$CA_CHAIN" \ - --deactivate --non-interactive - exit $1 - fi + if [ $1 -gt 0 ]; then + echo "$2 Installation interrupted." + /usr/bin/rhn-proxy-activate \ + --server="$RHN_PARENT" \ + --http-proxy="$HTTP_PROXY" \ + --http-proxy-username="$HTTP_USERNAME" \ + --http-proxy-password="$HTTP_PASSWORD" \ + --ca-cert="$CA_CHAIN" \ + --deactivate --non-interactive + exit $1 + fi } # Return 0 if rhnParent is Hosted. Otherwise return 1. is_hosted () { - [ "$1" = "xmlrpc.rhn.redhat.com" -o \ - $( PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print '$1' in cfg['hostedWhitelist']" ) = "True" ] + [ "$1" = "xmlrpc.rhn.redhat.com" -o \ + $( PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print '$1' in cfg['hostedWhitelist']" ) = "True" ] return $? } @@ -219,8 +219,8 @@ check_ca_conf () { /^[[:space:]]*\[[[:space:]]*CA_default[[:space:]]*]/ {CORRECT_SECTION=1} \ /^[[:space:]]*copy_extensions[[:space:]]*=[[:space:]]*copy/ && CORRECT_SECTION==1 {exit 1}' \ /root/ssl-build/rhn-ca-openssl.cnf > /dev/null \ - && [ ${#SSL_CNAME_PARSED[@]} -gt 0 ]; then - cat <<WARNING + && [ ${#SSL_CNAME_PARSED[@]} -gt 0 ]; then + cat <<WARNING It seems you tried to use the --set-cname option. On inspection we noticed that the openssl configuration file we use is missing a critically important option. Without this option, not only will multi host SSL certificates not work, but the planet Earth will implode in a massive rip in the time/space continuum. To avoid this failure, we choose to gracefully exit here and request for you to edit the openssl configuration file /root/ssl-build/rhn-ca-openssl.cnf and add this line: @@ -230,21 +230,21 @@ in section. Then re-run this script again. WARNING - exit 3 - fi + exit 3 + fi } #do we have yum or up2date? YUM_OR_UPDATE="up2date -i" UPGRADE="up2date -u" if [ -f /usr/bin/yum ]; then - YUM_OR_UPDATE="yum install" - UPGRADE="yum upgrade" - # add -y for non-interactive installation - if [ "$INTERACTIVE" = "0" ]; then - YUM_OR_UPDATE="$YUM_OR_UPDATE -y" - UPGRADE="$UPGRADE -y" - fi + YUM_OR_UPDATE="yum install" + UPGRADE="yum upgrade" + # add -y for non-interactive installation + if [ "$INTERACTIVE" = "0" ]; then + YUM_OR_UPDATE="$YUM_OR_UPDATE -y" + UPGRADE="$UPGRADE -y" + fi fi SYSCONFIG_DIR=/etc/sysconfig/rhn RHNCONF_DIR=/etc/rhn @@ -256,8 +256,8 @@ SQUID_DIR=/etc/squid SYSTEMID_PATH=`PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print cfg['systemIdPath'] "` if [ ! -r $SYSTEMID_PATH ]; then - echo ERROR: Spacewalk Proxy does not appear to be registered - exit 2 + echo ERROR: Spacewalk Proxy does not appear to be registered + exit 2 fi SYSTEM_ID=$(/usr/bin/xsltproc /usr/share/rhn/get_system_id.xslt $SYSTEMID_PATH | cut -d- -f2) @@ -267,8 +267,8 @@ HOSTNAME=$(hostname) SSL_BUILD_DIR=${SSL_BUILD_DIR:-/root/ssl-build} if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then - echo "Error: ssl build directory $SSL_BUILD_DIR does not exist. Please create this directory." - exit 1 + echo "Error: ssl build directory $SSL_BUILD_DIR does not exist. Please create this directory." + exit 1 fi default_or_input "RHN Parent" RHN_PARENT $(awk -F= '/serverURL=/ {split($2, a, "/")} END { print a[3]}' $SYSCONFIG_DIR/up2date) @@ -285,21 +285,21 @@ default_or_input "CA Chain" CA_CHAIN $(awk -F'[=;]' '/sslCACert=/ {a=$2} END { p if [ 0$FORCE_OWN_CA -eq 0 ] && \ ! is_hosted "$RHN_PARENT" && \ - [ ! -f /root/ssl-build/RHN-ORG-PRIVATE-SSL-KEY ] && \ - ! diff $CA_CHAIN /root/ssl-build/RHN-ORG-TRUSTED-SSL-KEY &>/dev/null; then - cat <<CA_KEYS -Please do copy your CA key and public certificate from $RHN_PARENT to + [ ! -f /root/ssl-build/RHN-ORG-PRIVATE-SSL-KEY ] && \ + ! diff $CA_CHAIN /root/ssl-build/RHN-ORG-TRUSTED-SSL-KEY &>/dev/null; then + cat <<CA_KEYS +Please do copy your CA key and public certificate from $RHN_PARENT to /root/ssl-build directory. You may want to execute this command: scp 'root@$RHN_PARENT:/root/ssl-build/{RHN-ORG-PRIVATE-SSL-KEY,RHN-ORG-TRUSTED-SSL-CERT,rhn-ca-openssl.cnf}' $SSL_BUILD_DIR CA_KEYS - exit 1 + exit 1 fi check_ca_conf if ! /sbin/runuser nobody -s /bin/sh --command="[ -r $CA_CHAIN ]" ; then - echo Error: File $CA_CHAIN is not readable by nobody user. - exit 1 + echo Error: File $CA_CHAIN is not readable by nobody user. + exit 1 fi VERSION_FROM_PARENT=$(rhn-proxy-activate --server=$RHN_PARENT --list-available-versions 2>/dev/null|sort|tail -n1) @@ -316,11 +316,11 @@ default_or_input "HTTP Proxy" HTTP_PROXY '' if [ "$HTTP_PROXY" != "" ]; then - default_or_input "HTTP username" HTTP_USERNAME '' + default_or_input "HTTP username" HTTP_USERNAME '' - if [ "$HTTP_USERNAME" != "" ]; then - default_or_input "HTTP password" HTTP_PASSWORD '' - fi + if [ "$HTTP_USERNAME" != "" ]; then + default_or_input "HTTP password" HTTP_PASSWORD '' + fi fi cat <<SSLCERT @@ -345,15 +345,15 @@ default_or_input "Country code" SSL_COUNTRY '' default_or_input "Email" SSL_EMAIL "$TRACEBACK_EMAIL" if [ ${#SSL_CNAME_PARSED[@]} -eq 0 ]; then - VARIABLE_ISSET=$(set | grep "^SSL_CNAME=") - if [ -z $VARIABLE_ISSET ]; then - default_or_input "Cname aliases (separated by space)" SSL_CNAME_ASK '' - CNAME=($SSL_CNAME_ASK) - for ALIAS in ${CNAME[@]}; do - SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS - done - check_ca_conf - fi + VARIABLE_ISSET=$(set | grep "^SSL_CNAME=") + if [ -z $VARIABLE_ISSET ]; then + default_or_input "Cname aliases (separated by space)" SSL_CNAME_ASK '' + CNAME=($SSL_CNAME_ASK) + for ALIAS in ${CNAME[@]}; do + SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS + done + check_ca_conf + fi fi /usr/bin/rhn-proxy-activate --server="$RHN_PARENT" \ @@ -373,14 +373,14 @@ if [ $? -eq 0 ]; then fi if [ -x /usr/sbin/rhn-proxy ]; then - /usr/sbin/rhn-proxy stop + /usr/sbin/rhn-proxy stop fi $YUM_OR_UPDATE spacewalk-proxy-management # check if package install successfully rpm -q spacewalk-proxy-management >/dev/null if [ $? -ne 0 ]; then - config_error 2 "Installation of package spacewalk-proxy-management failed." + config_error 2 "Installation of package spacewalk-proxy-management failed." fi $UPGRADE @@ -393,7 +393,7 @@ else MONITORING=$? if [ $MONITORING -ne 0 ]; then echo "You do not have monitoring installed." - echo "Do you want to install monitoring scout?" + echo "Do you want to install monitoring scout?" default_or_input "Will run '$YUM_OR_UPDATE spacewalk-proxy-monitoring'." INSTALL_MONITORING 'Y/n' INSTALL_MONITORING=$(yes_no $INSTALL_MONITORING) @@ -427,16 +427,16 @@ else --ca-cert="$CA_CHAIN" | \ awk '/\: [0-9a-f]+/ { print $4 }' ` else - ENABLE_SCOUT=0 + ENABLE_SCOUT=0 fi fi ln -sf /etc/pki/spacewalk/jabberd/server.pem /etc/jabberd/server.pem if [ "$VERSION" = '5.3' -o "$VERSION" = '5.2' -o "$VERSION" = '5.1' -o "$VERSION" = '5.0' ]; then - sed -e "s/\${session.hostname}/$HOSTNAME/g" </usr/share/rhn/installer/jabberd/c2s.xml >/etc/jabberd/c2s.xml - sed -e "s/\${session.hostname}/$HOSTNAME/g" </usr/share/rhn/installer/jabberd/sm.xml >/etc/jabberd/sm.xml + sed -e "s/\${session.hostname}/$HOSTNAME/g" </usr/share/rhn/installer/jabberd/c2s.xml >/etc/jabberd/c2s.xml + sed -e "s/\${session.hostname}/$HOSTNAME/g" </usr/share/rhn/installer/jabberd/sm.xml >/etc/jabberd/sm.xml else - /usr/bin/spacewalk-setup-jabberd --macros "hostname:$HOSTNAME" + /usr/bin/spacewalk-setup-jabberd --macros "hostname:$HOSTNAME" fi # size of squid disk cache will be 60% of free space on /var/spool/squid @@ -452,19 +452,19 @@ if [ $SQUID_VER_MAJOR -ge 3 ] ; then fi sed "$SQUID_REWRITE" < $DIR/squid.conf > $SQUID_DIR/squid.conf sed -e "s|\${session.ca_chain:/usr/share/rhn/RHNS-CA-CERT}|$CA_CHAIN|g" \ - -e "s/\${session.http_proxy}/$HTTP_PROXY/g" \ - -e "s/\${session.http_proxy_username}/$HTTP_USERNAME/g" \ - -e "s/\${session.http_proxy_password}/$HTTP_PASSWORD/g" \ - -e "s/\${session.rhn_parent}/$RHN_PARENT/g" \ - -e "s/\${session.traceback_mail}/$TRACEBACK_EMAIL/g" \ - -e "s/\${session.use_ssl:0}/$USE_SSL/g" \ - -e "s/\${session.enable_monitoring_scout:0}/$ENABLE_SCOUT/g" \ - < $DIR/rhn.conf > $RHNCONF_DIR/rhn.conf + -e "s/\${session.http_proxy}/$HTTP_PROXY/g" \ + -e "s/\${session.http_proxy_username}/$HTTP_USERNAME/g" \ + -e "s/\${session.http_proxy_password}/$HTTP_PASSWORD/g" \ + -e "s/\${session.rhn_parent}/$RHN_PARENT/g" \ + -e "s/\${session.traceback_mail}/$TRACEBACK_EMAIL/g" \ + -e "s/\${session.use_ssl:0}/$USE_SSL/g" \ + -e "s/\${session.enable_monitoring_scout:0}/$ENABLE_SCOUT/g" \ + < $DIR/rhn.conf > $RHNCONF_DIR/rhn.conf if [ $MONITORING -eq 0 ]; then - sed -e "s/\${session.enable_monitoring_scout:0}/$ENABLE_SCOUT/g" \ - -e "s/\${session.rhn_monitoring_parent_ip}/$MONITORING_PARENT_IP/g" \ - -e "s/\${session.rhn_monitoring_parent}/$MONITORING_PARENT/g" \ - -e "s/\${session.scout_shared_key}/$SCOUT_SHARED_KEY/g" \ + sed -e "s/\${session.enable_monitoring_scout:0}/$ENABLE_SCOUT/g" \ + -e "s/\${session.rhn_monitoring_parent_ip}/$MONITORING_PARENT_IP/g" \ + -e "s/\${session.rhn_monitoring_parent}/$MONITORING_PARENT/g" \ + -e "s/\${session.scout_shared_key}/$SCOUT_SHARED_KEY/g" \ < $DIR/cluster.ini > $RHNCONF_DIR/cluster.ini fi @@ -478,113 +478,113 @@ if [ $USE_SSL -eq 1 ]; then PROTO="https" fi sed -e "s/\$PROTO/$PROTO/g" \ - -e "s/\$RHN_PARENT/$RHN_PARENT/g" < $DIR/cobbler-proxy.conf > $HTTPDCONFD_DIR/cobbler-proxy.conf + -e "s/\$RHN_PARENT/$RHN_PARENT/g" < $DIR/cobbler-proxy.conf > $HTTPDCONFD_DIR/cobbler-proxy.conf # lets do SSL stuff SSL_BUILD_DIR=${SSL_BUILD_DIR:-"/root/ssl-build"} if [ -n "$SSL_PASSWORD" ] ; then - # use SSL_PASSWORD if already set - RHN_SSL_TOOL_PASSWORD_OPTION="--password" - RHN_SSL_TOOL_PASSWORD="$SSL_PASSWORD" + # use SSL_PASSWORD if already set + RHN_SSL_TOOL_PASSWORD_OPTION="--password" + RHN_SSL_TOOL_PASSWORD="$SSL_PASSWORD" elif [ "$INTERACTIVE" = "0" ] ; then - # non-interactive mode but no SSL_PASSWORD :( - config_error 4 "Please define SSL_PASSWORD." + # non-interactive mode but no SSL_PASSWORD :( + config_error 4 "Please define SSL_PASSWORD." fi if [ ! -f $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY ]; then - echo "Generating CA key and public certificate:" - /usr/bin/rhn-ssl-tool --gen-ca -q \ - --dir="$SSL_BUILD_DIR" \ - --set-common-name="$SSL_COMMON" \ - --set-country="$SSL_COUNTRY" \ - --set-city="$SSL_CITY" \ - --set-state="$SSL_STATE" \ - --set-org="$SSL_ORG" \ - --set-org-unit="$SSL_ORGUNIT" \ - --set-email="$SSL_EMAIL" \ - $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD - config_error $? "CA certificate generation failed!" + echo "Generating CA key and public certificate:" + /usr/bin/rhn-ssl-tool --gen-ca -q \ + --dir="$SSL_BUILD_DIR" \ + --set-common-name="$SSL_COMMON" \ + --set-country="$SSL_COUNTRY" \ + --set-city="$SSL_CITY" \ + --set-state="$SSL_STATE" \ + --set-org="$SSL_ORG" \ + --set-org-unit="$SSL_ORGUNIT" \ + --set-email="$SSL_EMAIL" \ + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD + config_error $? "CA certificate generation failed!" else - echo "Using CA key at $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY." + echo "Using CA key at $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY." fi RPM_CA=$(grep noarch $SSL_BUILD_DIR/latest.txt 2>/dev/null) if [ ! -f $SSL_BUILD_DIR/$RPM_CA ]; then - echo "Generating distributable RPM for CA public certificate:" - /usr/bin/rhn-ssl-tool --gen-ca -q --rpm-only --dir="$SSL_BUILD_DIR" - RPM_CA=$(grep noarch $SSL_BUILD_DIR/latest.txt) + echo "Generating distributable RPM for CA public certificate:" + /usr/bin/rhn-ssl-tool --gen-ca -q --rpm-only --dir="$SSL_BUILD_DIR" + RPM_CA=$(grep noarch $SSL_BUILD_DIR/latest.txt) fi if [ ! -f $HTMLPUB_DIR/$RPM_CA ] || [ ! -f $HTMLPUB_DIR/RHN-ORG-TRUSTED-SSL-CERT ] || \ ! diff $HTMLPUB_DIR/RHN-ORG-TRUSTED-SSL-CERT $SSL_BUILD_DIR/RHN-ORG-TRUSTED-SSL-CERT &>/dev/null; then - echo "Copying CA public certificate to $HTMLPUB_DIR for distribution to clients:" - cp $SSL_BUILD_DIR/RHN-ORG-TRUSTED-SSL-CERT $SSL_BUILD_DIR/$RPM_CA $HTMLPUB_DIR/ + echo "Copying CA public certificate to $HTMLPUB_DIR for distribution to clients:" + cp $SSL_BUILD_DIR/RHN-ORG-TRUSTED-SSL-CERT $SSL_BUILD_DIR/$RPM_CA $HTMLPUB_DIR/ fi echo "Generating SSL key and public certificate:" /usr/bin/rhn-ssl-tool --gen-server -q --no-rpm \ - --set-hostname "$HOSTNAME" \ - --dir="$SSL_BUILD_DIR" \ - --set-country="$SSL_COUNTRY" \ - --set-city="$SSL_CITY" \ - --set-state="$SSL_STATE" \ - --set-org="$SSL_ORG" \ - --set-org-unit="$SSL_ORGUNIT" \ - --set-email="$SSL_EMAIL" \ - ${SSL_CNAME_PARSED[@]} \ - $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD + --set-hostname "$HOSTNAME" \ + --dir="$SSL_BUILD_DIR" \ + --set-country="$SSL_COUNTRY" \ + --set-city="$SSL_CITY" \ + --set-state="$SSL_STATE" \ + --set-org="$SSL_ORG" \ + --set-org-unit="$SSL_ORGUNIT" \ + --set-email="$SSL_EMAIL" \ + ${SSL_CNAME_PARSED[@]} \ + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD config_error $? "SSL key generation failed!" echo "Installing SSL certificate for Apache and Jabberd:" rpm -Uv $(/usr/bin/rhn-ssl-tool --gen-server --rpm-only --dir="$SSL_BUILD_DIR" 2>/dev/null |grep noarch.rpm) if [ -e $HTTPDCONFD_DIR/ssl.conf ]; then - mv $HTTPDCONFD_DIR/ssl.conf $HTTPDCONFD_DIR/ssl.conf.bak + mv $HTTPDCONFD_DIR/ssl.conf $HTTPDCONFD_DIR/ssl.conf.bak fi sed -e "s|^SSLCertificateFile /etc/pki/tls/certs/localhost.crt$|SSLCertificateFile $HTTPDCONF_DIR/ssl.crt/server.crt|g" \ - -e "s|^SSLCertificateKeyFile /etc/pki/tls/private/localhost.key$|SSLCertificateKeyFile $HTTPDCONF_DIR/ssl.key/server.key|g" \ - -e "s|</VirtualHost>|RewriteEngine on\nRewriteOptions inherit\nSSLProxyEngine on\n</VirtualHost>|" \ - < $HTTPDCONFD_DIR/ssl.conf.bak > $HTTPDCONFD_DIR/ssl.conf + -e "s|^SSLCertificateKeyFile /etc/pki/tls/private/localhost.key$|SSLCertificateKeyFile $HTTPDCONF_DIR/ssl.key/server.key|g" \ + -e "s|</VirtualHost>|RewriteEngine on\nRewriteOptions inherit\nSSLProxyEngine on\n</VirtualHost>|" \ + < $HTTPDCONFD_DIR/ssl.conf.bak > $HTTPDCONFD_DIR/ssl.conf CHANNEL_LABEL="rhn_proxy_config_$SYSTEM_ID" default_or_input "Create and populate configuration channel $CHANNEL_LABEL?" POPULATE_CONFIG_CHANNEL 'Y/n' POPULATE_CONFIG_CHANNEL=$(yes_no $POPULATE_CONFIG_CHANNEL) if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then - RHNCFG_STATUS=1 - while [ $RHNCFG_STATUS != 0 ] ; do - CONFIG_CHANNELS=$(rhncfg-manager list-channels --server-name "$RHN_PARENT") - RHNCFG_STATUS=$? - done - if ! grep -q -E "^ +$CHANNEL_LABEL$" <<<"$CONFIG_CHANNELS" ; then - rhncfg-manager create-channel --server-name "$RHN_PARENT" "$CHANNEL_LABEL" - fi - rhncfg-manager update --server-name "$RHN_PARENT" \ - --channel="$CHANNEL_LABEL" \ - $HTTPDCONFD_DIR/ssl.conf \ - $RHNCONF_DIR/rhn.conf \ - $RHNCONF_DIR/cluster.ini \ - $SQUID_DIR/squid.conf \ - $HTTPDCONFD_DIR/cobbler-proxy.conf \ - $HTTPDCONF_DIR/httpd.conf \ - $JABBERD_DIR/c2s.xml \ - $JABBERD_DIR/sm.xml + RHNCFG_STATUS=1 + while [ $RHNCFG_STATUS != 0 ] ; do + CONFIG_CHANNELS=$(rhncfg-manager list-channels --server-name "$RHN_PARENT") + RHNCFG_STATUS=$? + done + if ! grep -q -E "^ +$CHANNEL_LABEL$" <<<"$CONFIG_CHANNELS" ; then + rhncfg-manager create-channel --server-name "$RHN_PARENT" "$CHANNEL_LABEL" + fi + rhncfg-manager update --server-name "$RHN_PARENT" \ + --channel="$CHANNEL_LABEL" \ + $HTTPDCONFD_DIR/ssl.conf \ + $RHNCONF_DIR/rhn.conf \ + $RHNCONF_DIR/cluster.ini \ + $SQUID_DIR/squid.conf \ + $HTTPDCONFD_DIR/cobbler-proxy.conf \ + $HTTPDCONF_DIR/httpd.conf \ + $JABBERD_DIR/c2s.xml \ + $JABBERD_DIR/sm.xml fi echo "Enabling Spacewalk Proxy." if [ $ENABLE_SCOUT -ne 0 ]; then - MonitoringScout="MonitoringScout" + MonitoringScout="MonitoringScout" fi for service in squid httpd jabberd $MonitoringScout; do - if [ -x /usr/bin/systemctl ] ; then - /usr/bin/systemctl enable $service - else - /sbin/chkconfig --add $service - /sbin/chkconfig --level 345 $service on - fi + if [ -x /usr/bin/systemctl ] ; then + /usr/bin/systemctl enable $service + else + /sbin/chkconfig --add $service + /sbin/chkconfig --level 345 $service on + fi done # default is 1 @@ -592,6 +592,6 @@ START_SERVICES=$(yes_no ${START_SERVICES:-1}) if [ "$START_SERVICES" = "1" ]; then /usr/sbin/rhn-proxy restart else - echo Skipping start of services. - echo Use "/usr/sbin/rhn-proxy start" to manualy start proxy. + echo Skipping start of services. + echo Use "/usr/sbin/rhn-proxy start" to manualy start proxy. fi

1 0

Changes to 'refs/tags/rhnlib-2.5.68-1'
by Michael Mraka 04 Oct '13

04 Oct '13

Tag 'rhnlib-2.5.68-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-04 10:52 +0000 Tagging package [rhnlib] version [2.5.68-1] in directory [client/rhel/rhnlib/]. Changes since spacewalk-backend-2.1.26-1: Michael Mraka (1): Automatic commit of package [rhnlib] release [2.5.68-1]. --- client/rhel/rhnlib/rhnlib.spec | 5 ++++- rel-eng/packages/rhnlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Michael Mraka 04 Oct '13

04 Oct '13

client/rhel/rhnlib/rhnlib.spec | 5 ++++- rel-eng/packages/rhnlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f4bfa00c110e8247248ba8cce5722fbf0566fe84 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 12:52:53 2013 +0200 Automatic commit of package [rhnlib] release [2.5.68-1]. diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec index 0ee231d..9389ee6 100644 --- a/client/rhel/rhnlib/rhnlib.spec +++ b/client/rhel/rhnlib/rhnlib.spec @@ -4,7 +4,7 @@ Summary: Python libraries for the Spacewalk project Name: rhnlib URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.5.67 +Version: 2.5.68 Release: 1%{?dist} Group: Development/Libraries @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.68-1 +- Python: fixed UserDictCase behaviour when key is not found + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.67-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib index a712de7..473a74f 100644 --- a/rel-eng/packages/rhnlib +++ b/rel-eng/packages/rhnlib @@ -1 +1 @@ -2.5.67-1 client/rhel/rhnlib/ +2.5.68-1 client/rhel/rhnlib/

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.26-1'
by Michael Mraka 04 Oct '13

04 Oct '13

Tag 'spacewalk-backend-2.1.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-04 10:51 +0000 Tagging package [spacewalk-backend] version [2.1.26-1] in directory [backend/]. Changes since spacewalk-java-2.1.52-1: Flavio Castelli (6): Fixed script which runs python PostgreSQL tests Python db tests: moved connection settings to dedicated file Python pgsql driver: handled ProgrammingError exceptions Fixed errors inside of the python pgsql test suite. Python: fixed UserDictCase behaviour when key is not found Python pgsql db tests: fix broken test Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [2.1.26-1]. Milan Zazrivec (1): fix typo in a comment Stephen Herr (2): 1006182 - Make ISS Master and Slave tabs less confusing 1006127 - Make Search button translatable --- backend/server/rhnSQL/driver_postgresql.py | 2 backend/spacewalk-backend.spec | 9 +++- backend/test/db_settings.ini | 5 ++ backend/test/non-unit/server/rhnSQL/dbtests.py | 7 ++- backend/test/runtests-postgresql.py | 21 ++++++---- client/rhel/rhnlib/rhn/UserDictCase.py | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 - java/code/webapp/WEB-INF/includes/header.jsp | 2 rel-eng/packages/spacewalk-backend | 2 spacecmd/src/lib/utils.py | 2 10 files changed, 38 insertions(+), 18 deletions(-) ---

1 0

7 commits - backend/server backend/spacewalk-backend.spec backend/test client/rhel rel-eng/packages
by Michael Mraka 04 Oct '13

04 Oct '13

backend/server/rhnSQL/driver_postgresql.py | 2 ++ backend/spacewalk-backend.spec | 9 ++++++++- backend/test/db_settings.ini | 5 +++++ backend/test/non-unit/server/rhnSQL/dbtests.py | 7 +++++-- backend/test/runtests-postgresql.py | 21 +++++++++++++-------- client/rhel/rhnlib/rhn/UserDictCase.py | 2 -- rel-eng/packages/spacewalk-backend | 2 +- 7 files changed, 34 insertions(+), 14 deletions(-) New commits: commit b78f797a86ce3dc62eee914aeece5550a4208ea7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 12:51:41 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.26-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 5938859..30dbcba 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.25 +Version: 2.1.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,13 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 +- Python pgsql db tests: fix broken test +- Fixed errors inside of the python pgsql test suite. +- Python pgsql driver: handled ProgrammingError exceptions +- Python db tests: moved connection settings to dedicated file +- Fixed script which runs python PostgreSQL tests + * Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1 - 923338 - replace application code with database lookup to prevent conflicting inserts diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 7bfb0f0..766160c 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.25-1 backend/ +2.1.26-1 backend/ commit a5d90e2dad95fcf69464504a2b21bd053cd8b263 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:06 2013 +0200 Python pgsql db tests: fix broken test The psycopg2 library raises a `KeyError` when a some of the named parameters of a prepared statement are not given. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index 32f722e..ff51148 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -66,7 +66,7 @@ class RhnSQLDatabaseTests(unittest.TestCase): query = "INSERT INTO %s(id, name) VALUES(:id, :name)" % \ self.temp_table cursor = rhnSQL.prepare(query) - self.assertRaises(sql_base.SQLError, cursor.execute, name="Blah") + self.assertRaises(KeyError, cursor.execute, name="Blah") def test_statement_prepare_error(self): rhnSQL.transaction("test_statement_prepare_error") commit 251005196b02b18afd9b1215e8b6c0cc78b5d4d8 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:05 2013 +0200 Python: fixed UserDictCase behaviour when key is not found The `UserDictCase` class is a dictionary with case insensitive keys. Since it's inherited from `UserDict` it can be passed to method/functions expecting a "classic" python dictionary. Unfortunately `UserDictCase` behaved in a different way when the specified key was not found: rather than raising a `KeyError` exception it just returned `None`. That broke duck typing in some places where a `KeyError` was expected and it also hid errors in other parts of the code (because no exception was being raised). This commit ensures `UserDictCase` has the same behaviour of python's dictionary. The change could break some parts of the code which took this bug as a feature. The python unit tests under 'backend/test' and 'backend/satellite_tools' are still passing. diff --git a/client/rhel/rhnlib/rhn/UserDictCase.py b/client/rhel/rhnlib/rhn/UserDictCase.py index cb55674..c4b8dd6 100644 --- a/client/rhel/rhnlib/rhn/UserDictCase.py +++ b/client/rhel/rhnlib/rhn/UserDictCase.py @@ -41,8 +41,6 @@ class UserDictCase(UserDict): def __getitem__(self, key): key = self.__lower_string(key) - if not self.data.has_key(key): - return None return self.data[key] get = __getitem__ commit 3dc37f6101ff683cffe54959ff08095bcad87d11 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:04 2013 +0200 Fixed errors inside of the python pgsql test suite. Wrapped the 'test_statement_prepare_error' test inside of a transaction, that leaves the database in a clean state after the `rhnSQL.SQLStatementPrepareError` exception is raised. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index 1be2c77..32f722e 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -69,11 +69,14 @@ class RhnSQLDatabaseTests(unittest.TestCase): self.assertRaises(sql_base.SQLError, cursor.execute, name="Blah") def test_statement_prepare_error(self): + rhnSQL.transaction("test_statement_prepare_error") + query = "aaa bbb ccc" cursor = rhnSQL.prepare(query) self.assertRaises(rhnSQL.SQLStatementPrepareError, cursor.execute) - rhnSQL.rollback() + + rhnSQL.rollback("test_statement_prepare_error") def test_execute_bindbyname_extra_params_passed(self): query = "SELECT * FROM %s WHERE id = :id" % self.temp_table commit ae7c7733859b5db8e0a659fa5c9ee73764b7ae87 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:03 2013 +0200 Python pgsql driver: handled ProgrammingError exceptions Handled psycopg2.ProgramminError exceptions inside of the python pgsql driver. Raise them as sql_base.SQLStatementPrepareError. This is commit fixes the 'test_statement_prepare_error' test. diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index d467dca..c284ca0 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -277,6 +277,8 @@ class Cursor(sql_base.Cursor): if m: error_code = int(m.group(1)) raise sql_base.SQLSchemaError(error_code, e.pgerror, e) + except psycopg2.ProgrammingError, e: + raise sql_base.SQLStatementPrepareError(self.dbh, e.pgerror, self.sql) return retval def _execute_(self, args, kwargs): commit f2e0d4ccb44cef5cc6c9807f145e20cd161ffc06 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:02 2013 +0200 Python db tests: moved connection settings to dedicated file Moved PostgreSQL connection settings into a dedicated configuration file. This makes easier to use different connection parameters since it's no longer needed to change the python source code. diff --git a/backend/test/db_settings.ini b/backend/test/db_settings.ini new file mode 100644 index 0000000..10e417f --- /dev/null +++ b/backend/test/db_settings.ini @@ -0,0 +1,5 @@ +[postgresql] +host: localhost +user: dgoodwin +password: spacewalk +database: spacewalk diff --git a/backend/test/runtests-postgresql.py b/backend/test/runtests-postgresql.py index 427c2f7..0a10ec7 100755 --- a/backend/test/runtests-postgresql.py +++ b/backend/test/runtests-postgresql.py @@ -23,6 +23,7 @@ import os import sys import unittest +from ConfigParser import ConfigParser from spacewalk.server import rhnSQL # Import all test modules here: @@ -32,10 +33,13 @@ sys.path.insert( ) import dbtests -PG_HOST = "localhost" -PG_USER = "dgoodwin" -PG_PASSWORD = "spacewalk" -PG_DATABASE = "spacewalk" +config = ConfigParser() +config.read(os.path.dirname(os.path.abspath(__file__)) + "/db_settings.ini") + +PG_HOST = config.get('postgresql', 'host') +PG_USER = config.get('postgresql', 'user') +PG_PASSWORD= config.get('postgresql', 'password') +PG_DATABASE = config.get('postgresql', 'database') rhnSQL.initDB(backend="postgresql", host=PG_HOST, username=PG_USER, password=PG_PASSWORD, database=PG_DATABASE) commit ef5e6e585b003426e392dc34c11270df5d007363 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:01 2013 +0200 Fixed script which runs python PostgreSQL tests The script which starts the python PostgreSQL tests was broken because it didn't find some required resources, plus it looked for files/directories which are no longer available. diff --git a/backend/test/runtests-postgresql.py b/backend/test/runtests-postgresql.py index 94426f6..427c2f7 100755 --- a/backend/test/runtests-postgresql.py +++ b/backend/test/runtests-postgresql.py @@ -19,16 +19,17 @@ Non-pure tests requiring connectivity to a PostgreSQL server configured below. """ +import os import sys import unittest -sys.path.insert(0, '../') -sys.path.insert(0, './suites/') -sys.path.insert(0, '../../client/rhel/rhnlib') - from spacewalk.server import rhnSQL # Import all test modules here: +sys.path.insert( + 0, + os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../non-unit/server/rhnSQL/")) +) import dbtests PG_HOST = "localhost"

1 0

spacecmd/src
by Milan Zazrivec 04 Oct '13

04 Oct '13

spacecmd/src/lib/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 133d65ab7292b600e0ec4df212d6ad6966149e82 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Oct 4 11:39:03 2013 +0200 fix typo in a comment diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py index 7fc85b9..453bdb1 100644 --- a/spacecmd/src/lib/utils.py +++ b/spacecmd/src/lib/utils.py @@ -226,7 +226,7 @@ def prompt_user(prompt, noblank = False, multiline = False): return userinput -# parse time input from the userand return xmlrpclib.DateTime +# parse time input from the user and return xmlrpclib.DateTime def parse_time_input(userinput = ''): timestamp = None

1 0

java/code
by StephenHerr 03 Oct '13

03 Oct '13

java/code/webapp/WEB-INF/includes/header.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3152dbb684688ed06bd6b958ab58e486d9cc8455 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 3 15:03:44 2013 -0400 1006127 - Make Search button translatable diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 8912101..c6aa967 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -59,7 +59,7 @@ <option value="docs"><bean:message key="header.jsp.documentation"/></option> </select><input type="text" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus"/> <input type="hidden" name="submitted" value="true"/> - <input type="submit" class="button" name="image-1" value="Search" align="top" /></form> + <input type="submit" class="button" name="image-1" value="<bean:message key="button.search"/>" align="top" /></form> </div> </rhn:require>

1 0

java/code
by StephenHerr 03 Oct '13

03 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07d1e597f1529456446f662007bbc0b537cca9c7 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 3 14:30:07 2013 -0400 1006182 - Make ISS Master and Slave tabs less confusing diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 85f5d7f..0a464b9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -20374,7 +20374,7 @@ given channel.</source> <source>ISS Configuration - Master Setup</source> </trans-unit> <trans-unit id="iss.master.jsp.explanation"> - <source>Below are the slaves that are allowed to synchronize content from this @@PRODUCT_NAME@@ instance.</source> + <source>Below are the slaves that are allowed to synchronize content from this master @@PRODUCT_NAME@@ instance.</source> </trans-unit> <trans-unit id="iss.master.jsp.header2"> <source>Known Slave Instances</source> @@ -20428,7 +20428,7 @@ given channel.</source> <source>ISS Configuration - Slave Setup</source> </trans-unit> <trans-unit id="iss.slave.jsp.explanation"> - <source>Below are all the master @@PRODUCT_NAME@@ instances that this @@PRODUCT_NAME@@ instance has ever synchronized content from.</source> + <source>Below are all the master @@PRODUCT_NAME@@ instances that this slave @@PRODUCT_NAME@@ instance has ever synchronized content from.</source> </trans-unit> <trans-unit id="iss.slave.jsp.header2"> <source>Known Master Instances</source>

1 0

Changes to 'refs/tags/spacewalk-java-2.1.52-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacewalk-java-2.1.52-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 13:59 +0000 Tagging package [spacewalk-java] version [2.1.52-1] in directory [java/]. Changes since spacewalk-search-2.1.3-1: Michael Mraka (1): Automatic commit of package [spacewalk-java] release [2.1.52-1]. --- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 02 Oct '13

02 Oct '13

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 27ec7e95b6eb91a4b45ee888fd83b501f216845e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 15:59:48 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.52-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b685668..063aad4 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.51 +Version: 2.1.52 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.52-1 +- 1002590 - unified way how we call rhn-search cleanindex +- Serializers for Taskomatic: log serialization errors +- Added an Ivy dependency needed for tests + * Tue Oct 01 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.51-1 - Refactoring that lets us log serialization errors * Added RhnXmlRpcCustomSerializer base class * Refactored all Serializers to extend diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 53e4724..c84995b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.51-1 java/ +2.1.52-1 java/

1 0

Changes to 'refs/tags/spacewalk-search-2.1.3-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacewalk-search-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 13:59 +0000 Tagging package [spacewalk-search] version [2.1.3-1] in directory [search-server/spacewalk-search/]. Changes since spacecmd-2.1.11-1: Michael Mraka (2): 1002590 - unified way how we call rhn-search cleanindex Automatic commit of package [spacewalk-search] release [2.1.3-1]. --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 12 +++--- rel-eng/packages/spacewalk-search | 2 - search-server/spacewalk-search/spacewalk-search.spec | 13 ++++-- search-server/spacewalk-search/src/config/rhn-search.init | 20 ++++++++++ 19 files changed, 107 insertions(+), 84 deletions(-) ---

1 0

2 commits - java/code rel-eng/packages search-server/spacewalk-search
by Michael Mraka 02 Oct '13

02 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 12 +++--- rel-eng/packages/spacewalk-search | 2 - search-server/spacewalk-search/spacewalk-search.spec | 13 ++++-- search-server/spacewalk-search/src/config/rhn-search.init | 20 ++++++++++ 19 files changed, 107 insertions(+), 84 deletions(-) New commits: commit fbcb642c42eb7175e74e406dcc30a9f92f350e99 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 15:59:12 2013 +0200 Automatic commit of package [spacewalk-search] release [2.1.3-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 4fd027d..a4dd053 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.2-1 search-server/spacewalk-search/ +2.1.3-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 32c3e8c..03ca9f7 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 +- 1002590 - unified way how we call rhn-search cleanindex + * Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 - 1013629 - clean up old help links commit 4c3e294e7883df195c20b7ee9d5b5818e9c06c3d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 14:45:05 2013 +0200 1002590 - unified way how we call rhn-search cleanindex It's been 'service rhn-search cleanindex' on SystemV and '/usr/sbin/rhn-search cleanindex' on systemd. Unified both SystemV and systemd init scripts to be just wrappers which call /usr/sbin/rhn-search. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 39fca95..4b0ed00 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -2794,14 +2794,14 @@ available for this kickstart profile to function properly. <target>কোয়েরি '{0}' পার্স করা যায়নি।</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>অনুসন্ধানের সার্ভারে ইন্ডেক্স ফাইল অনুপস্থিত। ডাটাবেসের মধ্যে তথ্য অনুপস্থিত থাকলে, service rhn-search cleanindex কমান্ড প্রয়োগ করে ইন্ডেক্স পুনরায় নির্মাণ করে rhn-search পুনরায় আরম্ভ করুন</target> + <target>অনুসন্ধানের সার্ভারে ইন্ডেক্স ফাইল অনুপস্থিত। ডাটাবেসের মধ্যে তথ্য অনুপস্থিত থাকলে, /usr/sbin/rhn-search cleanindex কমান্ড প্রয়োগ করে ইন্ডেক্স পুনরায় নির্মাণ করে rhn-search পুনরায় আরম্ভ করুন</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2814,7 +2814,7 @@ available for this kickstart profile to function properly. <target>কোয়েরি '{0}' সঞ্চালন করা যায়নি।</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 0f7973a..6744577 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -2949,24 +2949,24 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann. <target>Konnte Anfrage '{0}' nicht analysieren.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Index-Dateien fehlen auf dem Such-Server. Vorausgesetzt, Daten existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von: service rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> + <target>Index-Dateien fehlen auf dem Such-Server. Vorausgesetzt, Daten existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von: /usr/sbin/rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Index-Dateien fehlten auf dem Such-Server für Ihr Gebietsschema. Die Suchoperation wurde unter Verwendung des standardmäßigen Gebietsschemas durchgeführt. Vorausgesetzt, Daten für Ihr Gebietsschema existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von service rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> + <target>Index-Dateien fehlten auf dem Such-Server für Ihr Gebietsschema. Die Suchoperation wurde unter Verwendung des standardmäßigen Gebietsschemas durchgeführt. Vorausgesetzt, Daten für Ihr Gebietsschema existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von /usr/sbin/rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann. <target>Konnte Anfrage '{0}' nicht ausführen.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer Index und Datenbankeinträge scheinen nicht übereinzustimmen. Bitte führen Sie 'service rhn-search cleanindex' aus.</target> + <target>SearchServer Index und Datenbankeinträge scheinen nicht übereinzustimmen. Bitte führen Sie '/usr/sbin/rhn-search cleanindex' aus.</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index de21eb1..b7c7f17 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -2519,7 +2519,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> @@ -2528,7 +2528,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> @@ -2546,7 +2546,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 5cd62e1..3746877 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -2949,24 +2949,24 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr <target>No se pudo analizar la solicitud '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Los archivos de índice faltan en el servidor de búsqueda. Asumiendo que existen datos en la base de datos, ejecute: service rhn-search cleanindex, para regenerar los índices y luego reinicie rhn-search</target> + <target>Los archivos de índice faltan en el servidor de búsqueda. Asumiendo que existen datos en la base de datos, ejecute: /usr/sbin/rhn-search cleanindex, para regenerar los índices y luego reinicie rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Los archivos de índice faltaban en el servidor de búsqueda. La búsqueda se hizo con la región predeterminada. Asumiendo que existen datos en la base de datos para su región, ejecute: service rhn-search cleanindex, para regenerar los índices, y luego reinicie rhn-search.</target> + <target>Los archivos de índice faltaban en el servidor de búsqueda. La búsqueda se hizo con la región predeterminada. Asumiendo que existen datos en la base de datos para su región, ejecute: /usr/sbin/rhn-search cleanindex, para regenerar los índices, y luego reinicie rhn-search.</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr <target>No se pudo ejecutar la solicitud '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>El índice SearchServer y las entradas de la base de datos no parecen estar sincronizados. Por favor ejecute 'service rhn-search cleanindex'</target> + <target>El índice SearchServer y las entradas de la base de datos no parecen estar sincronizados. Por favor ejecute '/usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index a742d1c..457e089 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -2951,24 +2951,24 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement. <target>Impossible d'analyser la requête "{0}".</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Fichiers d'index manquants du serveur de recherche. En supposant que les données existent dans la bas de données, les index peuvent être régénérés en exécutant : service rhn-search cleanindex, puis redémarrez rhn-search</target> + <target>Fichiers d'index manquants du serveur de recherche. En supposant que les données existent dans la bas de données, les index peuvent être régénérés en exécutant : /usr/sbin/rhn-search cleanindex, puis redémarrez rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Des fichiers d'index sont manquants dans le serveur de recherche de vos paramètres régionaux. L'opération de recherche a été effectuée à l'aide des paramètres régionaux par défaut. Si des données existent dans la base de données de vos paramètres régionaux, les index peuvent être générés à nouveau en exécutant : service rhn-search cleanindex, puis redémarrez rhn-search</target> + <target>Des fichiers d'index sont manquants dans le serveur de recherche de vos paramètres régionaux. L'opération de recherche a été effectuée à l'aide des paramètres régionaux par défaut. Si des données existent dans la base de données de vos paramètres régionaux, les index peuvent être générés à nouveau en exécutant : /usr/sbin/rhn-search cleanindex, puis redémarrez rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2981,11 +2981,11 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement. <target>Impossible d'analyser la requête « {0} ».</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Les entrées de la base de données et de l'index SearchServer ne sont pas synchronisées. Veuillez exécuter « service rhn-search cleanindex »</target> + <target>Les entrées de la base de données et de l'index SearchServer ne sont pas synchronisées. Veuillez exécuter « /usr/sbin/rhn-search cleanindex »</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 6fc087c..caf2deb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>પ્રશ્ન '{0}' નું પદચ્છેદન કરી શક્યા નહિં.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>સૂચક ફાઇલો શોધ-સર્વર માંથી ગુમ થયેલ છે. માહિતી એ ડેટાબેઝમાં હાજર છે તેવુ ધારી રહ્યા છે, અનુક્રમણિકાઓ ચલાવવા દ્દારા પુન:ઉત્પન્ન થઇ શકે છે: service rhn-search cleanindex, પછી rhn-search ને પુન:શરૂ કરો</target> + <target>સૂચક ફાઇલો શોધ-સર્વર માંથી ગુમ થયેલ છે. માહિતી એ ડેટાબેઝમાં હાજર છે તેવુ ધારી રહ્યા છે, અનુક્રમણિકાઓ ચલાવવા દ્દારા પુન:ઉત્પન્ન થઇ શકે છે: /usr/sbin/rhn-search cleanindex, પછી rhn-search ને પુન:શરૂ કરો</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>પ્રશ્ન '{0}' ને ચલાવી શક્યા નહિં.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 15e4689..5cc0623 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>{0} प्रश्न का विश्लेषण नहीं कर सका.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>सूची फाइल खोज सर्वर में अनुपस्थित है. यह मानते हुए कि डेटा डेटाबेस में मौजूद है, सूची को इसे चलाते हुए फिर उत्पन्न किया जा सकता है: service rhn-search cleanindex, then restart rhn-search</target> + <target>सूची फाइल खोज सर्वर में अनुपस्थित है. यह मानते हुए कि डेटा डेटाबेस में मौजूद है, सूची को इसे चलाते हुए फिर उत्पन्न किया जा सकता है: /usr/sbin/rhn-search cleanindex, then restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>'{0}' प्रश्न का निस्पादन नहीं कर सका.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 04c4c5f..9e9df84 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -2948,24 +2948,24 @@ disponibili per un corretto funzionamento di questo profilo kickstart. <target>Impossibile analizzare l'interrogazione '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>File index mancanti dal search-server. Si assume la presenza dei dati nel database, è possibile rigenerare gli indici eseguendo: service rhn-search cleanindex, e successivamente riavviare rhn-search</target> + <target>File index mancanti dal search-server. Si assume la presenza dei dati nel database, è possibile rigenerare gli indici eseguendo: /usr/sbin/rhn-search cleanindex, e successivamente riavviare rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>File index mancanti dal server di ricerca per il tuo locale. Questa operazione di ricerca è stata eseguita usando il locale predefinito. Si assume la presenza dei dati nel database per il tuo locale, è possibile rigenerare gli indici eseguendo: service rhn-search cleanindex, e successivamente riavviare rhn-search</target> + <target>File index mancanti dal server di ricerca per il tuo locale. Questa operazione di ricerca è stata eseguita usando il locale predefinito. Si assume la presenza dei dati nel database per il tuo locale, è possibile rigenerare gli indici eseguendo: /usr/sbin/rhn-search cleanindex, e successivamente riavviare rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2978,11 +2978,11 @@ disponibili per un corretto funzionamento di questo profilo kickstart. <target>Impossibile eseguire l'interrogazione '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>L'indice di SearchServer e le voci del database non sono sincronizzate. Eseguire 'service rhn-search cleanindex'</target> + <target>L'indice di SearchServer e le voci del database non sono sincronizzate. Eseguire '/usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 9addf59..7c969af 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -2949,24 +2949,24 @@ rhn-kickstart* パッケージが利用可能であることを確認します <target>クエリを構文解析できませんでした '{0}'</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>検索サーバーにインデックスファイルがありません。データベースにデータが存在する場合、service rhn-search cleanindex を実行した後に rhn-search を再起動するとインデックスを再生成できます。</target> + <target>検索サーバーにインデックスファイルがありません。データベースにデータが存在する場合、/usr/sbin/rhn-search cleanindex を実行した後に rhn-search を再起動するとインデックスを再生成できます。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>ご利用言語の検索サーバーではインデックスファイルがありませんでした。検索の操作はデフォルト言語を使って行われました。ご利用言語のデータベースにデータが存在している場合は、service rhn-search cleanindex を実行するとインデックスを再生成することができます。再生成後に rhn-search を再開してください。</target> + <target>ご利用言語の検索サーバーではインデックスファイルがありませんでした。検索の操作はデフォルト言語を使って行われました。ご利用言語のデータベースにデータが存在している場合は、/usr/sbin/rhn-search cleanindex を実行するとインデックスを再生成することができます。再生成後に rhn-search を再開してください。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ rhn-kickstart* パッケージが利用可能であることを確認します <target>クエリ '{0}' を実行できませんでした。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer インデックスおよびデータベースエントリが同期されていないようです。'service rhn-search cleanindex' を実行してください。</target> + <target>SearchServer インデックスおよびデータベースエントリが同期されていないようです。'/usr/sbin/rhn-search cleanindex' を実行してください。</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 7bdffae..3902aa8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -2949,24 +2949,24 @@ rhn-tools 채널의 satellite 동기화를 요청하고 다시 시도해야 <target>'{0}' 질의를 구문 분석할 수 없습니다. </target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>검색 서버에 색인 파일이 없습니다. 데이터베이스에 데이터가 있다고 가정할 경우, service rhn-search cleanindex를 실행하여 색인을 다시 생성한 후 rhn-search를 재시작할 수 있습니다. </target> + <target>검색 서버에 색인 파일이 없습니다. 데이터베이스에 데이터가 있다고 가정할 경우, /usr/sbin/rhn-search cleanindex를 실행하여 색인을 다시 생성한 후 rhn-search를 재시작할 수 있습니다. </target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>해당 로케일의 검색 서버에 색인 파일이 누락되어 있습니다. 검색 작업은 디폴트 로케일을 사용하여 실행됩니다. 해당 로케일의 데이터베이스에 데이터가 있을 경우 service rhn-search cleanindex를 실행하면 색인 파일을 다시 생성할 수 있습니다. 그 후 rhn-search를 다시 시작합니다</target> + <target>해당 로케일의 검색 서버에 색인 파일이 누락되어 있습니다. 검색 작업은 디폴트 로케일을 사용하여 실행됩니다. 해당 로케일의 데이터베이스에 데이터가 있을 경우 /usr/sbin/rhn-search cleanindex를 실행하면 색인 파일을 다시 생성할 수 있습니다. 그 후 rhn-search를 다시 시작합니다</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ rhn-tools 채널의 satellite 동기화를 요청하고 다시 시도해야 <target>'{0}' 질의를 실행할 수 없습니다. </target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>검색 서버 인덱스와 데이터베이스 항목이 동기화되어 있지 않은 것 같습니다. 'service rhn-search cleanindex'를 실행하십시오</target> + <target>검색 서버 인덱스와 데이터베이스 항목이 동기화되어 있지 않은 것 같습니다. '/usr/sbin/rhn-search cleanindex'를 실행하십시오</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index b3a32fb..b94331a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -2789,14 +2789,14 @@ available for this kickstart profile to function properly. <target>'{0}' ਬੇਨਤੀ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>ਖੋਜ-ਸਰਵਰ ਤੋਂ ਸੂਚੀ ਫਾਇਲਾਂ ਗੈਰ-ਮੌਜੂਦ ਹਨ। ਇਹ ਮੰਨ ਕੇ ਕਿ ਡਾਟਾਬੇਸ ਵਿੱਚ ਡਾਟਾ ਮੌਜੂਦ ਹੈ, ਸੂਚੀਆਂ ਨੂੰ ਇਸ ਕਮਾਂਡ ਨਾਲ ਮੁੜ-ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: service rhn-search cleanindex, ਫਿਰ restart rhn-search</target> + <target>ਖੋਜ-ਸਰਵਰ ਤੋਂ ਸੂਚੀ ਫਾਇਲਾਂ ਗੈਰ-ਮੌਜੂਦ ਹਨ। ਇਹ ਮੰਨ ਕੇ ਕਿ ਡਾਟਾਬੇਸ ਵਿੱਚ ਡਾਟਾ ਮੌਜੂਦ ਹੈ, ਸੂਚੀਆਂ ਨੂੰ ਇਸ ਕਮਾਂਡ ਨਾਲ ਮੁੜ-ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: /usr/sbin/rhn-search cleanindex, ਫਿਰ restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2809,7 +2809,7 @@ available for this kickstart profile to function properly. <target>'{0}' ਬੇਨਤੀ ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਿਆ।</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index 99df77d..37b89c1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -2938,24 +2938,24 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li> <target>Não foi possível analisar a consulta {0}.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Os arquivos de Índice estão faltando na procura de servidor. Se a data existe no banco de dados, os índices podem ser gerados novamente, rodando: service rhn-search cleanindex, e depois reiniciar o rhn-search</target> + <target>Os arquivos de Índice estão faltando na procura de servidor. Se a data existe no banco de dados, os índices podem ser gerados novamente, rodando: /usr/sbin/rhn-search cleanindex, e depois reiniciar o rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Os arquivos de Índice estão faltando na procura de servidor para seu idioma. A operação de busca foi realizada utilizando o idioma padrão. Se a data existe no banco de dados em seu idioma, os índices podem ser gerados novamente, rodando: service rhn-search cleanindex, e depois reiniciar o rhn-search</target> + <target>Os arquivos de Índice estão faltando na procura de servidor para seu idioma. A operação de busca foi realizada utilizando o idioma padrão. Se a data existe no banco de dados em seu idioma, os índices podem ser gerados novamente, rodando: /usr/sbin/rhn-search cleanindex, e depois reiniciar o rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2968,11 +2968,11 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li> <target>Não foi possível executar a consulta '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Índice SearchServer e entradas do banco de dados parecem estar fora do sync. Por favor rode ' service rhn-search cleanindex'</target> + <target>Índice SearchServer e entradas do banco de dados parecem estar fora do sync. Por favor rode ' /usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index aa071ad..5ef9e97 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -2945,24 +2945,24 @@ available for this kickstart profile to function properly. <target>Невозможно разобрать запрос "{0}"</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>На сервере поиска отсутствуют индексные файлы. Если база данных содержит данные, индексы можно пересоздать, выполнив команду service rhn-search cleanindex и перезапустив rhn-search</target> + <target>На сервере поиска отсутствуют индексные файлы. Если база данных содержит данные, индексы можно пересоздать, выполнив команду /usr/sbin/rhn-search cleanindex и перезапустив rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Сервер поиска не содержит индексные файлы для выбранного языка. Для выполнения поиска был выбран стандартный язык. Если база данных содержит данные для интересующего языка, индексы можно пересоздать, выполнив команду service rhn-search cleanindex и перезапустив rhn-search</target> + <target>Сервер поиска не содержит индексные файлы для выбранного языка. Для выполнения поиска был выбран стандартный язык. Если база данных содержит данные для интересующего языка, индексы можно пересоздать, выполнив команду /usr/sbin/rhn-search cleanindex и перезапустив rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2975,11 +2975,11 @@ available for this kickstart profile to function properly. <target>Не удалось выполнить запрос «{0}».</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Рекомендуется синхронизировать индекс SearchServer с базой данных: «service rhn-search cleanindex»</target> + <target>Рекомендуется синхронизировать индекс SearchServer с базой данных: «/usr/sbin/rhn-search cleanindex»</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index cdbb89a..4c30fe6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>வினாவை திருத்த முடியவில்லை '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>சுட்டி கோப்புகள் ணேவையக தேடலில் இருந்து விடுபடுகிறது. தரவுத்தளத்திலிருந்து தரவுகளை பெற்றுள்ளது, சுட்டி மீண்டும்துவங்கி இயங்குகிறது: service rhn-search cleanindex, பின்பு மீண்டும் துவக்கி rhn-தேடவும்</target> + <target>சுட்டி கோப்புகள் ணேவையக தேடலில் இருந்து விடுபடுகிறது. தரவுத்தளத்திலிருந்து தரவுகளை பெற்றுள்ளது, சுட்டி மீண்டும்துவங்கி இயங்குகிறது: /usr/sbin/rhn-search cleanindex, பின்பு மீண்டும் துவக்கி rhn-தேடவும்</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>வினாவை திருத்த முடியவில்லை '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index bbef06b..41faa5c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -2949,24 +2949,24 @@ available for this kickstart profile to function properly. <target>不能解释 '{0}' 查询。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜索服务器中缺少索引文件。假设数据库中存在数据，可运行以下步骤重新生成索引： service rhn-search cleanindexx，然后 restart rhn-search</target> + <target>搜索服务器中缺少索引文件。假设数据库中存在数据，可运行以下步骤重新生成索引： /usr/sbin/rhn-search cleanindexx，然后 restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜索服务器中缺少您所在区域的索引文件。使用默认区域执行搜索操作。假设数据库中存在您所在区域的数据，可运行 service rhn-search cleanindex，然后 restart rhn-search 重新生成索引。</target> + <target>搜索服务器中缺少您所在区域的索引文件。使用默认区域执行搜索操作。假设数据库中存在您所在区域的数据，可运行 /usr/sbin/rhn-search cleanindex，然后 restart rhn-search 重新生成索引。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ available for this kickstart profile to function properly. <target>不能执行查询 '{0}'。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer 索引和数据库条目不同步。请运行 'service rhn-search cleanindex'。</target> + <target>SearchServer 索引和数据库条目不同步。请运行 '/usr/sbin/rhn-search cleanindex'。</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index 8ea5233..ea4c9b0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -2949,24 +2949,24 @@ available for this kickstart profile to function properly. <target>無法解析 '{0}' 查詢。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜尋伺服器的索引檔案遺失。假設資料儲存在資料庫中的話，索引便能透過執行 service rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> + <target>搜尋伺服器的索引檔案遺失。假設資料儲存在資料庫中的話，索引便能透過執行 /usr/sbin/rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>您語言區域的搜尋伺服器索引檔案遺失。搜尋作業乃透過使用預設的語言區域來進行的。假設您語言區域的資料若存在資料庫中的話，索引便能透過執行 service rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> + <target>您語言區域的搜尋伺服器索引檔案遺失。搜尋作業乃透過使用預設的語言區域來進行的。假設您語言區域的資料若存在資料庫中的話，索引便能透過執行 /usr/sbin/rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ available for this kickstart profile to function properly. <target>無法執行查詢 '{0}'。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer 索引和資料庫項目未同步。請執行「service rhn-search cleanindex」</target> + <target>SearchServer 索引和資料庫項目未同步。請執行「/usr/sbin/rhn-search cleanindex」</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 209f918..32c3e8c 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -92,8 +92,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes ln -s -f %{_prefix}/share/rhn/search/indexes/docs $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes/docs -%if 0%{?fedora} install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} +%if 0%{?fedora} install -d -m 755 $RPM_BUILD_ROOT%{_unitdir} %else install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} @@ -106,11 +106,11 @@ install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rh # using install -m does not preserve the symlinks cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search -%if 0%{?fedora} install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_sbindir} +%if 0%{?fedora} install -p -m 755 src/config/rhn-search.service $RPM_BUILD_ROOT%{_unitdir} %else -install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir} +install -p -m 755 src/config/rhn-search.init $RPM_BUILD_ROOT%{_initrddir}/rhn-search %endif ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf @@ -167,8 +167,8 @@ fi %files %attr(755, root, root) %{_var}/log/rhn/search %{_prefix}/share/rhn/search/lib/* -%if 0%{?fedora} %attr(755, root, root) %{_sbindir}/rhn-search +%if 0%{?fedora} %attr(755, root, root) %{_unitdir}/rhn-search.service %else %attr(755, root, root) %{_initrddir}/rhn-search diff --git a/search-server/spacewalk-search/src/config/rhn-search.init b/search-server/spacewalk-search/src/config/rhn-search.init new file mode 100644 index 0000000..914d39c --- /dev/null +++ b/search-server/spacewalk-search/src/config/rhn-search.init @@ -0,0 +1,20 @@ +#! /bin/sh +# +# rhn-search This shell script takes care of starting and stopping +# the java rhn-search server. +# +# chkconfig: - 94 12 +# description: This is Spacewalk search engine. +# +### BEGIN INIT INFO +# Provides: rhn-search +# Required-Start: $local_fs $network satellite-httpd +# Required-Stop: $local_fs $network satellite-httpd +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: This is Spacewalk search engine. +# Description: This is Spacewalk search engine. +### END INIT INFO + +exec /usr/sbin/rhn-search "$@" +

1 0

Changes to 'refs/tags/spacecmd-2.1.11-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacecmd-2.1.11-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 11:58 +0000 Tagging package [spacecmd] version [2.1.11-1] in directory [spacecmd/]. Changes since spacewalk-backend-2.1.25-1: David Juran (1): spacecmd: Fix session validation Michael Mraka (1): Automatic commit of package [spacecmd] release [2.1.11-1]. Silvio Moioli (1): Serializers for Taskomatic: log serialization errors --- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java | 10 +++++----- rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/misc.py | 2 +- 7 files changed, 26 insertions(+), 23 deletions(-) ---

1 0

2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Michael Mraka 02 Oct '13

02 Oct '13

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/misc.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 9e80ddcd08c8b67a1cd013f118135badf5b1496c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 13:58:12 2013 +0200 Automatic commit of package [spacecmd] release [2.1.11-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index d50effe..f7438dd 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.10-1 spacecmd/ +2.1.11-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index d98321c..75e2158 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.10 +Version: 2.1.11 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 +- spacecmd: Fix session validation + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1 - removed trailing whitespaces commit 524dfd5bd855b90f174b57238bcca1df76b24fce Author: David Juran <djuran(a)redhat.com> Date: Tue Oct 1 15:26:02 2013 +0200 spacecmd: Fix session validation Turns out that although spacewalk (Red Hat Satellite 5.5) takes a session argument for the api.getApiNamespaces() API call, this session is not validated, i.e. the call will succeed no matter if the session is valid or not. Which makes this particular call quite a bad choice validating the session... Trying now to use user.listAssignableRoles instead diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py index dff6fb3..f2769d5 100644 --- a/spacecmd/src/lib/misc.py +++ b/spacecmd/src/lib/misc.py @@ -307,7 +307,7 @@ def do_login(self, args): try: logging.debug('Using cached credentials from %s' % session_file) - self.client.api.getApiNamespaces(self.session) + self.client.user.listAssignableRoles(self.session) except: logging.warning('Cached credentials are invalid') self.current_user = ''

1 0

java/code
by Silvio Moioli 02 Oct '13

02 Oct '13

java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java | 10 +++++----- java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) New commits: commit c29e224dcffdfcfc51d5108a3f0ac096b75fecb1 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 2 10:57:11 2013 +0200 Serializers for Taskomatic: log serialization errors diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java index 6a0f459..68be48d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java +++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.taskomatic.serializer; +import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.taskomatic.TaskoBunch; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * TaskoBunchSerializer * @version $Rev$ */ -public class TaskoBunchSerializer implements XmlRpcCustomSerializer { +public class TaskoBunchSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -41,12 +41,12 @@ public class TaskoBunchSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + public void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { TaskoBunch bunch = (TaskoBunch) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", bunch.getName()); helper.add("description", bunch.getDescription()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java index 0ae373a..4a8ae6b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java +++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.taskomatic.serializer; +import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.taskomatic.TaskoRun; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * TaskoRunSerializer * @version $Rev$ */ -public class TaskoRunSerializer implements XmlRpcCustomSerializer { +public class TaskoRunSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -41,12 +41,12 @@ public class TaskoRunSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + public void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { TaskoRun run = (TaskoRun) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", run.getId()); helper.add("schedule_id", run.getScheduleId()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java index 0c57d53..fd87ee1 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java +++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.taskomatic.serializer; +import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.taskomatic.TaskoSchedule; @@ -22,7 +23,6 @@ import java.io.Writer; import java.util.HashMap; import java.util.Map; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -31,7 +31,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * TaskoScheduleSerializer * @version $Rev$ */ -public class TaskoScheduleSerializer implements XmlRpcCustomSerializer { +public class TaskoScheduleSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -43,12 +43,12 @@ public class TaskoScheduleSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + public void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { TaskoSchedule schedule = (TaskoSchedule) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", schedule.getId()); helper.add("job_label", schedule.getJobLabel()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java index 4eea009..b10b848 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java +++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.taskomatic.serializer; +import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.taskomatic.TaskoTemplate; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * TaskoTemplateSerializer * @version $Rev$ */ -public class TaskoTemplateSerializer implements XmlRpcCustomSerializer { +public class TaskoTemplateSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -41,12 +41,12 @@ public class TaskoTemplateSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + public void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { TaskoTemplate template = (TaskoTemplate) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", template.getTask().getName()); helper.writeTo(output);

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.25-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacewalk-backend-2.1.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 09:23 +0000 Tagging package [spacewalk-backend] version [2.1.25-1] in directory [backend/]. Changes since spacewalk-java-2.1.51-1: Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [2.1.25-1]. Silvio Moioli (1): Added an Ivy dependency needed for tests Tomas Kasparek (1): fixing indentation - expandtabs vs noexpandtab --- backend/spacewalk-backend.spec | 6 +++++- java/ivy.xml | 1 + rel-eng/packages/spacewalk-backend | 2 +- reporting/reports/data/inventory | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 02 Oct '13

02 Oct '13

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit abc2b96640358ef8399de8b425724c60fd59d071 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 11:23:37 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.25-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index debc811..5938859 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.24 +Version: 2.1.25 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1 +- 923338 - replace application code with database lookup to prevent conflicting + inserts + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.24-1 - make pylint 1.0 happy about map/filter on lambda diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 85991cd..7bfb0f0 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.24-1 backend/ +2.1.25-1 backend/

1 0

java/ivy.xml
by Silvio Moioli 02 Oct '13

02 Oct '13

java/ivy.xml | 1 + 1 file changed, 1 insertion(+) New commits: commit 74b01fa48661ca307154a9351b9702a3ff8a9a2b Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 2 09:25:11 2013 +0200 Added an Ivy dependency needed for tests diff --git a/java/ivy.xml b/java/ivy.xml index 73aec4f..eb0f698 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -19,6 +19,7 @@ <dependency org="redhat" name="commons-discovery" rev="0.2" /> <dependency org="redhat" name="commons-el" rev="1.0" /> <dependency org="redhat" name="commons-httpclient" rev="3.0" /> + <dependency org="redhat" name="commons-io" rev="1.3.2" /> <dependency org="redhat" name="commons-lang" rev="2.1" /> <dependency org="redhat" name="commons-logging" rev="1.0.4" /> <dependency org="redhat" name="commons-validator" rev="1.1.4" />

1 0

reporting/reports
by Tomáš Kašpárek 02 Oct '13

02 Oct '13

reporting/reports/data/inventory | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4a73dc7bb914c51c1c4fd79e8d0d9f534a72e76c Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Oct 2 08:23:58 2013 +0200 fixing indentation - expandtabs vs noexpandtab diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory index 1bdc406..6165e96 100644 --- a/reporting/reports/data/inventory +++ b/reporting/reports/data/inventory @@ -29,7 +29,7 @@ columns: virtual_host:i System identifier of host, if system is a guest architecture Architecture of the system is_virtualized Information whether system is virtualized or not - virt_type System virtualization type + virt_type System virtualization type osad_status OSAD status hardware Hardware information @@ -79,7 +79,7 @@ sql: ) as architecture, (case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else 'Yes' end ) as is_virtualized, - (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type, + (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type, (nvl((select rhnpushclientstate.label from rhnpushclient join rhnpushclientstate on rhnpushclient.state_id=rhnpushclientstate.id where rhnpushclient.server_id=rhnServer.id), 'Not enabled')) as osad_status, get_hw_info_as_clob(rhnserver.id, '; ') as hardware from rhnserver left outer join

1 0

Changes to 'refs/tags/spacewalk-java-2.1.51-1'
by Grant Gainey 01 Oct '13

01 Oct '13

Tag 'spacewalk-java-2.1.51-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-10-01 20:51 +0000 Tagging package [spacewalk-java] version [2.1.51-1] in directory [java/]. Changes since spacewalk-reports-2.1.13-1: Grant Gainey (2): Refactoring that lets us log serialization errors Automatic commit of package [spacewalk-java] release [2.1.51-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java | 23 +--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java | 8 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java | 29 ++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 16 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java | 16 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 21 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java | 57 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java | 20 --- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 25 ++-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java | 23 +--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 21 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java | 9 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java | 9 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java | 9 - java/spacewalk-java.spec | 8 + rel-eng/packages/spacewalk-java | 2 88 files changed, 601 insertions(+), 641 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Grant Gainey 01 Oct '13

01 Oct '13

java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 2bf94b2eb5bb31d04356b6e57fdf64f72874bcd0 Author: Grant Gainey <ggainey(a)redhat.com> Date: Tue Oct 1 16:51:53 2013 -0400 Automatic commit of package [spacewalk-java] release [2.1.51-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e2cd294..b685668 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.50 +Version: 2.1.51 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Oct 01 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.51-1 +- Refactoring that lets us log serialization errors * Added + RhnXmlRpcCustomSerializer base class * Refactored all Serializers to extend + from RhnXmlRpcCustomSerializer * Refactored SerializerFactory to be + less...clever + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.50-1 - removed trailing whitespaces diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b46ce36..53e4724 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.50-1 java/ +2.1.51-1 java/

1 0

java/code
by Grant Gainey 01 Oct '13

01 Oct '13

java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java | 23 +--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java | 8 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java | 29 ++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 16 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java | 16 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 21 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java | 17 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java | 57 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java | 20 --- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 25 ++-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java | 23 +--- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java | 15 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 21 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java | 11 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java | 13 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java | 9 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java | 9 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java | 9 - 86 files changed, 593 insertions(+), 639 deletions(-) New commits: commit 1fddc7359c54dcfae38505c55a6074144685e2f5 Author: Grant Gainey <ggainey(a)redhat.com> Date: Tue Oct 1 16:49:40 2013 -0400 Refactoring that lets us log serialization errors * Added RhnXmlRpcCustomSerializer base class * Refactored all Serializers to extend from RhnXmlRpcCustomSerializer * Refactored SerializerFactory to be less...clever diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java index 50d4e15..9e25c09 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.token.ActivationKey; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ActivationKeySerializer @@ -49,7 +48,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("boolean", "disabled") * #struct_end() */ -public class ActivationKeySerializer implements XmlRpcCustomSerializer { +public class ActivationKeySerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -59,10 +58,10 @@ public class ActivationKeySerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ActivationKey key = (ActivationKey)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); TokenSerializer.populateTokenInfo(key.getToken(), helper); helper.add("key", key.getKey()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java index c0bf754..a7550fb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.Writer; import java.math.BigDecimal; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -31,7 +30,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * @xmlrpc.doc * #param ("int") */ -public class BigDecimalSerializer implements XmlRpcCustomSerializer { +public class BigDecimalSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -43,8 +42,8 @@ public class BigDecimalSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { BigDecimal bd = (BigDecimal) value; output.write("<i4>"); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java index bb31f69..b7c4dd4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.channel.ChannelArch; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.channel.ChannelArch; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ChannelArchSerializer serializes ChannelArch object to XMLRPC. * @version $Rev$ @@ -33,7 +32,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "label") * #struct_end() */ -public class ChannelArchSerializer implements XmlRpcCustomSerializer { +public class ChannelArchSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -42,11 +41,11 @@ public class ChannelArchSerializer implements XmlRpcCustomSerializer { /** {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ChannelArch arch = (ChannelArch) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", arch.getName()); helper.add("label", arch.getLabel()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java index 8c0e398..9a4bf4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java @@ -14,19 +14,18 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ChannelFamilySystem; -import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; import java.util.ArrayList; import java.util.List; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ChannelFamilySystem; +import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ChannelArchSerializer serializes ChannelArch object to XMLRPC. * @version $Rev$ @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #array_single("int", "systems") * #struct_end() */ -public class ChannelFamilySystemGroupSerializer implements XmlRpcCustomSerializer { +public class ChannelFamilySystemGroupSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -47,12 +46,12 @@ public class ChannelFamilySystemGroupSerializer implements XmlRpcCustomSerialize /** {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ChannelFamilySystemGroup group = (ChannelFamilySystemGroup) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", group.getId()); helper.add("label", group.getLabel()); helper.add("name", group.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java index 083b3ae..54f0459 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ChannelOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ChannelOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * ChannelOverviewSerializer @@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "total_flex") * #struct_end() */ -public class ChannelOverviewSerializer implements XmlRpcCustomSerializer { +public class ChannelOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * @@ -54,9 +53,9 @@ public class ChannelOverviewSerializer implements XmlRpcCustomSerializer { * * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); ChannelOverview group = (ChannelOverview) value; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java index e11e1d1..ad843f5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -68,7 +67,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #struct_end() * */ -public class ChannelSerializer implements XmlRpcCustomSerializer { +public class ChannelSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -80,9 +79,9 @@ public class ChannelSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); Channel c = (Channel) value; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java index a02c695..41af4d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ChannelTreeNode; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ChannelTreeNode; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ChannelTreeNodeSerializer: Converts a ChannelTreeNode object for * representation as an XMLRPC struct. @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "arch_name") * #struct_end() */ -public class ChannelTreeNodeSerializer implements XmlRpcCustomSerializer { +public class ChannelTreeNodeSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,11 +51,11 @@ public class ChannelTreeNodeSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ChannelTreeNode ctn = (ChannelTreeNode)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", ctn.getId()); helper.add("label", ctn.getChannelLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java index bb5446a..fe0f504 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.config.ConfigChannelType; -import com.redhat.rhn.frontend.dto.ConfigChannelDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.config.ConfigChannelType; +import com.redhat.rhn.frontend.dto.ConfigChannelDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigChannelDtoSerializer @@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * $ConfigChannelTypeSerializer * #struct_end() */ -public class ConfigChannelDtoSerializer implements XmlRpcCustomSerializer { +public class ConfigChannelDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -54,10 +53,10 @@ public class ConfigChannelDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigChannelDto dto = (ConfigChannelDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", dto.getId().longValue()); helper.add("label", dto.getLabel()); helper.add("name", dto.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java index 6175757..84982ef 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.config.ConfigChannel; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.config.ConfigChannel; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigurationChannelSerializer @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * $ConfigChannelTypeSerializer * #struct_end() */ -public class ConfigChannelSerializer implements XmlRpcCustomSerializer { +public class ConfigChannelSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} */ @@ -53,10 +52,10 @@ public class ConfigChannelSerializer implements XmlRpcCustomSerializer { * {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigChannel chan = (ConfigChannel) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", chan.getId()); helper.add("label", chan.getLabel()); helper.add("name", chan.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java index 1f27974..53c986b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.config.ConfigChannelType; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.config.ConfigChannelType; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigChannelTypeSerializer @@ -37,15 +36,15 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "priority") * #struct_end() */ -public class ConfigChannelTypeSerializer implements XmlRpcCustomSerializer { +public class ConfigChannelTypeSerializer extends RhnXmlRpcCustomSerializer { /** * * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); ConfigChannelType type = (ConfigChannelType) value; helper.add("id", type.getId()); helper.add("label", type.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java index dc8da45..b0d46bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ConfigFileDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ConfigFileDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigFileDtoSerializer @@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc($date, "last_modified","Last Modified Date") * #struct_end() */ -public class ConfigFileDtoSerializer implements XmlRpcCustomSerializer { +public class ConfigFileDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,12 +50,12 @@ public class ConfigFileDtoSerializer implements XmlRpcCustomSerializer { } /** - * {@inheritDoc}builtInSerializer + * {@inheritDoc}serializer */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigFileDto dto = (ConfigFileDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("type", dto.getType()); helper.add("path", dto.getPath()); helper.add("last_modified", dto.getModified()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java index ebc55ed..cc84a02 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java @@ -15,18 +15,17 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.config.ConfigChannelType; -import com.redhat.rhn.frontend.dto.ConfigFileDto; -import com.redhat.rhn.frontend.dto.ConfigFileNameDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.config.ConfigChannelType; +import com.redhat.rhn.frontend.dto.ConfigFileDto; +import com.redhat.rhn.frontend.dto.ConfigFileNameDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigFileDtoSerializer @@ -49,7 +48,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc($date, "last_modified","Last Modified Date") * #struct_end() */ -public class ConfigFileNameDtoSerializer implements XmlRpcCustomSerializer { +public class ConfigFileNameDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -61,11 +60,11 @@ public class ConfigFileNameDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigFileNameDto dto = (ConfigFileNameDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("type", dto.getConfigFileType()); helper.add("path", dto.getPath()); ConfigChannelType type = diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java index fb4faa1..02816fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.FaultException; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.config.ConfigRevision; -import com.redhat.rhn.domain.config.EncodedConfigRevision; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.codec.binary.Base64; - import java.io.IOException; import java.io.UnsupportedEncodingException; import java.io.Writer; import java.text.DecimalFormat; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.codec.binary.Base64; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.config.ConfigRevision; +import com.redhat.rhn.domain.config.EncodedConfigRevision; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigRevisionSerializer @@ -69,7 +68,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * "Macro end delimiter for a config file. Present for text files only.") * #struct_end() */ -public class ConfigRevisionSerializer implements XmlRpcCustomSerializer { +public class ConfigRevisionSerializer extends RhnXmlRpcCustomSerializer { public static final String CONTENTS = "contents"; public static final String CONTENTS_ENC64 = "contents_enc64"; @@ -97,10 +96,10 @@ public class ConfigRevisionSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigRevision rev = (ConfigRevision) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); if (rev.getConfigFileType() != null) { helper.add(TYPE, rev.getConfigFileType().getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java index 06e5b27..1a736bd 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ConfigSystemDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ConfigSystemDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ConfigSystemDtoSerializer @@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "name") * #struct_end() */ -public class ConfigSystemDtoSerializer implements XmlRpcCustomSerializer { +public class ConfigSystemDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -45,12 +44,12 @@ public class ConfigSystemDtoSerializer implements XmlRpcCustomSerializer { } /** - * {@inheritDoc}builtInSerializer + * {@inheritDoc}serializer */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ConfigSystemDto dto = (ConfigSystemDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", dto.getId()); helper.add("name", dto.getName()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java index a4aba0c..fd115ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -37,7 +36,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #struct_end() * */ -public class ContentSourceFilterSerializer implements XmlRpcCustomSerializer { +public class ContentSourceFilterSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -49,9 +48,9 @@ public class ContentSourceFilterSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); ContentSourceFilter filter = (ContentSourceFilter) value; helper.add("sortOrder", filter.getSortOrder()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java index d13f79f..2032222 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java @@ -17,8 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; - -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -39,7 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #struct_end() * */ -public class ContentSourceSerializer implements XmlRpcCustomSerializer { +public class ContentSourceSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,9 +49,9 @@ public class ContentSourceSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); ContentSource repo = (ContentSource) value; helper.add("id", repo.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java index 7ff30a0..9770162 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.CPU; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.CPU; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * CpuSerializer @@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class CpuSerializer implements XmlRpcCustomSerializer { +public class CpuSerializer extends RhnXmlRpcCustomSerializer { /** * @@ -56,9 +55,9 @@ public class CpuSerializer implements XmlRpcCustomSerializer { * * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); CPU cpu = (CPU) value; helper.add("cache", cpu.getCache()); helper.add("family", cpu.getFamily()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java index 8efee42..1c8ff7a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.CryptoKeyDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.CryptoKeyDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * Serializes instances of {@link com.redhat.rhn.frontend.dto.CryptoKeyDto}. * @@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "type") * #struct_end() */ -public class CryptoKeyDtoSerializer implements XmlRpcCustomSerializer { +public class CryptoKeyDtoSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -43,7 +42,7 @@ public class CryptoKeyDtoSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) + protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) throws XmlRpcException, IOException { if (!(o instanceof CryptoKeyDto)) { throw new XmlRpcException("Object of incorrect type to be serialized. " + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java index 3634c90..85b1334 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * Serializes instances of * {@link com.redhat.rhn.domain.kickstart.crypto.CryptoKey}. @@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "content") * #struct_end() */ -public class CryptoKeySerializer implements XmlRpcCustomSerializer { +public class CryptoKeySerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -45,7 +44,7 @@ public class CryptoKeySerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) + protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) throws XmlRpcException, IOException { if (!(o instanceof CryptoKey)) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java index 0b20fa4..e25ce9e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * CryptoKeyTypeSerializer: Converts a CryptoKeyType object for representation * as an XMLRPC struct. * @version $Rev$ * */ -public class CryptoKeyTypeSerializer implements XmlRpcCustomSerializer { +public class CryptoKeyTypeSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -42,11 +41,11 @@ public class CryptoKeyTypeSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { CryptoKeyType ckt = (CryptoKeyType)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", ckt.getId()); helper.add("label", ckt.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java index 0600d85..fc029bf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.CustomDataKeyOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.CustomDataKeyOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * CustomDataKeySerializer: Converts a CustomDataKeyOverview object for * representation as an XMLRPC struct. @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("dateTime.iso8601", "last_modified") * #struct_end() */ -public class CustomDataKeySerializer implements XmlRpcCustomSerializer { +public class CustomDataKeySerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,11 +50,11 @@ public class CustomDataKeySerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { CustomDataKeyOverview key = (CustomDataKeyOverview)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", key.getId()); helper.add("label", key.getLabel()); helper.add("description", key.getDescription()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java index 572a00f..fc76482 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.Device; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.Device; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * DeviceSerializer @@ -40,17 +39,17 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "pcitype") * #struct_end() */ -public class DeviceSerializer implements XmlRpcCustomSerializer { +public class DeviceSerializer extends RhnXmlRpcCustomSerializer { /** * * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { Device dev = (Device) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("device", dev.getDevice()); helper.add("device_class", dev.getDeviceClass()); helper.add("driver", dev.getDriver()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java index 4c2917e..23f110a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.channel.DistChannelMap; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.channel.DistChannelMap; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * DistChannelMapSerializer @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "org_specific", "'Y' organization specific, 'N' default") * #struct_end() */ -public class DistChannelMapSerializer implements XmlRpcCustomSerializer { +public class DistChannelMapSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,11 +49,11 @@ public class DistChannelMapSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { DistChannelMap dstChannelMap = (DistChannelMap) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("os", dstChannelMap.getOs()); helper.add("release", dstChannelMap.getRelease()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java index 460a8b0..a03f14b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java @@ -15,18 +15,17 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.Dmi; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.lang.StringUtils; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.Dmi; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * DmiSerializer @@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "bios_version", "(optional)") * #struct_end() */ -public class DmiSerializer implements XmlRpcCustomSerializer { +public class DmiSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -54,9 +53,9 @@ public class DmiSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper bean = new SerializerHelper(builtInSerializer); + SerializerHelper bean = new SerializerHelper(serializer); Dmi dmi = (Dmi) value; bean.add("vendor", StringUtils.defaultString(dmi.getVendor())); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java index 5ec5e81..2429483 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.entitlement.Entitlement; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.entitlement.Entitlement; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * EntitlementSerializer @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "type") * #struct_end() */ -public class EntitlementSerializer implements XmlRpcCustomSerializer { +public class EntitlementSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,10 +47,10 @@ public class EntitlementSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); Entitlement ent = (Entitlement) value; helper.add("label", ent.getLabel()); helper.add("name", ent.getHumanReadableLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java index 588efe6..c263e99 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.EntitlementServerGroup; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.EntitlementServerGroup; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * EntitlementServerGroupSerializer @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "total_slots") * #struct_end() */ -public class EntitlementServerGroupSerializer implements XmlRpcCustomSerializer { +public class EntitlementServerGroupSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,9 +49,9 @@ public class EntitlementServerGroupSerializer implements XmlRpcCustomSerializer /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); EntitlementServerGroup group = (EntitlementServerGroup) value; helper.add("name", group.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java index c56d631..142f4fa 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ErrataOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ErrataOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * ErrataOverviewSerializer @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "advisory_name", "Name such as RHSA, etc") * #struct_end() */ -public class ErrataOverviewSerializer implements XmlRpcCustomSerializer { +public class ErrataOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * @@ -53,11 +52,11 @@ public class ErrataOverviewSerializer implements XmlRpcCustomSerializer { * {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ErrataOverview errata = (ErrataOverview) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", errata.getId()); helper.add("issue_date", errata.getIssueDate()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java index db672fd..133f866 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * ErrataSerializer @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "advisory_synopsis", "Summary of the erratum.") * #struct_end() */ -public class ErrataSerializer implements XmlRpcCustomSerializer { +public class ErrataSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,11 +50,11 @@ public class ErrataSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { Errata errata = (Errata) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", errata.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java index 7342ca2..d87a5a9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java @@ -14,19 +14,18 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.common.FileList; -import com.redhat.rhn.domain.config.ConfigFileName; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; import java.util.LinkedList; import java.util.List; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.common.FileList; +import com.redhat.rhn.domain.config.ConfigFileName; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * FileListSerializer: Converts a FileList object for representation * as an XMLRPC struct. @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_array("file_names", "string", "name") * #struct_end() */ -public class FileListSerializer implements XmlRpcCustomSerializer { +public class FileListSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,11 +49,11 @@ public class FileListSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { FileList fl = (FileList)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", fl.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java index 4f0d356..84745e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.FilePreservationDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.FilePreservationDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * FilePreservationDtoSerializer * @version $Rev$ @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("dateTime.iso8601", "last_modified") * #struct_end() */ -public class FilePreservationDtoSerializer implements XmlRpcCustomSerializer { +public class FilePreservationDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -46,10 +45,10 @@ public class FilePreservationDtoSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { FilePreservationDto fs = (FilePreservationDto)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", fs.getLabel()); helper.add("id", fs.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java index 7c6976e..4f4a649 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.HistoryEvent; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.HistoryEvent; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * HistoryEventSerializer @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * * */ -public class HistoryEventSerializer implements XmlRpcCustomSerializer { +public class HistoryEventSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,10 +51,10 @@ public class HistoryEventSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); HistoryEvent event = (HistoryEvent) value; helper.add("summary", event.getSummary()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java index ce32d67..1ee48cd 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -35,7 +34,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop("int", "localOrgId") * #struct_end() */ -public class IssMasterOrgSerializer implements XmlRpcCustomSerializer { +public class IssMasterOrgSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -47,7 +46,7 @@ public class IssMasterOrgSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer) + protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java index 5cbc75f..77f5c01 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop("boolean", "isCurrentMaster") * #struct_end() */ -public class IssMasterSerializer implements XmlRpcCustomSerializer { +public class IssMasterSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,7 +47,7 @@ public class IssMasterSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer) + protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java index 466d4c0..9fbd1a5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop("boolean", "allowAllOrgs") * #struct_end() */ -public class IssSlaveSerializer implements XmlRpcCustomSerializer { +public class IssSlaveSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,7 +47,7 @@ public class IssSlaveSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer) + protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java index 50870d0..8bb4fb6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java @@ -15,16 +15,15 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartCommand; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartCommand; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartAdvancedOptionsSerializer: Converts a KickstartCommand object for * representation as an XMLRPC struct. @@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "arguments") * #struct_end() */ -public class KickstartAdvancedOptionsSerializer implements XmlRpcCustomSerializer { +public class KickstartAdvancedOptionsSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -49,11 +48,11 @@ public class KickstartAdvancedOptionsSerializer implements XmlRpcCustomSerialize /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartCommand cmd = (KickstartCommand)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", cmd.getCommandName().getName()); helper.add("arguments", cmd.getArguments()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java index 0e74f60..2c85a40 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartCommandName; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartCommandName; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartCommandNameSerializer: Converts a KickstartCommandName object for * representation as an XMLRPC struct. * @version $Rev$ * */ -public class KickstartCommandNameSerializer implements XmlRpcCustomSerializer { +public class KickstartCommandNameSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -42,11 +41,11 @@ public class KickstartCommandNameSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartCommandName kn = (KickstartCommandName)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", kn.getId()); helper.add("name", kn.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java index d0abbba..58043d9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartCommand; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartCommand; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartCommandSerializer: Converts a KickstartCommand object for representation * as an XMLRPC struct. @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "arguments") * #struct_end() */ -public class KickstartCommandSerializer implements XmlRpcCustomSerializer { +public class KickstartCommandSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,11 +47,11 @@ public class KickstartCommandSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartCommand kc = (KickstartCommand)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", kc.getId()); helper.add("arguments", kc.getArguments()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java index be86d74..9d6484a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ActivationKeySerializer @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "update_type") * #struct_end() */ -public class KickstartDtoSerializer implements XmlRpcCustomSerializer { +public class KickstartDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,10 +49,10 @@ public class KickstartDtoSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartDto ks = (KickstartDto)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("label", ks.getLabel()); helper.add("active", ks.isActive()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java index 57f06c8..f3dd5c3 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartInstallType; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartInstallType; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartTreeSerializer @@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "name") * #struct_end() */ -public class KickstartInstallTypeSerializer implements XmlRpcCustomSerializer { +public class KickstartInstallTypeSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,12 +49,12 @@ public class KickstartInstallTypeSerializer implements XmlRpcCustomSerializer { * {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartInstallType type = (KickstartInstallType) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", type.getId()); helper.add("label", type.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java index 84ef0ff..a8815c3 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartIpRange; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartIpRange; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartIpRangeSerializer @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "min", "The min ip of the range") * #struct_end() */ -public class KickstartIpRangeSerializer implements XmlRpcCustomSerializer { +public class KickstartIpRangeSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -46,10 +45,10 @@ public class KickstartIpRangeSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartIpRange range = (KickstartIpRange)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("ksLabel", range.getKsdata().getLabel()); helper.add("min", range.getMinString()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java index 376077d..5ff153e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * Serializer for {@link KickstartOptionValue} objects. * @@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() */ -public class KickstartOptionValueSerializer implements XmlRpcCustomSerializer { +public class KickstartOptionValueSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -45,7 +44,7 @@ public class KickstartOptionValueSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) + protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer) throws XmlRpcException, IOException { if (!(o instanceof KickstartOptionValue)) { throw new XmlRpcException("Object of incorrect type to be serialized. " + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java index 040e513..8fb2b46 100755 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartScript; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartScript; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * ErrataOverviewSerializer @@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("boolean", "template", "True if templating using cobbler is enabled") * #struct_end() */ -public class KickstartScriptSerializer implements XmlRpcCustomSerializer { +public class KickstartScriptSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -56,11 +55,11 @@ public class KickstartScriptSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartScript script = (KickstartScript) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", script.getId()); helper.add("contents", script.getDataContents()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java index f80e55e..beeea41 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartTreeDetailSerializer @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * $KickstartInstallTypeSerializer * #struct_end() */ -public class KickstartTreeDetailSerializer implements XmlRpcCustomSerializer { +public class KickstartTreeDetailSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,12 +51,12 @@ public class KickstartTreeDetailSerializer implements XmlRpcCustomSerializer { * {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartableTreeDetail treeDetail = (KickstartableTreeDetail) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", treeDetail.getId()); helper.add("label", treeDetail.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java index bd51ff5..195896e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.KickstartableTree; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.KickstartableTree; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * KickstartTreeSerializer @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "channel_id") * #struct_end() */ -public class KickstartTreeSerializer implements XmlRpcCustomSerializer { +public class KickstartTreeSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,12 +50,12 @@ public class KickstartTreeSerializer implements XmlRpcCustomSerializer { * {@inheritDoc} * @throws IOException */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { KickstartableTree tree = (KickstartableTree)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", tree.getId()); helper.add("label", tree.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java index 0d0ff3b..97422d6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.ManagedServerGroup; -import com.redhat.rhn.domain.server.ServerGroup; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.ManagedServerGroup; +import com.redhat.rhn.domain.server.ServerGroup; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ManagedServerGroupSerializer is a custom serializer for the XMLRPC library. @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class ManagedServerGroupSerializer implements XmlRpcCustomSerializer { +public class ManagedServerGroupSerializer extends RhnXmlRpcCustomSerializer { public static final String CURRENT_MEMBERS = "system_count"; @@ -55,23 +54,23 @@ public class ManagedServerGroupSerializer implements XmlRpcCustomSerializer { * instead of traversing the entire object graph. * @param value ServerGroup object. * @param output Buffer to serialize the object to. - * @param builtInSerializer basic XMLRPC serializer + * @param serializer basic XMLRPC serializer * @throws XmlRpcException thrown if a problem occurs with serializing * the value. * @throws IOException thrown if a problem occurs with serializing * the value. */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ServerGroup sg = (ServerGroup) value; - SerializerHelper serializer = new SerializerHelper(builtInSerializer); - serializer.add("id", sg.getId()); - serializer.add("name", sg.getName()); - serializer.add("description", sg.getDescription()); - serializer.add(CURRENT_MEMBERS, sg.getCurrentMembers()); - serializer.add("org_id", sg.getOrg().getId()); - serializer.writeTo(output); + SerializerHelper helper = new SerializerHelper(serializer); + helper.add("id", sg.getId()); + helper.add("name", sg.getName()); + helper.add("description", sg.getDescription()); + helper.add(CURRENT_MEMBERS, sg.getCurrentMembers()); + helper.add("org_id", sg.getOrg().getId()); + helper.writeTo(output); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java index 9868f8b..b1e856a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * MultiOrgEntitlementsDtoSerializer * @version $Rev$ @@ -42,8 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "unallocated_flex") * #struct_end() */ -public class MultiOrgEntitlementsDtoSerializer implements - XmlRpcCustomSerializer { +public class MultiOrgEntitlementsDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -56,10 +54,10 @@ public class MultiOrgEntitlementsDtoSerializer implements /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); MultiOrgEntitlementsDto dto = (MultiOrgEntitlementsDto) value; helper.add("name", dto.getName()); helper.add("label", dto.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java index aeaa4cc..2cede27 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.MultiOrgUserOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.MultiOrgUserOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * MultiOrgAllUserOverviewSerializer @@ -38,8 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("boolean", "is_org_admin") * #struct_end() */ -public class MultiOrgUserOverviewSerializer implements - XmlRpcCustomSerializer { +public class MultiOrgUserOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * @@ -53,10 +51,10 @@ public class MultiOrgUserOverviewSerializer implements * * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper se = new SerializerHelper(builtInSerializer); + SerializerHelper se = new SerializerHelper(serializer); MultiOrgUserOverview dto = (MultiOrgUserOverview) value; se.add("login", dto.getLogin()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java index 6f8c63a..7142922 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java @@ -14,18 +14,17 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.NetworkDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.lang.StringUtils; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.NetworkDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * NetworkDtoSerializer @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * successfully checked in") * #struct_end() */ -public class NetworkDtoSerializer implements XmlRpcCustomSerializer { +public class NetworkDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -50,10 +49,10 @@ public class NetworkDtoSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { NetworkDto net = (NetworkDto)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("systemId", net.getId()); String name = net.getName(); if (StringUtils.isBlank(name)) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java index 87a274a..d1ec53f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java @@ -14,22 +14,21 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.NetworkInterface; -import com.redhat.rhn.domain.server.ServerNetAddress6; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.lang.StringUtils; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.domain.server.ServerNetAddress6; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * NetworkInterfaceSerializer @@ -55,7 +54,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer { +public class NetworkInterfaceSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -65,14 +64,14 @@ public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { NetworkInterface device = (NetworkInterface)value; - SerializerHelper devMap = new SerializerHelper(builtInSerializer); + SerializerHelper devMap = new SerializerHelper(serializer); ArrayList ipv6List = new ArrayList(); for (ServerNetAddress6 addr : device.getIPv6Addresses()) { -// SerializerHelper m = new SerializerHelper(builtInSerializer); +// SerializerHelper m = new SerializerHelper(serializer); Map m = new HashMap(); m.put("address", StringUtils.defaultString(addr.getAddress())); m.put("netmask", StringUtils.defaultString(addr.getNetmask())); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java index 74d50cc..4702d78 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.server.Note; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.server.Note; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("date", "updated", "Date of the last note update") * #struct_end() */ -public class NoteSerializer implements XmlRpcCustomSerializer { +public class NoteSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -53,10 +52,10 @@ public class NoteSerializer implements XmlRpcCustomSerializer { * * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); Note note = (Note) value; helper.add("id", note.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java index 0357d71..6b8a577 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java @@ -14,21 +14,20 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ObjectSerializer * @version $Rev$ */ -public class ObjectSerializer implements XmlRpcCustomSerializer { +public class ObjectSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -40,9 +39,9 @@ public class ObjectSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper s = new SerializerHelper(builtInSerializer); + SerializerHelper s = new SerializerHelper(serializer); s.add("value", String.valueOf(value)); s.writeTo(output); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java index 4a7b6a8..a19251a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.OrgChannelFamily; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.OrgChannelFamily; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgChannelFamilySerializer @@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "used_flex") * #struct_end() */ -public class OrgChannelFamilySerializer implements XmlRpcCustomSerializer { +public class OrgChannelFamilySerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -55,10 +54,10 @@ public class OrgChannelFamilySerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); OrgChannelFamily dto = (OrgChannelFamily) value; helper.add("name", dto.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java index 5943bcf..3916fd5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.OrgDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.OrgDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgDtoSerializer @@ -46,7 +45,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * "Number of configuration channels in the organization. (optional)") * #struct_end() */ -public class OrgDtoSerializer implements XmlRpcCustomSerializer { +public class OrgDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -60,10 +59,10 @@ public class OrgDtoSerializer implements XmlRpcCustomSerializer { * * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); OrgDto dto = (OrgDto) value; helper.add("id", dto.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java index 0ae114c..4d205ea 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.OrgEntitlementDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.OrgEntitlementDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgEntitlementDtoSerializer @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "unallocated") * #struct_end() */ -public class OrgEntitlementDtoSerializer implements XmlRpcCustomSerializer { +public class OrgEntitlementDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} */ @@ -51,10 +50,10 @@ public class OrgEntitlementDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); OrgEntitlementDto dto = (OrgEntitlementDto) value; helper.add("label", dto.getEntitlement().getLabel()); helper.add("name", dto.getEntitlement().getHumanReadableLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java index 8c91a9b..9e97b69 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgSerializer is a custom serializer for the XMLRPC library. * It converts an Org to an XMLRPC <struct>. * @version $Rev$ */ -public class OrgSerializer implements XmlRpcCustomSerializer { +public class OrgSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -38,7 +37,7 @@ public class OrgSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer serializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java index 0f6c64b..beb3e8f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.org.OrgFactory; -import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.org.OrgFactory; +import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgSoftwareEntitlementDto @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "free") * #struct_end() */ -public class OrgSoftwareEntitlementDtoSerializer implements XmlRpcCustomSerializer { +public class OrgSoftwareEntitlementDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,10 +51,10 @@ public class OrgSoftwareEntitlementDtoSerializer implements XmlRpcCustomSerializ /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); OrgSoftwareEntitlementDto dto = (OrgSoftwareEntitlementDto) value; helper.add("org_id", dto.getOrg().getId()); helper.add("org_name", dto.getOrg().getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java index 70dffd1..e3253ce 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.OrgTrustOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.OrgTrustOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * OrgSerializer is a custom serializer for the XMLRPC library. @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #array_end() * @version $Rev$ */ -public class OrgTrustOverviewSerializer implements XmlRpcCustomSerializer { +public class OrgTrustOverviewSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class<OrgTrustOverview> getSupportedClass() { @@ -46,7 +45,7 @@ public class OrgTrustOverviewSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer serializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); OrgTrustOverview tr = (OrgTrustOverview) value; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java index 5485cce..0bf464d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.PackageDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * PackageSerializer @@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class PackageDtoSerializer implements XmlRpcCustomSerializer { +public class PackageDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -55,11 +54,11 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageDto pack = (PackageDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", pack.getName()); helper.add("version", pack.getVersion()); helper.add("release", pack.getRelease()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java index 86ee6a7..20b4c86 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.rhnpackage.PackageKey; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.rhnpackage.PackageKey; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * PackageKeySerializer @@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "type") * #struct_end() */ -public class PackageKeySerializer implements XmlRpcCustomSerializer { +public class PackageKeySerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -45,10 +44,10 @@ public class PackageKeySerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageKey key = (PackageKey)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("key", key.getKey()); helper.add("type", key.getType().getLabel()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java index e7ad2b4..b5934ff 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.PackageMetadata; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.PackageMetadata; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * Converts PackageMetadata to an XMLRPC <struct>. * @version $Rev$ @@ -47,7 +46,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * * */ -public class PackageMetadataSerializer implements XmlRpcCustomSerializer { +public class PackageMetadataSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -55,11 +54,11 @@ public class PackageMetadataSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageMetadata pkg = (PackageMetadata)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("package_name_id", pkg.getId()); helper.add("package_name", pkg.getName()); helper.add("package_arch", pkg.getArch()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java index 4d7b701..5de5e16 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.rhnpackage.PackageNevra; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.rhnpackage.PackageNevra; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ServerSerializer: Converts a Server object for representation as an XMLRPC struct. @@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "arch") * #struct_end() */ -public class PackageNevraSerializer implements XmlRpcCustomSerializer { +public class PackageNevraSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,11 +51,11 @@ public class PackageNevraSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageNevra pack = (PackageNevra)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", pack.getName().getName()); helper.add("epoch", pack.getEvr().getEpoch()); helper.add("version", pack.getEvr().getVersion()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java index 364adfa..b381c36 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java @@ -14,18 +14,17 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.PackageOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.lang.StringUtils; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.PackageOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * PackageOverviewSerializer * @version $Rev$ @@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "provider") * #struct_end() */ -public class PackageOverviewSerializer implements XmlRpcCustomSerializer { +public class PackageOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} */ @@ -52,10 +51,10 @@ public class PackageOverviewSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageOverview pO = (PackageOverview)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", pO.getId()); helper.add("name", pO.getPackageName()); helper.add("summary", pO.getSummary()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java index e339d10..e4ffb33 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.rhnpackage.PackageProvider; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.rhnpackage.PackageProvider; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * PackageKeySerializer @@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_array_end() * #struct_end() */ -public class PackageProviderSerializer implements XmlRpcCustomSerializer { +public class PackageProviderSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -47,10 +46,10 @@ public class PackageProviderSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { PackageProvider prov = (PackageProvider)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", prov.getName()); helper.add("keys", prov.getKeys()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java index 90fb3e0..5b91046 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java @@ -14,19 +14,18 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.rhnpackage.Package; -import com.redhat.rhn.domain.rhnpackage.PackageFactory; -import com.redhat.rhn.domain.rhnpackage.PackageKey; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.PackageKey; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * PackageSerializer @@ -47,7 +46,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class PackageSerializer implements XmlRpcCustomSerializer { +public class PackageSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -59,11 +58,11 @@ public class PackageSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { Package pack = (Package) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", pack.getPackageName().getName()); helper.add("version", pack.getPackageEvr().getVersion()); helper.add("release", pack.getPackageEvr().getRelease()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java index cd6488a..6edeef2 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ProfileOverviewDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ProfileOverviewDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ProfileOverviewDtoSerializer @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "channel") * #struct_end() */ -public class ProfileOverviewDtoSerializer implements XmlRpcCustomSerializer { +public class ProfileOverviewDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,10 +47,10 @@ public class ProfileOverviewDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ProfileOverviewDto dto = (ProfileOverviewDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", dto.getId().longValue()); helper.add("name", dto.getName()); helper.add("channel", dto.getChannelName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java index 749367f..6849adb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.user.RhnTimeZone; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.user.RhnTimeZone; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * RhnTimeZoneSerializer will serialize an RhnTimeZone object to XMLRPC * syntax. @@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "olson_name", "Name as identified by the Olson database.") * #struct_end() */ -public class RhnTimeZoneSerializer implements XmlRpcCustomSerializer { +public class RhnTimeZoneSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class getSupportedClass() { @@ -44,11 +43,11 @@ public class RhnTimeZoneSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { RhnTimeZone tz = (RhnTimeZone) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("time_zone_id", new Integer(tz.getTimeZoneId())); helper.add("olson_name", tz.getOlsonName()); helper.writeTo(output); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java new file mode 100644 index 0000000..359c522 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.xmlrpc.serializer; + +import java.io.IOException; +import java.io.Writer; + +import redstone.xmlrpc.XmlRpcCustomSerializer; +import redstone.xmlrpc.XmlRpcException; +import redstone.xmlrpc.XmlRpcSerializer; + +/** + * Parent class of all XmlRpcSerializers. This exists because redstone.xmlrpc silently + * eats exceptions thrown by the specific Serializer instances, and we'd like to log + * that when it happens, so we can fix it. + * + * @author ggainey + * + */ +public abstract class RhnXmlRpcCustomSerializer implements XmlRpcCustomSerializer { + + /** + * {@inheritDoc} + */ + public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer) + throws XmlRpcException, IOException { + try { + doSerialize(obj, writer, serializer); + } + catch (Exception e) { + e.printStackTrace(); + throw new XmlRpcException( + "ERROR IN SERIALIZER FOR " + getSupportedClass().getName(), e); + } + } + + /** + * {@inheritDoc} + */ + public abstract Class getSupportedClass(); + + protected abstract void doSerialize(Object obj, Writer writer, + XmlRpcSerializer serializer) throws XmlRpcException, IOException; + +} diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java index 9f6659b..c247bc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ScheduledAction; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ScheduledAction; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ScheduleActionSerializer * @version $Rev$ @@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("int", "inProgressSystems", "Number of systems that are in progress.") * #struct_end() */ -public class ScheduleActionSerializer implements XmlRpcCustomSerializer { +public class ScheduleActionSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -52,10 +51,10 @@ public class ScheduleActionSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ScheduledAction action = (ScheduledAction)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", action.getId()); helper.add("name", action.getActionName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java index 558a77e..173a374 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ActionedSystem; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ActionedSystem; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ScheduleSystemSerializer * @version $Rev$ @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * this will contain the failure text.") * #struct_end() */ -public class ScheduleSystemSerializer implements XmlRpcCustomSerializer { +public class ScheduleSystemSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -49,10 +48,10 @@ public class ScheduleSystemSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ActionedSystem action = (ActionedSystem)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("server_id", action.getId()); helper.add("server_name", action.getServerName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java index 7727eda..b87cae1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java @@ -14,19 +14,18 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.action.script.ScriptResult; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - -import org.apache.commons.codec.binary.Base64; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.codec.binary.Base64; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.action.script.ScriptResult; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * Converts a ScriptResult to an XMLRPC <struct>. @@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class ScriptResultSerializer implements XmlRpcCustomSerializer { +public class ScriptResultSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -54,10 +53,10 @@ public class ScriptResultSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ScriptResult scriptResult = (ScriptResult)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("serverId", scriptResult.getServerId()); helper.add("startDate", scriptResult.getStartDate()); helper.add("stopDate", scriptResult.getStopDate()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java index cb724ed..2bfc940 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java @@ -30,9 +30,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; public class SerializerFactory { private List<XmlRpcCustomSerializer> serializers; - private static final String INTERFACE_NAME = - "redstone.xmlrpc.XmlRpcCustomSerializer"; - /** private constructor */ public SerializerFactory() { serializers = new ArrayList<XmlRpcCustomSerializer>(); @@ -48,12 +45,11 @@ public class SerializerFactory { } private void initialize() { - String[] excludes = new String[1]; - excludes[0] = "Test"; List<Class> classes = SerializerRegistry.getSerializationClasses(); + for (Class clazz : classes) { try { - if (doesClassImplement(clazz, INTERFACE_NAME)) { + if (XmlRpcCustomSerializer.class.isAssignableFrom(clazz)) { Object s = clazz.newInstance(); serializers.add((XmlRpcCustomSerializer)s); } @@ -63,16 +59,4 @@ public class SerializerFactory { } } } - - private boolean doesClassImplement(Class clazz, String interfaceName) { - Class[] interfaces = clazz.getInterfaces(); - boolean found = false; - for (int i = 0; i < interfaces.length; i++) { - if (interfaces[i].getName().equals(interfaceName)) { - found = true; - break; - } - } - return found; - } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java index 8cbd889..81d38ec 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.action.Action; -import com.redhat.rhn.domain.action.server.ServerAction; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.action.server.ServerAction; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ActivationKeySerializer @@ -64,7 +63,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * executes at the client machine. (optional)") * #struct_end() */ -public class ServerActionSerializer implements XmlRpcCustomSerializer { +public class ServerActionSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -74,11 +73,11 @@ public class ServerActionSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ServerAction sAct = (ServerAction) value; Action act = sAct.getParentAction(); - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("failed_count", act.getFailedCount()); helper.add("modified", act.getModified().toString()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java index 8e825a4..84a5f31 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.ServerPath; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.ServerPath; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ServerPathSerializer: Converts a ServerPathSerializer object for representation as an @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "hostname", "Proxy host name") * #struct_end() */ -public class ServerPathSerializer implements XmlRpcCustomSerializer { +public class ServerPathSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,12 +50,12 @@ public class ServerPathSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ServerPath serverPath = (ServerPath)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("position", serverPath.getPosition()); helper.add("id", serverPath.getId()); helper.add("hostname", serverPath.getHostname()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java index 97813a8..3473765 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java @@ -14,25 +14,24 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.entitlement.Entitlement; -import com.redhat.rhn.domain.server.Network; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -import com.redhat.rhn.manager.entitlement.EntitlementManager; - -import org.apache.commons.lang.StringUtils; - import java.io.IOException; import java.io.Writer; import java.util.LinkedList; import java.util.List; import java.util.Set; -import redstone.xmlrpc.XmlRpcCustomSerializer; +import org.apache.commons.lang.StringUtils; + import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.entitlement.Entitlement; +import com.redhat.rhn.domain.server.Network; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; +import com.redhat.rhn.manager.entitlement.EntitlementManager; + /** * ServerSerializer: Converts a Server object for representation as an XMLRPC struct. @@ -72,7 +71,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * for virtual guests only (optional)") * #struct_end() */ -public class ServerSerializer implements XmlRpcCustomSerializer { +public class ServerSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -84,12 +83,12 @@ public class ServerSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { Server server = (Server)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", server.getId()); helper.add("profile_name", server.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java index 59e0d9e..ef08de9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.config.ConfigChannel; -import com.redhat.rhn.domain.server.EntitlementServerGroup; -import com.redhat.rhn.domain.server.ServerGroup; -import com.redhat.rhn.domain.server.ServerSnapshot; -import com.redhat.rhn.domain.server.SnapshotTag; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; import java.util.HashSet; import java.util.Set; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.config.ConfigChannel; +import com.redhat.rhn.domain.server.EntitlementServerGroup; +import com.redhat.rhn.domain.server.ServerGroup; +import com.redhat.rhn.domain.server.ServerSnapshot; +import com.redhat.rhn.domain.server.SnapshotTag; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ServerSerializer: Converts a Server object for representation as an XMLRPC struct. @@ -56,7 +55,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * reason (optional).") * #struct_end() */ -public class ServerSnapshotSerializer implements XmlRpcCustomSerializer { +public class ServerSnapshotSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -68,12 +67,12 @@ public class ServerSnapshotSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { ServerSnapshot snap = (ServerSnapshot)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", snap.getId()); helper.add("reason", snap.getReason()); helper.add("created", snap.getCreated()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java index eb1df4e..237c09f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * SnippetSerializer @@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop_desc("string", "file", "The local path to the file containing this snippet.") * #struct_end() */ -public class SnippetSerializer implements XmlRpcCustomSerializer { +public class SnippetSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,10 +47,10 @@ public class SnippetSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { CobblerSnippet snippet = (CobblerSnippet)value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("name", snippet.getName()); helper.add("contents", snippet.getContents()); helper.add("fragment", snippet.getFragment()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java index ff56828..c2febf4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java @@ -15,16 +15,15 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.SystemEntitlementsDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.SystemEntitlementsDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * SystemEntitlementsDtoSerializer * @version $Rev$ @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("int", "free") * #struct_end() */ -public class SystemEntitlementsDtoSerializer implements XmlRpcCustomSerializer { +public class SystemEntitlementsDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -51,9 +50,9 @@ public class SystemEntitlementsDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); SystemEntitlementsDto dto = (SystemEntitlementsDto) value; helper.add("label", dto.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java index 746a9d5..73c2cf5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java @@ -15,16 +15,15 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.SystemOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * SystemOverviewSerializer @@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * * */ -public class SystemOverviewSerializer implements XmlRpcCustomSerializer { +public class SystemOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -53,11 +52,11 @@ public class SystemOverviewSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SystemOverview system = (SystemOverview) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", system.getId()); helper.add("name", system.getName()); helper.add("last_checkin", system.getLastCheckinDate()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java index 408294e..d44f1e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java @@ -14,15 +14,14 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.SystemSearchResult; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; + +import com.redhat.rhn.frontend.dto.SystemSearchResult; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; /** * * SystemSearchResultSerializer @@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class SystemSearchResultSerializer implements XmlRpcCustomSerializer { +public class SystemSearchResultSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -56,11 +55,11 @@ public class SystemSearchResultSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) throws XmlRpcException, + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { SystemSearchResult result = (SystemSearchResult) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("id", result.getId()); helper.add("name", result.getName()); helper.add("last_checkin", result.getLastCheckinDate()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java index 625ec12..8d7aed1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java @@ -15,13 +15,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.server.ServerGroup; -import com.redhat.rhn.domain.server.ServerGroupType; -import com.redhat.rhn.domain.token.Token; -import com.redhat.rhn.domain.token.TokenPackage; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; import java.util.HashMap; @@ -29,10 +22,16 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.server.ServerGroup; +import com.redhat.rhn.domain.server.ServerGroupType; +import com.redhat.rhn.domain.token.Token; +import com.redhat.rhn.domain.token.TokenPackage; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * ActivationKeySerializer * @version $Rev$ @@ -56,7 +55,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("boolean", "disabled") * #struct_end() */ -public class TokenSerializer implements XmlRpcCustomSerializer { +public class TokenSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -66,9 +65,9 @@ public class TokenSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); populateTokenInfo((Token)value, helper); helper.writeTo(output); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java index e97319b..f1ac762 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java @@ -14,16 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.TrustedOrgDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.TrustedOrgDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * TrustedOrgDtoSerializer is a custom serializer for the XMLRPC library. * It converts an TrustedOrgDto to an XMLRPC <struct>. @@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * @version $Rev$ */ -public class TrustedOrgDtoSerializer implements XmlRpcCustomSerializer { +public class TrustedOrgDtoSerializer extends RhnXmlRpcCustomSerializer { /** {@inheritDoc} */ public Class<TrustedOrgDto> getSupportedClass() { @@ -43,7 +42,7 @@ public class TrustedOrgDtoSerializer implements XmlRpcCustomSerializer { } /** {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer serializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { SerializerHelper helper = new SerializerHelper(serializer); TrustedOrgDto tr = (TrustedOrgDto) value; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java index 24f1c0a..a4cabbf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java @@ -15,16 +15,15 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * UserSerializer a serializer for the User class @@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * false if the user is disabled") * #struct_end() */ -public class UserSerializer implements XmlRpcCustomSerializer { +public class UserSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} */ @@ -50,9 +49,9 @@ public class UserSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); User user = (User) value; helper.add("id", user.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java index 4845f77..c2625f4 100755 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java @@ -15,16 +15,15 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; -import com.redhat.rhn.frontend.dto.VirtualSystemOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; +import com.redhat.rhn.frontend.dto.VirtualSystemOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + /** * * VirtualSystemOverviewSerializer @@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer; * #struct_end() * */ -public class VirtualSystemOverviewSerializer implements XmlRpcCustomSerializer { +public class VirtualSystemOverviewSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -54,11 +53,11 @@ public class VirtualSystemOverviewSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer) + protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer) throws XmlRpcException, IOException { VirtualSystemOverview system = (VirtualSystemOverview) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("uuid", system.getUuid()); helper.add("id", system.getSystemId()); helper.add("guest_name", system.getName()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java index 3bde2fa..60a9f8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java @@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop_desc("string", "idents", "Comma separated list of XCCDF idents.") * #struct_end() */ -public class XccdfRuleResultDtoSerializer implements XmlRpcCustomSerializer { +public class XccdfRuleResultDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -48,10 +47,10 @@ public class XccdfRuleResultDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException { + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { XccdfRuleResultDto dto = (XccdfRuleResultDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); helper.add("idref", dto.getDocumentIdref()); helper.add("result", dto.getLabel()); helper.add("idents", dto.getIdentsString()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java index 2b5a56d..25f618d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java @@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -37,7 +36,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop_desc($date, "completed", "Scan completion time") * #struct_end() */ -public class XccdfTestResultDtoSerializer implements XmlRpcCustomSerializer { +public class XccdfTestResultDtoSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -49,10 +48,10 @@ public class XccdfTestResultDtoSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException { + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { XccdfTestResultDto dto = (XccdfTestResultDto) value; - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); addToHelper(helper, "xid", dto.getXid()); addToHelper(helper, "profile", dto.getProfile()); addToHelper(helper, "path", dto.getPath()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java index cf5f45e..888c03f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java @@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import java.io.IOException; import java.io.Writer; -import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; @@ -51,7 +50,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop_desc("bool", "deletable", "Indicates whether the scan can be deleted.") * #struct_end() */ -public class XccdfTestResultSerializer implements XmlRpcCustomSerializer { +public class XccdfTestResultSerializer extends RhnXmlRpcCustomSerializer { /** * {@inheritDoc} @@ -63,15 +62,15 @@ public class XccdfTestResultSerializer implements XmlRpcCustomSerializer { /** * {@inheritDoc} */ - public void serialize(Object value, Writer output, - XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException { + protected void doSerialize(Object value, Writer output, + XmlRpcSerializer serializer) throws XmlRpcException, IOException { XccdfTestResult testResult = (XccdfTestResult) value; ScapActionDetails actionDetails = testResult.getScapActionDetails(); XccdfBenchmark benchmark = testResult.getBenchmark(); XccdfProfile profile = testResult.getProfile(); Action parentAction = actionDetails.getParentAction(); - SerializerHelper helper = new SerializerHelper(builtInSerializer); + SerializerHelper helper = new SerializerHelper(serializer); addToHelper(helper, "xid", testResult.getId()); addToHelper(helper, "sid", testResult.getServer().getId()); addToHelper(helper, "path", actionDetails.getPath());

1 0

Changes to 'refs/tags/spacewalk-reports-2.1.13-1'
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

Tag 'spacewalk-reports-2.1.13-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-01 15:30 +0000 Tagging package [spacewalk-reports] version [2.1.13-1] in directory [reporting/]. Changes since spacewalk-reports-2.1.12-1: Tomas Kasparek (3): 1009462 - display error message for --(like|where)=<column-id> 1012261 - report system virtualization type Automatic commit of package [spacewalk-reports] release [2.1.13-1]. --- rel-eng/packages/spacewalk-reports | 2 +- reporting/reports/data/inventory | 4 +++- reporting/spacewalk-report | 2 ++ reporting/spacewalk-reports.spec | 6 +++++- 4 files changed, 11 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit b6914527aa0d3920fe201db4d4a6440412070959 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 17:30:02 2013 +0200 Automatic commit of package [spacewalk-reports] release [2.1.13-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index b38d861..33eb8af 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -2.1.12-1 reporting/ +2.1.13-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index bf2a129..a607467 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 2.1.12 +Version: 2.1.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.13-1 +- 1012261 - report system virtualization type +- 1009462 - display error message for --(like|where)=<column-id> + * Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.12-1 - using bind variable in postgres

1 0

reporting/reports
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/reports/data/inventory | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7a59ed592f7b85b33d6f031e6136a8573d7b368b Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 17:23:14 2013 +0200 1012261 - report system virtualization type diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory index 09d54fa..1bdc406 100644 --- a/reporting/reports/data/inventory +++ b/reporting/reports/data/inventory @@ -29,6 +29,7 @@ columns: virtual_host:i System identifier of host, if system is a guest architecture Architecture of the system is_virtualized Information whether system is virtualized or not + virt_type System virtualization type osad_status OSAD status hardware Hardware information @@ -47,7 +48,7 @@ sql: registration_time, last_checkin_time, kernel_version, packages_out_of_date, errata_out_of_date, software_channel, configuration_channel, - entitlements, system_group, organization, virtual_host, architecture, is_virtualized, osad_status, hardware + entitlements, system_group, organization, virtual_host, architecture, is_virtualized, virt_type, osad_status, hardware from ( select rhnserver.id as server_id, rhnserver.name as profile_name, rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address, @@ -78,6 +79,7 @@ sql: ) as architecture, (case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else 'Yes' end ) as is_virtualized, + (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type, (nvl((select rhnpushclientstate.label from rhnpushclient join rhnpushclientstate on rhnpushclient.state_id=rhnpushclientstate.id where rhnpushclient.server_id=rhnServer.id), 'Not enabled')) as osad_status, get_hw_info_as_clob(rhnserver.id, '; ') as hardware from rhnserver left outer join

1 0

reporting/spacewalk-report
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/spacewalk-report | 2 ++ 1 file changed, 2 insertions(+) New commits: commit f29691fbb0a540ff206fee0d06e0e431d78f27af Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 16:35:42 2013 +0200 1009462 - display error message for --(like|where)=<column-id> diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report index 8373002..5aa97ad 100755 --- a/reporting/spacewalk-report +++ b/reporting/spacewalk-report @@ -113,6 +113,8 @@ def processCommandline(): where[k] = [ v ] if like: where_like.append(k) + elif sys.argv[i].startswith('--where=') or sys.argv[i].startswith('--like='): + optionParser.error('no such option: %s' % sys.argv[i]) i += 1

1 0

Changes to 'refs/tags/spacewalk-reports-2.1.12-1'
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

Tag 'spacewalk-reports-2.1.12-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-01 12:27 +0000 Tagging package [spacewalk-reports] version [2.1.12-1] in directory [reporting/]. Changes since spacewalk-search-2.1.2-1: Michael Mraka (1): 923338 - replace application code with database lookup to prevent conflicting inserts Tomas Kasparek (2): using bind variable in postgres Automatic commit of package [spacewalk-reports] release [2.1.12-1]. --- backend/server/importlib/backend.py | 43 +++--------------------------------- rel-eng/packages/spacewalk-reports | 2 - reporting/spacewalk-report | 3 +- reporting/spacewalk-reports.spec | 5 +++- 4 files changed, 11 insertions(+), 42 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e345721414ebf4f70389f9fb46821cb8337ef0e0 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 14:27:35 2013 +0200 Automatic commit of package [spacewalk-reports] release [2.1.12-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index 3ace7ee..b38d861 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -2.1.11-1 reporting/ +2.1.12-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index f44ab81..bf2a129 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.12-1 +- using bind variable in postgres + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 - select from rhnServerNeededCache instead of rhnServerNeededPackageCache

1 0

reporting/spacewalk-report
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/spacewalk-report | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit dc0994915eafce4cb1e82b7e5251fd3d0d9700f3 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 14:11:00 2013 +0200 using bind variable in postgres diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report index 5a84e94..8373002 100755 --- a/reporting/spacewalk-report +++ b/reporting/spacewalk-report @@ -206,7 +206,8 @@ if __name__ == '__main__': if CFG.DB_BACKEND == 'oracle': rhnSQL.execute('alter session set time_zone = \'%s\'' % options.timezone) else: - rhnSQL.execute('set session timezone to \'%s\'' % options.timezone) + tz = rhnSQL.prepare('set session timezone to :tz') + tz.execute(tz=options.timezone) h = rhnSQL.prepare(the_sql) h.execute(**dict(report.params.items() + the_dict_where.items()))

1 0

backend/server
by Michael Mraka 01 Oct '13

01 Oct '13

backend/server/importlib/backend.py | 43 +++--------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) New commits: commit b61d9c9137668adf767229dd14ec01b46acea496 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Sep 24 15:33:24 2013 +0200 923338 - replace application code with database lookup to prevent conflicting inserts addressing Traceback (most recent call last): ... File "/usr/share/rhn/upload_server/handlers/package_push/package_push.py", line 125, in handler relative_path=self.rel_package_path, org_id=self.org_id) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnPackageUpload.py", line 144, in push_package importer.run() File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/importLib.py", line 646, in run self.fix() File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py", line 289, in fix self.backend.processCapabilities(self.capabilities) File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/backend.py", line 128, in processCapabilities h.executemany(id=toinsert[0], name=toinsert[1], version=toinsert[2]) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 172, in executemany return apply(self._execute_wrapper, (self._executemany, ) + p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 108, in _execute_wrapper retval = apply(function, p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 208, in _executemany self._real_cursor.executemany(None, arr) SQLError: (1, 'ORA-00001: unique constraint (SAT56STAGE.RHN_PKG_CAP_NAME_VERSION_UQ) violated\\n', 'insert into rhnPackageCapability (id, name, version) values (:id, :name, :version)') diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index 2ade497..f907794 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -83,49 +83,14 @@ class Backend: sth.execute() def processCapabilities(self, capabilityHash): - # First figure out which capabilities are already inserted - templ = """ - select /*+index(rhnPackageCapability rhn_pkg_cap_name_version_uq)*/ id - from rhnPackageCapability - where name = :name - and version %s""" - sqlNonNull = templ % "= :version" - sqlNull = templ % "is null" - nullStatement = None - nonnullStatement = None - toinsert = [[], [], []] + h = self.dbmodule.prepare("select lookup_package_capability(:name, :version) as id from dual") for name, version in capabilityHash.keys(): ver = version if version is None or version == '': ver = None - if not nullStatement: - nullStatement = self.dbmodule.prepare(sqlNull) - nullStatement.execute(name=name) - row = nullStatement.fetchone_dict() - else: - if not nonnullStatement: - nonnullStatement = self.dbmodule.prepare(sqlNonNull) - nonnullStatement.execute(name=name, version=version) - row = nonnullStatement.fetchone_dict() - if row: - capabilityHash[(name, version)] = row['id'] - continue - # Generate an id - id = self.sequences['rhnPackageCapability'].next() - capabilityHash[(name, version)] = id - toinsert[0].append(id) - toinsert[1].append(name) - toinsert[2].append(ver) - if not toinsert[0]: - # Nothing to do - return - sql = """ - insert into rhnPackageCapability - (id, name, version) values - (:id, :name, :version) - """ - h = self.dbmodule.prepare(sql) - h.executemany(id=toinsert[0], name=toinsert[1], version=toinsert[2]) + h.execute(name = name, version = ver) + row = h.fetchone_dict() + capabilityHash[(name, version)] = row['id'] def processChangeLog(self, changelogHash): sql = "select id from rhnPackageChangeLogData where name = :name and time = :time and text = :text"

1 0

Changes to 'refs/tags/spacewalk-search-2.1.2-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'spacewalk-search-2.1.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:14 +0000 Tagging package [spacewalk-search] version [2.1.2-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-web-2.1.22-1: Michael Mraka (1): Automatic commit of package [spacewalk-search] release [2.1.2-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages search-server/spacewalk-search
by Michael Mraka 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 6bd1cd84877b8a182487f3231d8cea966c678ea6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:14:46 2013 +0200 Automatic commit of package [spacewalk-search] release [2.1.2-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 7bca0da..4fd027d 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.1-1 search-server/spacewalk-search/ +2.1.2-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ea51491..209f918 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 +- 1013629 - clean up old help links + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1 - removed trailing whitespaces

1 0

Changes to 'refs/tags/spacewalk-web-2.1.22-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'spacewalk-web-2.1.22-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:13 +0000 Tagging package [spacewalk-web] version [2.1.22-1] in directory [web/]. Changes since spacewalk-utils-2.1.20-1: Michael Mraka (1): Automatic commit of package [spacewalk-web] release [2.1.22-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Michael Mraka 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit ef086bd73bdc9a6a58516b8566b2456093121c05 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:13:03 2013 +0200 Automatic commit of package [spacewalk-web] release [2.1.22-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 940c9a5..c478bea 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.21-1 web/ +2.1.22-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index f40cad3..a3121f1 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.21 +Version: 2.1.22 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1 +- 1013629 - clean up old help links + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.21-1 - do not reshape logo in un-authenitaced 40x and 500 pages

1 0

Changes to 'refs/tags/spacewalk-utils-2.1.20-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'spacewalk-utils-2.1.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:11 +0000 Tagging package [spacewalk-utils] version [2.1.20-1] in directory [utils/]. Changes since spacewalk-proxy-2.1.12-1: Michael Mraka (1): Automatic commit of package [spacewalk-utils] release [2.1.20-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit cbb1315d66f48c8225552407902bc2e5092387e8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:11:54 2013 +0200 Automatic commit of package [spacewalk-utils] release [2.1.20-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 6846693..7514578 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -2.1.19-1 utils/ +2.1.20-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 32fea63..c796955 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 2.1.19 +Version: 2.1.20 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.20-1 +- fixed pylint warning + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.19-1 - removed trailing whitespaces

1 0

Changes to 'refs/tags/spacewalk-proxy-2.1.12-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'spacewalk-proxy-2.1.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:11 +0000 Tagging package [spacewalk-proxy] version [2.1.12-1] in directory [proxy/proxy/]. Changes since rhnpush-5.5.70-1: Michael Mraka (1): Automatic commit of package [spacewalk-proxy] release [2.1.12-1]. --- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

proxy/proxy rel-eng/packages
by Michael Mraka 01 Oct '13

01 Oct '13

proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 668dd4b2526cbccf733de72a7e4321b69bed4495 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:11:36 2013 +0200 Automatic commit of package [spacewalk-proxy] release [2.1.12-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index edce14f..8362589 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -312,6 +312,9 @@ fi %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1 +- fixed pylint deprecated-lambda warning + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 - removed trailing whitespaces diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index cd4ff14..9d07c53 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -2.1.11-1 proxy/proxy/ +2.1.12-1 proxy/proxy/

1 0

Changes to 'refs/tags/rhnpush-5.5.70-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'rhnpush-5.5.70-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:11 +0000 Tagging package [rhnpush] version [5.5.70-1] in directory [client/tools/rhnpush/]. Changes since apt-spacewalk-1.0.9-1: Michael Mraka (5): Merge already pushed tags fixed pylint warning fixed pylint deprecated-lambda warning fixed pylint deprecated-lambda warning Automatic commit of package [rhnpush] release [5.5.70-1]. Stephen Herr (1): 1013629 - clean up old help links --- client/tools/rhnpush/connection.py | 2 - client/tools/rhnpush/rhnpush.spec | 5 +++- client/tools/rhnpush/rhnpush_confmanager.py | 12 +++++----- client/tools/rhnpush/rhnpush_v2.py | 2 - proxy/proxy/broker/rhnBroker.py | 6 ++--- rel-eng/packages/rhnpush | 2 - search-server/spacewalk-search/nutch/crawl_jsp/conf/crawl-urlfilter.txt | 2 - search-server/spacewalk-search/nutch/crawl_jsp/urls/urls.txt | 2 - utils/depsolver.py | 2 - web/html/network/errata/manage/errata_channel_intersection.pxt | 2 - web/include/network/software/channels/manage/manage_channels_header.pxi | 2 - 11 files changed, 21 insertions(+), 18 deletions(-) ---

1 0

4 commits - client/tools proxy/proxy rel-eng/packages utils/depsolver.py
by Michael Mraka 01 Oct '13

01 Oct '13

client/tools/rhnpush/connection.py | 2 +- client/tools/rhnpush/rhnpush.spec | 5 ++++- client/tools/rhnpush/rhnpush_confmanager.py | 12 ++++++------ client/tools/rhnpush/rhnpush_v2.py | 2 +- proxy/proxy/broker/rhnBroker.py | 6 +++--- rel-eng/packages/rhnpush | 2 +- utils/depsolver.py | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) New commits: commit e0db5a0e2a200dfdbf205c4b733d0696d77218f1 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:11:15 2013 +0200 Automatic commit of package [rhnpush] release [5.5.70-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index 52107f9..c30606a 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -4,7 +4,7 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.69 +Version: 5.5.70 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %doc COPYING %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.70-1 +- fixed pylint deprecated-lambda warning + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.69-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index fb3342c..ff35588 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.5.69-1 client/tools/rhnpush/ +5.5.70-1 client/tools/rhnpush/ commit e8a5fb94e273d19904be38839be541cb1ad3fd16 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:08:00 2013 +0200 fixed pylint deprecated-lambda warning ************* Module rhnpush_v2 W: 48,23: map/filter on lambda could be replaced by comprehension (deprecated-lambda) ************* Module rhnpush_confmanager W: 44,39: map/filter on lambda could be replaced by comprehension (deprecated-lambda) W: 50,41: map/filter on lambda could be replaced by comprehension (deprecated-lambda) W: 73,41: map/filter on lambda could be replaced by comprehension (deprecated-lambda) ************* Module connection W:258,15: map/filter on lambda could be replaced by comprehension (deprecated-lambda) diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py index 435b690..2c5aa20 100644 --- a/client/tools/rhnpush/connection.py +++ b/client/tools/rhnpush/connection.py @@ -255,7 +255,7 @@ class PackageUpload: def get_error_message(self, headers): prefix = self.header_prefix + '-Error' - text = map(lambda x: x[1], headers.getaddrlist(prefix + '-String')) + text = [x[1] for x in headers.getaddrlist(prefix + '-String')] # text is a list now, convert it to a string text = '\n'.join(text) text = base64.decodestring(text) diff --git a/client/tools/rhnpush/rhnpush_confmanager.py b/client/tools/rhnpush/rhnpush_confmanager.py index 6c6209e..8d69864 100644 --- a/client/tools/rhnpush/rhnpush_confmanager.py +++ b/client/tools/rhnpush/rhnpush_confmanager.py @@ -41,14 +41,14 @@ class ConfManager: #Change the files options to lists. if (self.defaultconfig.__dict__.has_key('files') and not type(self.defaultconfig.files) == type([])): - self.defaultconfig.files = map(lambda x: x.strip(), - self.defaultconfig.files.split(',')) + self.defaultconfig.files = [x.strip() for x in + self.defaultconfig.files.split(',')] #Change the exclude options to list. if (self.defaultconfig.__dict__.has_key('exclude') and not type(self.defaultconfig.__dict__['exclude']) == type([])): - self.defaultconfig.exclude = map(lambda x: x.strip(), - self.defaultconfig.exclude.split(',')) + self.defaultconfig.exclude = [x.strip() for x in + self.defaultconfig.exclude.split(',')] #Changes every option in config that is also in store_true_list that is set to '0' to None @@ -70,8 +70,8 @@ class ConfManager: #an empty string array from of size 1 [''] . self.defaultconfig.channel = [] else: - self.defaultconfig.channel = map(lambda x: x.strip(), - self.defaultconfig.channel.split(',')) + self.defaultconfig.channel = [x.strip() for x in + self.defaultconfig.channel.split(',')] #Get the command line arguments. These take precedence over the other settings argoptions, files = self.cmdconfig.parse_args() diff --git a/client/tools/rhnpush/rhnpush_v2.py b/client/tools/rhnpush/rhnpush_v2.py index cf95c34..42e1f53 100644 --- a/client/tools/rhnpush/rhnpush_v2.py +++ b/client/tools/rhnpush/rhnpush_v2.py @@ -45,7 +45,7 @@ class PackageUpload(connection.PackageUpload): # Encodes an array of variables into Base64 (column-separated) @staticmethod def encode_values(arr): - val = ':'.join(map(lambda x: x.strip(), map(base64.encodestring, arr))) + val = ':'.join([x.strip() for x in map(base64.encodestring, arr)]) # Get rid of the newlines val = val.replace('\n', '') # And split the result into lines of fixed size commit 99643ca82ecb3ec147b3ff282d8cdb07148afac7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:00:46 2013 +0200 fixed pylint deprecated-lambda warning W:217,17: map/filter on lambda could be replaced by comprehension (deprecated-lambda) W:416,27: map/filter on lambda could be replaced by comprehension (deprecated-lambda) W:517,23: map/filter on lambda could be replaced by comprehension (deprecated-lambda) diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py index 697979b..55ed025 100644 --- a/proxy/proxy/broker/rhnBroker.py +++ b/proxy/proxy/broker/rhnBroker.py @@ -214,7 +214,7 @@ class BrokerHandler(SharedHandler): # list of tokens to be pushed into the headers. tokens.append(authToken) - tokens = filter(lambda token: token, tokens) + tokens = [t for t in tokens if t] _oto['X-RHN-Proxy-Auth'] = ','.join(tokens) log_debug(5, ' (auth token after): %s' @@ -413,7 +413,7 @@ class BrokerHandler(SharedHandler): # Multivalued header #values = headers.getHeaderValues(k) values = self._get_header(k) - token[k] = map(lambda x: x.split(':'), values) + token[k] = [x.split(':') for x in values] else: # Single-valued header token[k] = headers[k] @@ -514,7 +514,7 @@ class BrokerHandler(SharedHandler): raise rhnFault(34) # Session key has expired # Only autherized channels are the ones stored in the cache. - authChannels = map(lambda x: x[0], self.authChannels) + authChannels = [x[0] for x in self.authChannels] log_debug(4, "Auth channels: '%s'" % authChannels) # Check the authorization if channel not in authChannels: commit e6d0210ed23795025b223168195abdd48a8f00aa Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 08:50:42 2013 +0200 fixed pylint warning W:114,12: Specify string format arguments as logging function parameters (logging-not-lazy) diff --git a/utils/depsolver.py b/utils/depsolver.py index 9798cbf..4a26f13 100644 --- a/utils/depsolver.py +++ b/utils/depsolver.py @@ -111,7 +111,7 @@ class DepSolver: all_results = {} while to_solve: - log.debug("Solving %s \n\n" % to_solve) + log.debug("Solving %s \n\n", to_solve) results = self.getDependencylist() all_results.update(results) found = self.processResults(results)[0]

1 0

17 commits - client/debian client/rhel client/solaris client/tools java/spacewalk-java.spec proxy/installer proxy/proxy rel-eng/packages search-server/spacewalk-search spacecmd/spacecmd.spec spacewalk/certs-tools utils/spacewalk-utils.spec
by Michael Mraka 01 Oct '13

01 Oct '13

client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec | 5 ++++- client/rhel/rhnlib/rhnlib.spec | 5 ++++- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++- client/solaris/rhnclient/rhnclient.spec | 5 ++++- client/solaris/rhnclient/setup.py | 2 +- client/solaris/smartpm/smartpm.spec | 5 ++++- client/tools/rhncfg/rhncfg.spec | 5 ++++- client/tools/rhncustominfo/rhn-custom-info.spec | 5 ++++- client/tools/rhnpush/rhnpush.spec | 5 ++++- client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- java/spacewalk-java.spec | 5 ++++- proxy/installer/spacewalk-proxy-installer.spec | 5 ++++- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/apt-spacewalk | 2 +- rel-eng/packages/rhn-custom-info | 2 +- rel-eng/packages/rhncfg | 2 +- rel-eng/packages/rhnclient | 2 +- rel-eng/packages/rhnlib | 2 +- rel-eng/packages/rhnpush | 2 +- rel-eng/packages/smartpm | 2 +- rel-eng/packages/spacecmd | 2 +- rel-eng/packages/spacewalk-certs-tools | 2 +- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-koan | 2 +- rel-eng/packages/spacewalk-proxy | 2 +- rel-eng/packages/spacewalk-proxy-installer | 2 +- rel-eng/packages/spacewalk-search | 2 +- rel-eng/packages/spacewalk-utils | 2 +- rel-eng/packages/yum-rhn-plugin | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- spacecmd/spacecmd.spec | 5 ++++- spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++- utils/spacewalk-utils.spec | 5 ++++- 33 files changed, 81 insertions(+), 33 deletions(-) New commits: commit 5bcb585a525116d95dbe9a0ec8c63d04af0ce116 Merge: 2a1a906 adf4dba Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 08:35:02 2013 +0200 Merge already pushed tags I've mistakenly pushed just tags not commits commit adf4dba9db3c8e1cdc23ab718d63ea7cc0894246 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:20:31 2013 +0200 Automatic commit of package [apt-spacewalk] release [1.0.9-1]. diff --git a/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec b/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec index 4e7f8ae..1e62476 100644 --- a/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec +++ b/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec @@ -3,7 +3,7 @@ Name: apt-spacewalk Summary: Spacewalk plugin for Advanced Packaging tool. -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPLv2 Source0: https://example.com/%{name}-%{version}.tar.gz @@ -19,6 +19,9 @@ to acquire content from Spacewalk server %files %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.0.9-1 +- removed trailing whitespaces + * Thu Mar 21 2013 Jan Pazdziora 1.0.8-1 - forward port debian bugs #703207, 700821 diff --git a/rel-eng/packages/apt-spacewalk b/rel-eng/packages/apt-spacewalk index 303789c..1efea85 100644 --- a/rel-eng/packages/apt-spacewalk +++ b/rel-eng/packages/apt-spacewalk @@ -1 +1 @@ -1.0.8-1 client/debian/packages-already-in-debian/apt-transport-spacewalk/ +1.0.9-1 client/debian/packages-already-in-debian/apt-transport-spacewalk/ commit 6d40063f5a80750d2907630ecf3e28a566db4ae5 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:20:11 2013 +0200 Automatic commit of package [spacewalk-koan] release [2.1.2-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index 105d17a..831c90f 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 +- removed trailing whitespaces + * Thu Jul 25 2013 Stephen Herr <sherr(a)redhat.com> 2.1.1-1 - 988428 - Mark spacewalk-koan as correctly requiring the xz package - Bumping package versions for 2.1. diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index e7b9e6f..b4e309b 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -2.1.1-1 client/tools/spacewalk-koan/ +2.1.2-1 client/tools/spacewalk-koan/ commit ea7fbc336d64fd3fc4cecb67e8b22f5c0d9875db Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:19:49 2013 +0200 Automatic commit of package [spacewalk-certs-tools] release [2.1.3-1]. diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools index c169d5e..e9546fe 100644 --- a/rel-eng/packages/spacewalk-certs-tools +++ b/rel-eng/packages/spacewalk-certs-tools @@ -1 +1 @@ -2.1.2-1 spacewalk/certs-tools/ +2.1.3-1 spacewalk/certs-tools/ diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec index a7a91c3..213feac 100644 --- a/spacewalk/certs-tools/spacewalk-certs-tools.spec +++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec @@ -2,7 +2,7 @@ Name: spacewalk-certs-tools Summary: Spacewalk SSL Key/Cert Tool Group: Applications/Internet License: GPLv2 -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/www/html/pub/bootstrap/client_config_update.py* %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 +- removed trailing whitespaces + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 - Grammar error occurred commit 2ca651a61c71af2ee539e05ec897a17cf955bee3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:19:05 2013 +0200 Automatic commit of package [spacecmd] release [2.1.10-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 2abf9ab..d50effe 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.9-1 spacecmd/ +2.1.10-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index bd78469..d98321c 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.9 +Version: 2.1.10 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1 +- removed trailing whitespaces + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.9-1 - Fix typo, the decoded output need to be printed... commit d111766e4fcc4a77c40f5515351fd980d7f73027 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:18:33 2013 +0200 Automatic commit of package [spacewalk-proxy] release [2.1.11-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index f82c126..edce14f 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.1.10 +Version: 2.1.11 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -312,6 +312,9 @@ fi %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 +- removed trailing whitespaces + * Fri Aug 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1 - fixed pylint error diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 2f2ca38..cd4ff14 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -2.1.10-1 proxy/proxy/ +2.1.11-1 proxy/proxy/ commit cf9611c09c962cfcd0a5a9b73ebc19bccba99f81 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:18:23 2013 +0200 Automatic commit of package [smartpm] minor release [5.5.0-7]. diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec index 35a6bb9..61acc8b 100644 --- a/client/solaris/smartpm/smartpm.spec +++ b/client/solaris/smartpm/smartpm.spec @@ -11,7 +11,7 @@ Name: smartpm Source0: smartpm-%{version}.tar.gz Epoch: 1 Version: 5.5.0 -Release: 6 +Release: 7 License: GPLv2 Group: Applications/System URL: http://www.smartpm.org/ @@ -56,6 +56,9 @@ env %{__python} setup.py build %{python_sitearch}/rhn/actions/solarispkgs.py* %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.0-7 +- removed trailing whitespaces + * Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 5.5.0-6 - Fixing spelling mistakes diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm index 399b67f..15130b9 100644 --- a/rel-eng/packages/smartpm +++ b/rel-eng/packages/smartpm @@ -1 +1 @@ -5.5.0-6 client/solaris/smartpm/ +5.5.0-7 client/solaris/smartpm/ commit d86466ea4eb7c599fa7dde284ac2ce8438cb92af Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:18:03 2013 +0200 Automatic commit of package [spacewalk-proxy-installer] release [2.1.4-1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index fa9abe3..c08768c 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn %doc LICENSE answers.txt %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1 +- removed trailing whitespaces + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 - refer systemIdPath from up2date config diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index 3964a63..9e50351 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -2.1.3-1 proxy/installer/ +2.1.4-1 proxy/installer/ commit 24f38057349a5d26e3163852b172cdcd133eecc1 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:17:45 2013 +0200 Automatic commit of package [rhnclient] release [5.5.7-1]. diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec index a46b9fc..b39d5ab 100644 --- a/client/solaris/rhnclient/rhnclient.spec +++ b/client/solaris/rhnclient/rhnclient.spec @@ -5,7 +5,7 @@ Summary: Spacewalk Client Utilities and Libraries Name: rhnclient Source0: %{name}-%{version}.tar.gz -Version: 5.5.6 +Version: 5.5.7 Release: 1 License: GPLv2 Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT #%doc ChangeLog COPYING README TODO %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.7-1 +- removed trailing whitespaces + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.6-1 - Grammar error occurred diff --git a/client/solaris/rhnclient/setup.py b/client/solaris/rhnclient/setup.py index 3a90a5b..9145540 100644 --- a/client/solaris/rhnclient/setup.py +++ b/client/solaris/rhnclient/setup.py @@ -7,7 +7,7 @@ from spacewalk.common.rhnConfig import CFG, initCFG initCFG('web') setup(name = "rhnclient", - version = "5.5.6", + version = "5.5.7", description = CFG.PRODUCT_NAME + " Client Utilities and Libraries", long_description = CFG.PRODUCT_NAME + """\ Client Utilities diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient index ca06d25..2bfb144 100644 --- a/rel-eng/packages/rhnclient +++ b/rel-eng/packages/rhnclient @@ -1 +1 @@ -5.5.6-1 client/solaris/rhnclient/ +5.5.7-1 client/solaris/rhnclient/ commit d0db5c1dec96cb81b92b7ff20944db59647aeb2f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:17:03 2013 +0200 Automatic commit of package [spacewalk-search] release [2.1.1-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index d1d0309..7bca0da 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.0.1-1 search-server/spacewalk-search/ +2.1.1-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index bc13414..ea51491 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.0 +Version: 2.1.1 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1 +- removed trailing whitespaces + * Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.1-1 - Bumping package versions for 2.0. commit 524d4a819c20b4e2a198bef38784eee4ae4adcaa Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:16:39 2013 +0200 Automatic commit of package [rhncfg] release [5.10.63-1]. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index 0823090..b1259d9 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -8,7 +8,7 @@ Group: Applications/System License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.62 +Version: 5.10.63 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -120,6 +120,9 @@ fi # $Id$ %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.63-1 +- removed trailing whitespaces + * Mon Sep 23 2013 Grant Gainey <ggainey(a)redhat.com> 5.10.62-1 - 1006480 - Another problem was hidden by the previous one - Have to lay down directories to where the rhncfg-actions logfile is set - Make it clearer diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg index 1418efe..2c630bd 100644 --- a/rel-eng/packages/rhncfg +++ b/rel-eng/packages/rhncfg @@ -1 +1 @@ -5.10.62-1 client/tools/rhncfg/ +5.10.63-1 client/tools/rhncfg/ commit 3f958c2e91be9f2f9055fe12e5d966e333cfaf1b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:16:14 2013 +0200 Automatic commit of package [spacewalk-utils] release [2.1.19-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index d3220d2..6846693 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -2.1.18-1 utils/ +2.1.19-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 18e0bab..32fea63 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 2.1.18 +Version: 2.1.19 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.19-1 +- removed trailing whitespaces + * Fri Sep 27 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.18-1 - 1012963 - Don't use :table as a param-name in Oracle prepared stmts - 1012934 - Oracle prepared-stmt cannot have semicolons commit eefe651763d67aac53aea4c7eff7250ee6791cbc Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:15:55 2013 +0200 Automatic commit of package [rhn-custom-info] release [5.4.19-1]. diff --git a/client/tools/rhncustominfo/rhn-custom-info.spec b/client/tools/rhncustominfo/rhn-custom-info.spec index d47ebb2..247d501 100644 --- a/client/tools/rhncustominfo/rhn-custom-info.spec +++ b/client/tools/rhncustominfo/rhn-custom-info.spec @@ -4,7 +4,7 @@ Group: Applications/System License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk -Version: 5.4.18 +Version: 5.4.19 Release: 1%{?dist} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/rhn-custom-info.* %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.4.19-1 +- removed trailing whitespaces + * Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 5.4.18-1 - updating copyright years diff --git a/rel-eng/packages/rhn-custom-info b/rel-eng/packages/rhn-custom-info index 5f270e7..c9ea16b 100644 --- a/rel-eng/packages/rhn-custom-info +++ b/rel-eng/packages/rhn-custom-info @@ -1 +1 @@ -5.4.18-1 client/tools/rhncustominfo/ +5.4.19-1 client/tools/rhncustominfo/ commit d906118b4dd1bc22ae8aca8d638d5b352f99a381 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:15:17 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.50-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 5f30b31..e2cd294 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.49 +Version: 2.1.50 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.50-1 +- removed trailing whitespaces + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.49-1 - UserManagerTest: fix new timezone ordering - Orphaned class PushDispatcher removed diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 17b9ee3..b46ce36 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.49-1 java/ +2.1.50-1 java/ commit 99db02b76ee94c063e6db99122d85e3eb7ea02d9 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:14:58 2013 +0200 Automatic commit of package [yum-rhn-plugin] release [2.1.4-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index d7b7aa5..e1c5ac7 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,6 +1,6 @@ Summary: Spacewalk support for yum Name: yum-rhn-plugin -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -70,6 +70,9 @@ fi %doc LICENSE %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1 +- removed trailing whitespaces + * Mon Sep 09 2013 Stephen Herr <sherr(a)redhat.com> 2.1.3-1 - 1006037 - keep yum-rhn-plugins higher default timeout diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 6646077..f880dba 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -2.1.3-1 client/rhel/yum-rhn-plugin/ +2.1.4-1 client/rhel/yum-rhn-plugin/ commit 09f1d666d28dcc5d537432c9ba0bb09dd3576c9f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:14:34 2013 +0200 Automatic commit of package [rhnpush] release [5.5.69-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index 96e620c..52107f9 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -4,7 +4,7 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.68 +Version: 5.5.69 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %doc COPYING %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.69-1 +- removed trailing whitespaces + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.68-1 - Grammar error occurred diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index 5b641b8..fb3342c 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.5.68-1 client/tools/rhnpush/ +5.5.69-1 client/tools/rhnpush/ commit 01d845461f88df8ead3fb5223f24baad5472e82e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 30 16:14:17 2013 +0200 Automatic commit of package [rhnlib] release [2.5.67-1]. diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec index 14b6b6c..0ee231d 100644 --- a/client/rhel/rhnlib/rhnlib.spec +++ b/client/rhel/rhnlib/rhnlib.spec @@ -4,7 +4,7 @@ Summary: Python libraries for the Spacewalk project Name: rhnlib URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.5.66 +Version: 2.5.67 Release: 1%{?dist} Group: Development/Libraries @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.67-1 +- removed trailing whitespaces + * Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.66-1 - Grammar error occurred diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib index 8094377..a712de7 100644 --- a/rel-eng/packages/rhnlib +++ b/rel-eng/packages/rhnlib @@ -1 +1 @@ -2.5.66-1 client/rhel/rhnlib/ +2.5.67-1 client/rhel/rhnlib/

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2013