client/tools rel-eng/packages
by Tomáš Kašpárek
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/
10 years, 5 months
client/tools
by Tomáš Kašpárek
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
10 years, 5 months
Changes to 'refs/tags/spacewalk-search-2.1.4-1'
by Tomas Lestach
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(-)
---
10 years, 5 months
rel-eng/packages search-server/spacewalk-search
by Tomas Lestach
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
10 years, 5 months
search-server/spacewalk-search
by Tomas Lestach
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) {
10 years, 5 months
Changes to 'refs/tags/spacewalk-backend-2.1.33-1'
by mkollar
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(-)
---
10 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by mkollar
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/
10 years, 5 months
10 commits - backend/server rel-eng/download-koji.sh
by mkollar
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
10 years, 5 months
Branch 'bootstrap-css' - 29 commits - branding/css branding/fonts java/code
by Silvio Moioli
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>
<!-- Systems-list -->
<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 />
- <!-- Reuse the form opened by the list tag -->
- <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 />
+ <!-- Reuse the form opened by the list tag -->
+ <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>
   <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">
-<!-- create file to channel -->
-<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">
+ <!-- create file to channel -->
+ <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 @@
<!-- Properties of the channel itself -->
-<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 @@
<!-- Summary info for a specific channel -->
<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">
<!-- Channel Name -->
<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 @@
<!-- Summary info for a specific channel -->
<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>
<!-- Adding recent events -->
<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}¶ms=${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}¶ms=${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>
-
-
- <!-- Patch stuff -->
- <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>
-
-
-
-
- <!-- Patch Set stuff -->
- <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>
-
-
-
-
- <!-- RPM stuff -->
- <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>
+ <!-- Patch stuff -->
+ <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>
+ <!-- Patch Set stuff -->
+ <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>
+ <!-- RPM stuff -->
+ <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">
<hr />
<input type="submit" name="dispatch"
value="<bean:message key="distchannelmap.jsp.update"/>" />
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 28a8d6e..9bb94ab 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
@@ -59,7 +59,7 @@
</tr>
</table>
- <div align="right">
+ <div class="text-right">
<hr />
<html:submit disabled="${empty dcmap.org}"><bean:message key="distchannelmap.jsp.delete.submit"/></html:submit>
<html:hidden property="dcm" value="${dcmap.id}" />
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
index 42588fc..12f6c52 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
@@ -58,7 +58,7 @@
</rl:column>
</rl:list>
- <div align="right">
+ <div class="text-right">
<hr />
<input type="submit" name="dispatch"
value="<bean:message key="confirm"/>" />
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
index 4981f8d..6882127 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
@@ -68,7 +68,7 @@
<rl:csv dataset="pageList"
name="packageList"
exportColumns="id, nvrea, provider" />
- <div align="right">
+ <div class="text-right">
<hr />
<input type="submit" name="confirm"
value="<bean:message key="channel.jsp.package.removebutton"/>" />
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 115b761..6e7a39c 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
@@ -78,7 +78,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.manage.package.delete"/>" />
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index a4093e9..0cc2728 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.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.button-sync"/>" <c:if test="${inactive}">disabled="disabled"</c:if>/>
@@ -53,7 +53,7 @@
<jsp:param name="widget" value="date"/>
</jsp:include>
- <div align="right">
+ <div class="text-right">
<input type="submit" name="dispatch" <c:if test="${inactive}">disabled="disabled"</c:if>
value="<bean:message key="schedule.button"/>" />
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
index d767ead..48e98c3 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
@@ -80,7 +80,7 @@
</rl:list>
<hr />
- <div align="right"><html:submit property="dispatch"><bean:message key="basesub.jsp.confirmSubscriptions"/></html:submit></div>
+ <div class="text-right"><html:submit property="dispatch"><bean:message key="basesub.jsp.confirmSubscriptions"/></html:submit></div>
</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
index cd987cd..4b3139b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
@@ -58,7 +58,7 @@
</rl:list>
<hr />
- <div align="right"><html:submit property="dispatch"><bean:message key="ssmchildsubconfirm.jsp.submit"/></html:submit></div>
+ <div class="text-right"><html:submit property="dispatch"><bean:message key="ssmchildsubconfirm.jsp.submit"/></html:submit></div>
</rl:listset>
</body>
</html>
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 7dc197d..969856b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
@@ -25,7 +25,7 @@
<table width="100%">
<tr>
<td width="50%"><strong>${parent.name}</strong></td>
- <td align="right">
+ <td class="text-right">
<c:choose>
<c:when test="${parent.systemCount == 1}">
<a href="/rhn/channels/ChannelSubscribers.do?cid=${parent.id}"><strong><bean:message key="ssmchildsubs.jsp.one-system"/></strong></a>
@@ -68,7 +68,7 @@
</c:forEach>
</table>
<hr />
- <div align="right"><html:submit property="dispatch"><bean:message key="ssmchildsubs.jsp.alter"/></html:submit></div>
+ <div class="text-right"><html:submit property="dispatch"><bean:message key="ssmchildsubs.jsp.alter"/></html:submit></div>
</rl:listset>
</body>
</html>
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 8587501..f1cb895 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
@@ -134,7 +134,7 @@
<p/>
<html:form method="post" action="/channel/ssm/BaseChannelSubscribe.do">
- <div align="right">
+ <div class="text-right">
<rhn:csrf />
<html:hidden property="submitted" value="true"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
index 3e70107..d6d9cd8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
@@ -55,7 +55,7 @@
</rl:list>
</div>
-<div align="right">
+<div class="text-right">
<rhn:submitted/>
<hr/>
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 497b102..792d4fb 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
@@ -143,6 +143,6 @@
</table>
<hr />
- <div align="right"><html:submit>
+ <div class="text-right"><html:submit>
<bean:message key="addfiles.jsp.create.jspf.submit" />
</html:submit></div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
index c0a07bb..671697b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
@@ -30,7 +30,7 @@
</rhn:listdisplay>
</rhn:list>
<hr />
- <div align="right">
+ <div class="text-right">
<html:submit property="dispatch">
<bean:message key="addfiles.jsp.import.jspf.submit" />
</html:submit>
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 7589b78..01914c9 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
@@ -12,7 +12,7 @@
<td><html:textarea property="cofDescription" rows="4" cols="40"></html:textarea></td>
</tr>
</table>
- <div align="right">
+ <div class="text-right">
<hr />
<html:submit>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
index 53d126d..706a52f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
@@ -43,7 +43,7 @@
</rl:list>
<c:if test = "${not empty requestScope.pageList}">
<hr />
- <div align="right">
+ <div class="text-right">
<input type="submit"
name="dispatch"
value="${rhn:localize('copy2channels.jsp.doCopy')}"
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 cf13b69..3bd9028 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
@@ -93,7 +93,7 @@
</rhn:require>
</div>
<hr />
- <div align="right">
+ <div class="text-right">
<html:submit property="dispatch"><bean:message key="deploy.jsp.deploybutton" /></html:submit>
</div>
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 150b4aa..2bab2d7 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
@@ -62,7 +62,7 @@
</tr>
</table>
<hr />
- <div align="right"><html:submit property="dispatch">
+ <div class="text-right"><html:submit property="dispatch">
<bean:message key="deploy.jsp.deploybutton" />
</html:submit></div>
</c:when>
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 6aa6999..46fda67 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
@@ -13,7 +13,7 @@
</td>
</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/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 2662ea4..f4125fb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@ -34,7 +34,7 @@
</tr>
</table>
-<div align="right">
+<div class="text-right">
<hr />
<html:submit property="dispatch">
<bean:message key="${button}" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
index ed66a07..623a338 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
@@ -2,7 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<c:if test="${not empty requestScope.dataset}">
-<div align="right">
+<div class="text-right">
<rhn:submitted/>
<hr/>
<c:if test="${not requestScope.normal}" >
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
index 9d729d2..5a91025 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
@@ -31,7 +31,7 @@
<c:if test="${not empty requestScope.pageList}">
<rhn:require acl="user_role(org_admin) or user_role(system_group_admin)">
-<div align="right">
+<div class="text-right">
<rhn:submitted/>
<hr/>
<input type="submit"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
index 5f60fd2..379b555 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
@@ -52,7 +52,7 @@
</rl:list>
- <div align="right">
+ <div class="text-right">
<hr />
<input type="submit" name="confirm"
value="<bean:message key="message.Update"/>" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
index 3f17145..5620509 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
@@ -103,7 +103,7 @@
<rl:csv dataset="pageList"
name="groupList"
exportColumns="id, name, groupAdmins, serverCount, monitoringStatus" />
-<div align="right">
+<div class="text-right">
<hr />
<input type="submit" name="union" value="${rhn:localize('grouplist.jsp.union')}" />
<input type="submit" name="intersection" value="${rhn:localize('grouplist.jsp.intersection')}" />
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 e7814ce..4e99b8e 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
@@ -59,7 +59,7 @@
</div>
<rhn:require acl="user_role(org_admin) or user_role(system_group_admin)">
-<div align="right">
+<div class="text-right">
<rhn:submitted/>
<hr/>
<input type="submit"
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 99b1f57..f2d8cc2 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
@@ -71,6 +71,6 @@
<hr/>
-<div align="right">
+<div class="text-right">
<rhn:submit valueKey="preferences.jsp.submitvalue"/>
</div>
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 2e79ee4..4a8601c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
@@ -52,7 +52,7 @@
</rhn:list>
<c:if test="${not empty requestScope.pageList}">
<hr />
- <div align="right">
+ <div class="text-right">
<rhn:require acl="config_channel_editable(channel.id)"
mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler">
<html:submit property="dispatch"><bean:message key="channelfiles.jsp.removeselected" /></html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
index fcb63df..7ff219f 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
@@ -40,7 +40,7 @@
</rl:column>
</rl:list>
<hr />
- <div align="right">
+ <div class="text-right">
<input type="submit"
name="dispatch"
value="${rhn:localize('copy2systems.jsp.doCopy')}"
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 0aa05e4..af6f3a2 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp
@@ -24,7 +24,7 @@
<td><strong>${currChannel.description}</strong></td>
</tr>
</table>
- <div align="right">
+ <div class="text-right">
<hr />
<html:submit>
<bean:message key="channelOverview.jsp.deleteChannel" />
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 610bee1..f57c82b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
@@ -45,7 +45,7 @@
</rhn:list>
<c:if test="${not empty requestScope.pageList}">
<hr />
- <div align="right">
+ <div class="text-right">
<html:submit property="dispatch"><bean:message key="deploy.jsp.deployallbutton" /></html:submit>
<html:submit property="dispatch"><bean:message key="deploy.jsp.deployselectedbutton" /></html:submit>
</div>
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 7720135..4299c91 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -93,7 +93,7 @@
</tr>
</table>
<!-- DoIt Button -->
- <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">
<!-- Channel Name -->
<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 @@
<!-- Summary info for a specific channel -->
<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>
<!-- Adding recent events -->
<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}¶ms=${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}¶ms=${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
10 years, 5 months
java/code
by Michael Mraka
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 {
10 years, 5 months