Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/common/xos_common_config b/xos/configurations/common/xos_common_config
index b06098e..f7b335e 100644
--- a/xos/configurations/common/xos_common_config
+++ b/xos/configurations/common/xos_common_config
@@ -42,3 +42,5 @@
disable_minidashboard=True
branding_name=Open Cloud
branding_icon=/static/logo.png
+branding_favicon=/static/favicon.png
+branding_bg=/static/bg.jpg
diff --git a/xos/configurations/cord/xos_cord_config b/xos/configurations/cord/xos_cord_config
index 8dd0ae5..a5448f7 100644
--- a/xos/configurations/cord/xos_cord_config
+++ b/xos/configurations/cord/xos_cord_config
@@ -1,4 +1,6 @@
[gui]
branding_name=CORD
#branding_css=/static/cord.css
-branding_icon=/static/cord_logo_3.png
+branding_icon=/static/cord-logo.png
+branding_favicon=/static/cord-favicon.png
+branding_bg=/static/cord-bg.jpg
diff --git a/xos/configurations/frontend/docker-compose.yml b/xos/configurations/frontend/docker-compose.yml
index 95dfe8a..6b71d2e 100644
--- a/xos/configurations/frontend/docker-compose.yml
+++ b/xos/configurations/frontend/docker-compose.yml
@@ -19,5 +19,7 @@
links:
- xos_db
volumes:
- - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
+ - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../../core/xoslib:/opt/xos/core/xoslib
+ - ../../core/static:/opt/xos/core/static
+ - ../../templates/admin:/opt/xos/templates/admin
diff --git a/xos/core/context_processors.py b/xos/core/context_processors.py
index 879f9c7..bb5030b 100644
--- a/xos/core/context_processors.py
+++ b/xos/core/context_processors.py
@@ -14,4 +14,6 @@
"XOS_BRANDING_NAME": settings.XOS_BRANDING_NAME,
"XOS_BRANDING_CSS": settings.XOS_BRANDING_CSS,
"XOS_BRANDING_ICON": settings.XOS_BRANDING_ICON,
+ "XOS_BRANDING_FAVICON": settings.XOS_BRANDING_FAVICON,
+ "XOS_BRANDING_BG": settings.XOS_BRANDING_BG,
"sites": allSites}
diff --git a/xos/core/static/bg_old.jpg b/xos/core/static/bg_old.jpg
deleted file mode 100644
index aba2063..0000000
--- a/xos/core/static/bg_old.jpg
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_bg.jpg b/xos/core/static/cord-bg-old.jpg
similarity index 100%
rename from xos/core/static/cord_bg.jpg
rename to xos/core/static/cord-bg-old.jpg
Binary files differ
diff --git a/xos/core/static/cord-bg.jpg b/xos/core/static/cord-bg.jpg
new file mode 100644
index 0000000..8ef0560
--- /dev/null
+++ b/xos/core/static/cord-bg.jpg
Binary files differ
diff --git a/xos/core/static/cord-favicon.png b/xos/core/static/cord-favicon.png
new file mode 100644
index 0000000..758902e
--- /dev/null
+++ b/xos/core/static/cord-favicon.png
Binary files differ
diff --git a/xos/core/static/cord-logo.png b/xos/core/static/cord-logo.png
new file mode 100644
index 0000000..c2ff252
--- /dev/null
+++ b/xos/core/static/cord-logo.png
Binary files differ
diff --git a/xos/core/static/cord_logo1.jpg b/xos/core/static/cord_logo1.jpg
deleted file mode 100644
index e841419..0000000
--- a/xos/core/static/cord_logo1.jpg
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo2.png b/xos/core/static/cord_logo2.png
deleted file mode 100644
index 2f0cae6..0000000
--- a/xos/core/static/cord_logo2.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo2_cropped_sized_96.png b/xos/core/static/cord_logo2_cropped_sized_96.png
deleted file mode 100644
index f5312d2..0000000
--- a/xos/core/static/cord_logo2_cropped_sized_96.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo2_sized.png b/xos/core/static/cord_logo2_sized.png
deleted file mode 100644
index ae01db2..0000000
--- a/xos/core/static/cord_logo2_sized.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo2_sized_96.png b/xos/core/static/cord_logo2_sized_96.png
deleted file mode 100644
index 22e7484..0000000
--- a/xos/core/static/cord_logo2_sized_96.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo_3.png b/xos/core/static/cord_logo_3.png
deleted file mode 100644
index f8b11df..0000000
--- a/xos/core/static/cord_logo_3.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo_3_cropped_sized.png b/xos/core/static/cord_logo_3_cropped_sized.png
deleted file mode 100644
index da5711d..0000000
--- a/xos/core/static/cord_logo_3_cropped_sized.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/cord_logo_3_sized.png b/xos/core/static/cord_logo_3_sized.png
deleted file mode 100644
index 9492450..0000000
--- a/xos/core/static/cord_logo_3_sized.png
+++ /dev/null
Binary files differ
diff --git a/xos/core/static/xos.css b/xos/core/static/xos.css
index f7b7d24..38a9763 100644
--- a/xos/core/static/xos.css
+++ b/xos/core/static/xos.css
@@ -652,7 +652,7 @@
.login #content-main h1 {
/*background: #EBF0F2;*/
/*background: url("open-cloud-login-themed-light.png") no-repeat scroll 40% center / 89% auto rgba(235, 240, 242, 0);*/
-background: url("cord_logo_3.png") no-repeat scroll 40% center / 89% auto rgba(235, 240, 242, 0);
+/*background: url("cord_logo_3.png") no-repeat scroll 40% center / 89% auto rgba(235, 240, 242, 0);*/
/*background-position: 40%;*/
height: 55px;
background-repeat: no-repeat;
@@ -1328,11 +1328,8 @@
}
/* SUIT CHANGES */
-.submit-row.fixed {
- bottom: 60px;
-}
-.submit-row a.deletelink {
+.form-buttons a.deletelink {
color: #fff;
background-color: #d9534f;
border-color: #d43f3a;
diff --git a/xos/templates/admin/base.html b/xos/templates/admin/base.html
index a9f0f21..5a99e0e 100644
--- a/xos/templates/admin/base.html
+++ b/xos/templates/admin/base.html
@@ -36,7 +36,7 @@
{% block blockbots %}
<meta name="robots" content="NONE,NOARCHIVE"/>
{% endblock %}
- <link rel="shortcut icon" href="{{ XOS_BRANDING_ICON }}"></head>
+ <link rel="shortcut icon" href="{{ XOS_BRANDING_FAVICON }}"></head>
{% load i18n %}
<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
<div id="dialog-placeholder">
@@ -91,7 +91,7 @@
</button>
{% block logo %}
<a href="{% url 'admin:index' %}" class="visible-xs">
- <img class="logo" src="{% static 'cord_logo_3.png' %}"/>
+ <img class="logo" src="{% static XOS_BRANDING_ICON %}"/>
</a>
{% endblock %}
<!-- <div id="branding">
diff --git a/xos/templates/admin/base_login.html b/xos/templates/admin/base_login.html
index 5532e8c..c56bbc2 100644
--- a/xos/templates/admin/base_login.html
+++ b/xos/templates/admin/base_login.html
@@ -1,45 +1,54 @@
-{% load admin_static %}<!DOCTYPE html>
+{% load admin_static %}
+<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-<head>
-<title>{% block title %}{% endblock %}</title>
-<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
-{% block extrastyle %}{% endblock %}
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.css" %}{% endblock %}" /><![endif]-->
-{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
-<script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
-{% block extrahead %}{% endblock %}
-{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
-</head>
+ <head>
+ <title>{% block title %}{% endblock %}</title>
+ <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
+ {% block extrastyle %}
+
+ {% endblock %}
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.css" %}{% endblock %}" />
+ <![endif]-->
+ {% if LANGUAGE_BIDI %}
+ <link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />
+ {% endif %}
+ <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
+ {% block extrahead %}
+
+ {% endblock %}
+ {% block blockbots %}
+ <meta name="robots" content="NONE,NOARCHIVE" />
+ {% endblock %}
+ <link rel="shortcut icon" href="{{ XOS_BRANDING_FAVICON }}"></head>
+ </head>
{% load i18n %}
-<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
+ <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}" style="background-image: url('{{ XOS_BRANDING_BG }}') ">
-<!-- Container -->
+ <!-- Container -->
+
+ {% block messages %}
+ {% if messages %}
+ <ul class="messagelist">{% for message in messages %}
+ <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+ {% endfor %}</ul>
+ {% endif %}
+ {% endblock messages %}
-
-
- {% block messages %}
- {% if messages %}
- <ul class="messagelist">{% for message in messages %}
- <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
- {% endfor %}</ul>
- {% endif %}
- {% endblock messages %}
+ {% block pretitle %}{% endblock %}
+ {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
+ {% block content %}
+ {% block object-tools %}{% endblock %}
+ {{ content }}
+ {% endblock %}
+ {% block sidebar %}{% endblock %}
+ <br class="clear" />
- {% block pretitle %}{% endblock %}
- {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
- {% block content %}
- {% block object-tools %}{% endblock %}
- {{ content }}
- {% endblock %}
- {% block sidebar %}{% endblock %}
- <br class="clear" />
+ {% block footer %}<div id="footer"></div>{% endblock %}
- {% block footer %}<div id="footer"></div>{% endblock %}
-
-
-</body>
+ </body>
</html>
diff --git a/xos/templates/admin/submit_line.html b/xos/templates/admin/submit_line.html
index dcac235..8c0e112 100644
--- a/xos/templates/admin/submit_line.html
+++ b/xos/templates/admin/submit_line.html
@@ -1,9 +1,9 @@
{% load i18n %}
-<div class="submit-row clearfix">
- {% if show_save %}<button type="submit" class="btn btn-high btn-info" name="_save">{% trans 'Save' %}</button>{% endif %}
- {% if show_save_and_continue %}<button type="submit" name="_continue" class=" btn btn-high">{% trans 'Save and continue editing' %}</button>{% endif %}
- {% if show_save_as_new %}<button type="submit" name="_saveasnew" class="btn">{% trans 'Save as new' %}</button>{%endif%}
- {% if show_save_and_add_another %}<button type="submit" name="_addanother" class="btn">{% trans 'Save and add another' %}</button>{% endif %}
+<div class="form-buttons clearfix">
+ {% if show_save %}<button type="submit" class="btn btn-high btn-success" name="_save">{% trans 'Save' %}</button>{% endif %}
+ {% if show_save_and_continue %}<button type="submit" name="_continue" class=" btn btn-high btn-info">{% trans 'Save and continue editing' %}</button>{% endif %}
+ {% if show_save_as_new %}<button type="submit" name="_saveasnew" class="btn btn-info">{% trans 'Save as new' %}</button>{%endif%}
+ {% if show_save_and_add_another %}<button type="submit" name="_addanother" class="btn btn-info">{% trans 'Save and add another' %}</button>{% endif %}
{% if show_delete_link %}
{% if custom_delete_url %}
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index 3792224..a6313cf 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -231,7 +231,10 @@
XOS_BRANDING_NAME = getattr(config, "gui_branding_name", "OpenCloud")
XOS_BRANDING_CSS = getattr(config, "gui_branding_css", None)
-XOS_BRANDING_ICON = getattr(config, "gui_branding_icon", "/static/favicon.png")
+XOS_BRANDING_ICON = getattr(config, "gui_branding_icon", "/static/logo.png")
+XOS_BRANDING_FAVICON = getattr(config, "gui_branding_favicon", "/static/favicon.png")
+XOS_BRANDING_BG = getattr(config, "gui_branding_bg", "/static/bg.png")
+
DISABLE_MINIDASHBOARD = getattr(config, "gui_disable_minidashboard", False)
ENCRYPTED_FIELDS_KEYDIR = XOS_DIR + '/private_keys'
diff --git a/xos/xos_configuration/xos_common_config b/xos/xos_configuration/xos_common_config
index df30b54..2855816 100755
--- a/xos/xos_configuration/xos_common_config
+++ b/xos/xos_configuration/xos_common_config
@@ -42,3 +42,4 @@
disable_minidashboard=True
branding_name=Open Cloud
branding_icon=/static/logo.png
+branding_favicon=/static/favicon.png
