Merge branch 'master' of github.com:open-cloud/xos
diff --git a/gui/.yo-rc.json b/gui/.yo-rc.json
new file mode 100644
index 0000000..33606db
--- /dev/null
+++ b/gui/.yo-rc.json
@@ -0,0 +1,6 @@
+{
+ "generator-xos": {
+ "name": "sampleView",
+ "folder": "ngXosViews"
+ }
+}
\ No newline at end of file
diff --git a/xos/core/static/xos.css b/xos/core/static/xos.css
index 685361e..f7b7d24 100644
--- a/xos/core/static/xos.css
+++ b/xos/core/static/xos.css
@@ -310,6 +310,14 @@
}
/************************* END NAV *************************/
+/************************* FORM TWEAKS *************************/
+@media (min-width: 992px){
+ .form-column.col-lg-4 {
+ width: 66.66666667%;
+ }
+}
+/************************* FORM TWEAKS *************************/
+
/* CSS for jquery Tabs */
#hometabs {
border-bottom: 1px solid #105E9E;
diff --git a/xos/templates/admin/base.html b/xos/templates/admin/base.html
index f049da9..a9f0f21 100644
--- a/xos/templates/admin/base.html
+++ b/xos/templates/admin/base.html
@@ -66,7 +66,8 @@
<a href="{% url 'admin:index' %}" class="hidden-xs">
<img class="logo" src="{% static XOS_BRANDING_ICON %}"/>
</a>
- {% include 'suit/menu.html' %}
+ <!--{% include 'suit/menu.html' %}-->
+ {% include 'admin/menu.html' %}
<button class="navbar-toggle collapsed visible-xs" type="button">
<i class="glyphicon glyphicon-arrow-left"></i>
</button>
diff --git a/xos/templates/admin/menu.html b/xos/templates/admin/menu.html
new file mode 100644
index 0000000..e1176e3
--- /dev/null
+++ b/xos/templates/admin/menu.html
@@ -0,0 +1,52 @@
+{#{% load sitetree %}#}
+{% load i18n suit_menu suit_tags %}
+{% load url from future %}
+
+{% with menu_position='menu_position'|suit_conf %}
+<ul class="nav nav-suit-menu nav-pills{% if menu_position == 'vertical' %} nav-stacked {% endif %}">
+ {% block menu_home %}
+ {% url 'admin:index' as index_url %}
+ <li{% if index_url == request.path %} class="active"{% endif %}>
+ <a href="{{ index_url }}"><i class="icon-home"></i>{% trans 'Home' %}
+ </a>
+ </li>
+ {% endblock %}
+
+ {% get_menu request as app_list %}
+ {% if app_list %}
+ {% for app in app_list %}
+ {% if app.separator %}
+ <li class="separator"></li>
+ {% else %}
+ <li{{ app.is_active|yesno:' class=active,' }}>
+ <a href="{{ app.url }}"{{ app.blank|yesno:' target=_blank,' }}>
+ <i class="{% firstof app.icon 'icon-chevron-right' %}"></i>
+ {% trans app.label|capfirst %}
+ </a>
+ {% if app.models and not app.is_active %}
+ <ul class="nav nav-pills nav-stacked">
+ {% for model in app.models %}
+ <li{{ model.is_active|yesno:' class=active,' }}>
+ <a href="{{ model.url }}"{{ model.blank|yesno:' target=_blank,' }}>{{ model.label }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+</ul>
+{% if app_list and menu_position == 'horizontal' %}
+ {% get_sub_menu app_list as active_app_nodels %}
+ <ul class="nav nav-suit-sub-menu nav-pills">
+ {% if active_app_nodels %}
+ {% for model in active_app_nodels %}
+ <li{{ model.is_active|yesno:' class=active,' }}>
+ <a href="{{ model.url }}"{{ model.blank|yesno:' target=_blank,' }}>{{ model.label }}</a>
+ </li>
+ {% endfor %}
+ {% endif %}
+ </ul>
+ {% endif %}
+{% endwith %}
\ No newline at end of file