summaryrefslogtreecommitdiff
path: root/design/templates
diff options
context:
space:
mode:
Diffstat (limited to 'design/templates')
-rw-r--r--design/templates/admin/base.html176
-rw-r--r--design/templates/admin/buttons.html8
-rw-r--r--design/templates/admin/index.html141
-rw-r--r--design/templates/archives/map.html9
-rw-r--r--design/templates/oldbase.html86
5 files changed, 151 insertions, 269 deletions
diff --git a/design/templates/admin/base.html b/design/templates/admin/base.html
index 3ed4858..455d0d2 100644
--- a/design/templates/admin/base.html
+++ b/design/templates/admin/base.html
@@ -1,119 +1,79 @@
-{% load admin_static %}{% load url from future %}{% load i18n grp_tags %}
-<!DOCTYPE html>
-<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% comment %}{% if LANGUAGE_BIDI %}dir="rtl"{% endif %}{% endcomment %}>
+{% load admin_static %}<!DOCTYPE html>
+<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
- <title>{% block title %}{% endblock %}</title>
- <meta charset="utf-8" />
- {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
- <!-- STYLESHEETS -->
- {% block stylesheets %}
- <link href="{% static "grappelli/jquery/ui/css/custom-theme/jquery-ui-1.8.18.custom.css" %}" rel="stylesheet" type="text/css" media="screen" />
- <link href="{% static "grappelli/stylesheets/screen.css" %}" rel="stylesheet" type="text/css" media="screen" />
- <link href="{% static "grappelli/stylesheets/mueller/grid/output.css" %}" rel="stylesheet" type="text/css" media="screen" />
- {% comment %}{% if LANGUAGE_BIDI %}<link href="{% block stylesheet_rtl %}{% static "grappelli/css/rtl.css" %}{% endblock %}" rel="stylesheet" type="text/css" media="screen" />{% endif %}{% endcomment %}
- {% endblock %}
- <!-- EXTRASTYLES -->
- {% block extrastyle %}{% endblock %}
- <!-- JAVASCRIPTS -->
- {% block javascripts %}
- <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "grappelli/" %}{% endfilter %}";</script>
- <script type="text/javascript" charset="utf-8">
- // GLOBALS
- var grappelli = {},
- ADMIN_URL = "{% url 'admin:index' %}",
- MODEL_URL_ARRAY = {% get_content_types %},
- DATE_FORMAT = "{% get_date_format %}",
- TIME_FORMAT = "{% get_time_format %}",
- DATETIME_FORMAT = "{% get_datetime_format %}";
- </script>
- <!-- jQuery, jQuery-UI -->
- <script src="{% static "grappelli/jquery/jquery-1.7.2.min.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/jquery/ui/js/jquery-ui-1.8.18.custom.min.js" %}" type="text/javascript"></script>
- {% if debug %}
- <!-- Grappelli Main JS -->
- <script src="{% static "grappelli/js/grappelli.js" %}" type="text/javascript"></script>
- <!-- Grappelli jQuery Plugins, Widgets -->
- <script src="{% static "grappelli/js/jquery.grp_collapsible.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_collapsible_group.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_timepicker.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_related_fk.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_related_m2m.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_related_generic.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_autocomplete_fk.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_autocomplete_m2m.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_autocomplete_generic.js" %}" type="text/javascript"></script>
- <script src="{% static "grappelli/js/jquery.grp_inline.js" %}" type="text/javascript"></script>
- {% else %}
- <!-- Grappelli Minified -->
- <script src="{% static "grappelli/js/grappelli.min.js" %}" type="text/javascript"></script>
- {% endif %}
- {% endblock %}
- <!-- EXTRAHEAD -->
- {% block extrahead %}{% endblock %}
+<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>
-<body {%block onload%}{%endblock%} class="{% if is_popup %}grp-popup {% endif %}{% block bodyclass %}{% endblock %}">
- <div id="grp-container">
+{% load i18n %}
- <!-- HEADER -->
- <header id="grp-header" class="{% block header-class %}{% endblock %}">
- {% if not is_popup %}
+<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}"{% block onload %}{% endblock %}>
- <!-- NAVIGATION -->
- {% include "admin/includes_grappelli/header.html" %}
-
- <!-- CONTEXT NAVIGATION -->
- <div id="grp-context-navigation">
- <nav id="grp-breadcrumbs" class="{% block breadcrumbs-class %}{% endblock %}">
- <header style="display:none"><h1>Breadcrumbs</h1></header>
- {% block breadcrumbs %}
- <ul>
- <li><a href="/">{% trans 'Home' %}</a></li>
- {% if title %}
- <li> &rsaquo; {{ title }}</li>
- {% endif %}
- </ul>
- {% endblock %}
- </nav>
- <nav id="grp-page-tools">
- <header style="display:none"><h1>Page Tools</h1></header>
- {% block page-tools %}{% endblock %}
- </nav>
- </div>
- {% endif %}
- </header>
+<!-- Container -->
+<div id="container">
- <!-- CONTENT -->
- <article id="grp-content" class="{% block content-class %}{% endblock %}">
-
- <!-- MESSAGES -->
- {% if messages %}
- <ul class="grp-messagelist">
- {% for message in messages %}
- <li{% if message.tags %} class="grp-{{ message.tags }}"{% endif %}>{{ message }}</li>
- {% endfor %}
- </ul>
- {% endif %}
+ {% if not is_popup %}
+ <!-- Header -->
+ <div id="header">
+ <div id="branding">
+ {% block branding %}{% endblock %}
+ </div>
+ {% if user.is_active and user.is_staff %}
+ <div id="user-tools">
+ {% trans 'Welcome,' %}
+ <strong>{% filter force_escape %}{% firstof user.get_short_name user.get_username %}{% endfilter %}</strong>.
+ {% block userlinks %}
+ {% url 'django-admindocs-docroot' as docsroot %}
+ {% if docsroot %}
+ <a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /
+ {% endif %}
+ {% if user.has_usable_password %}
+ <a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a> /
+ {% endif %}
+ <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
+ {% endblock %}
+ </div>
+ {% endif %}
+ {% block nav-global %}{% endblock %}
+ </div>
+ <!-- END Header -->
+ {% block breadcrumbs %}
+ <div class="breadcrumbs">
+ <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+ {% if title %} &rsaquo; {{ title }}{% endif %}
+ </div>
+ {% endblock %}
+ {% endif %}
- <!-- CONTENT TITLE -->
- <header id="grp-content-title">
- {% block pretitle %}{% endblock %}
- {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
- {% block object-tools %}{% endblock %}
- </header>
+ {% 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 %}
- <!-- CONTENT-CONTAINER -->
- <div id="grp-content-container">
- {% block content %}
- {{ content }}
- {% block filters %}{% endblock %}
- {% endblock %}
- </div>
+ <!-- Content -->
+ <div id="content" class="{% block coltype %}colM{% endblock %}">
+ {% 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" />
+ </div>
+ <!-- END Content -->
- </article>
-
- <!-- FOOTER -->
- {% block footer %}{% endblock %}
+ {% block footer %}<div id="footer"></div>{% endblock %}
+</div>
+<!-- END Container -->
- </div>
</body>
</html>
diff --git a/design/templates/admin/buttons.html b/design/templates/admin/buttons.html
index e1a7a98..9bd6f00 100644
--- a/design/templates/admin/buttons.html
+++ b/design/templates/admin/buttons.html
@@ -14,25 +14,23 @@
.item a {
min-width: 150px;
font-size: 110%;
- border: 1px solid #BDBDBD !important;
position: relative;
display: inline-block;
margin: 0px;
padding: 5px;
height: 28px;
font-weight: bold;
- border-radius: 5px 5px 5px 5px !important;
-moz-box-sizing: border-box;
cursor: pointer;
overflow: hidden;
vertical-align: top;
color: rgb(255, 255, 255);
- border: 1px solid rgb(43, 138, 171);
- background-image: linear-gradient(rgb(79, 178, 211), rgb(48, 155, 191));
+ border: 2px solid rgb(91, 128, 178);
+ background: url("../img/default-bg.gif") repeat-x scroll center bottom rgb(124, 160, 199);
}
</style>
- <div class="g-d-6">
+ <div class="module" id="recent-actions-module">
<div class="grp-module" id="grp-recent-actions-module">
<h2>Publish Site</h2>
{% if message %}
diff --git a/design/templates/admin/index.html b/design/templates/admin/index.html
index cbb2904..cbaa89f 100644
--- a/design/templates/admin/index.html
+++ b/design/templates/admin/index.html
@@ -1,79 +1,86 @@
{% extends "admin/base_site.html" %}
+{% load i18n admin_static %}
-<!-- LOADING -->
-{% load i18n grp_tags log %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
-<!-- JAVASCRIPTS -->
-{% block javascripts %}
- {{ block.super }}
-{% endblock %}
+{% block coltype %}colMS{% endblock %}
-<!-- COLTYPE/BODYCLASS-- >
{% block bodyclass %}dashboard{% endblock %}
-{% block content-class %}content-grid{% endblock %}
-
-<!-- BREADCRUMBS -->
-{% block breadcrumbs %}
- <ul class="grp-horizontal-list">
- <li>{% trans "Home" %}</li>
- </ul>
-{% endblock %}
-{% block content_title %}
- {% if title %}
- <header><h1>{{ title }}</h1></header>
- {% endif %}
-{% endblock %}
+{% block breadcrumbs %}{% endblock %}
-<!-- CONTENT -->
{% block content %}
- <div class="g-d-c">
- <div class="g-d-12 g-d-f">
- {% for app in app_list %}
- <div class="grp-module" id="app_{{ app.name|lower }}">
- <h2><a href="{{ app.app_url }}" class="grp-section">{% trans app.name %}</a></h2>
- {% for model in app.models %}
- <div class="grp-row">
- {% if model.perms.change %}<a href="{{ model.admin_url }}"><strong>{{ model.name }}</strong></a>{% else %}<span><strong>{{ model.name }}</strong></span>{% endif %}
- {% if model.perms.add or model.perms.change %}
- <ul class="grp-actions">
- {% if model.perms.add %}<li class="grp-add-link"><a href="{{ model.admin_url }}add/">{% trans 'Add' %}</a></li>{% endif %}
- {% if model.perms.change %}<li class="grp-change-link"><a href="{{ model.admin_url }}">{% trans 'Change' %}</a></li>{% endif %}
- </ul>
- {% endif %}
- </div>
- {% endfor %}
- </div>
- {% empty %}
- <p>{% trans "You don´t have permission to edit anything." %}</p>
- {% endfor %}
+<div id="content-main">
+
+{% if app_list %}
+ {% for app in app_list %}
+ <div class="module">
+ <table>
+ <caption>
+ <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">
+ {% blocktrans with name=app.name %}{{ name }}{% endblocktrans %}
+ </a>
+ </caption>
+ {% for model in app.models %}
+ <tr>
+ {% if model.admin_url %}
+ <th scope="row"><a href="{{ model.admin_url }}">{{ model.name }}</a></th>
+ {% else %}
+ <th scope="row">{{ model.name }}</th>
+ {% endif %}
+
+ {% if model.add_url %}
+ <td><a href="{{ model.add_url }}" class="addlink">{% trans 'Add' %}</a></td>
+ {% else %}
+ <td>&nbsp;</td>
+ {% endif %}
+
+ {% if model.admin_url %}
+ <td><a href="{{ model.admin_url }}" class="changelink">{% trans 'Change' %}</a></td>
+ {% else %}
+ <td>&nbsp;</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </table>
</div>
+ {% endfor %}
+{% else %}
+ <p>{% trans "You don't have permission to edit anything." %}</p>
+{% endif %}
+</div>
+{% endblock %}
+
+{% block sidebar %}
+
+<div id="content-related">
{% include 'admin/buttons.html' %}
- <div class="g-d-6 g-d-l">
- <div class="grp-module" id="grp-recent-actions-module">
- <h2>{% trans 'Recent Actions' %}</h2>
- <div class="grp-module">
- <h3>{% trans 'My Actions' %}</h3>
- {% get_admin_log 10 as admin_log for_user user %}
- {% if not admin_log %}
- <p>{% trans 'None available' %}</p>
- {% else %}
- <ul class="grp-listing-small">
- {% for entry in admin_log %}
- <li class="grp-row{% if entry.is_addition %} grp-add-link{% endif %}{% if entry.is_change %} grp-change-link{% endif %}{% if entry.is_deletion %} grp-delete-link{% endif %}">
- {% if entry.is_deletion %}
- <span>{{ entry.object_repr }}</span>
- {% else %}
- <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
- {% endif %}
- <span class="grp-font-color-quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span>
- </li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
- </div>
- </div>
+ <div class="module" id="recent-actions-module">
+ <h2>{% trans 'Recent Actions' %}</h2>
+ <h3>{% trans 'My Actions' %}</h3>
+ {% load log %}
+ {% get_admin_log 10 as admin_log for_user user %}
+ {% if not admin_log %}
+ <p>{% trans 'None available' %}</p>
+ {% else %}
+ <ul class="actionlist">
+ {% for entry in admin_log %}
+ <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
+ {% if entry.is_deletion or not entry.get_admin_url %}
+ {{ entry.object_repr }}
+ {% else %}
+ <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
+ {% endif %}
+ <br/>
+ {% if entry.content_type %}
+ <span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span>
+ {% else %}
+ <span class="mini quiet">{% trans 'Unknown content' %}</span>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
</div>
+</div>
{% endblock %}
-
diff --git a/design/templates/archives/map.html b/design/templates/archives/map.html
index c36817a..76713df 100644
--- a/design/templates/archives/map.html
+++ b/design/templates/archives/map.html
@@ -57,7 +57,10 @@ Google Maps code
</ul>
</div>
</section>
- <!--<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.min.js"></script>-->
+ {% endblock %}
+{% block js %}
<script type="text/javascript" src="{{MEDIA_URL}}js/leaflet-providers.js"></script>
-<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.js"></script>
-{% endblock %}
+<!--<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.js"></script>-->
+<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.min.js"></script>
+{% endblock%}
+
diff --git a/design/templates/oldbase.html b/design/templates/oldbase.html
deleted file mode 100644
index ecf2a5c..0000000
--- a/design/templates/oldbase.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7 ]> <html lang="en" class="ie ie6"> <![endif]-->
-<!--[if IE 7 ]> <html lang="en" class="ie ie7"> <![endif]-->
-<!--[if IE 8 ]> <html lang="en" class="ie ie8"> <![endif]-->
-<!--[if IE 9 ]> <html lang="en" class="ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
-<head>
- <title>{% block pagetitle %}Luxagraf - Topografical Writings{% endblock %}</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <!--[if IE]>
- <script src="{{MEDIA_URL}}js/html5.js"></script>
- <![endif]-->
- <link rel="alternate"
- type="application/rss+xml"
- title="RSS 2.0"
- href="http://feeds2.feedburner.com/luxagraf/blog">
- <link rel="stylesheet"
- href="{{MEDIA_URL}}css/base.css"
- media="screen">
- <link rel="stylesheet"
- href="{{MEDIA_URL}}css/print.css"
- media="print">{%block stylesheet%}{%endblock%}
- <link rel="shortcut icon"
- href="http://media.luxagraf.net/img/favicon.ico"
- type="image/vnd.microsoft.icon">
- <link rel="apple-touch-icon"
- href="http://media.luxagraf.net/img/luxagrafiphoneicon.png">
- <meta name="author" content="luxagraf">
- <meta name="description"
- content="{% block metadescription %}Luxagraf: a travelogue of sorts, Recording journeys around the world and just next door.{% endblock %}">
- <meta name="keywords"
- content="luxagraf writing travel authors philosophy ramblings">
- <meta name="copyright"
- content="Licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License">
- {%block extrahead%}{%endblock%}
-</head>
-
-<body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}>
- <header>
- <hgroup>
- <h1><a id="logo" href="/" title="home">Luxagraf</a></h1>
- <h2><a href="/about/" title="About Luxagraf">{a travelogue}</a></h2>
- </hgroup>
- <nav>
- <ul>
- <li id="stories"><a href="/writing/1/" title="An archive of writings from around the world">Writing</a>,</li>
- <li id="photos"><a href="/photos/1/" title="Photos from travels around the world">Photos</a>,</li>
- <li id="maps"><a href="/map/" title="Maps and miscellanea">Maps</a>,</li>
- <li id="projects" ><a href="/projects/" title="Luxagraf: Projects (coming soon)">Projects</a>,</li>
- <li id="etc"><a href="/about/" title="About Luxagraf">Etc</a></li>
- </ul>
- </nav>
- </header>
- {% block primary %}
- <article>
-
- </article>
- {% endblock %}
- {% block extrabody %} {% endblock %}
-
- <div class="clearfix"></div>
- <footer>
- <section id="license">
- <p>All content licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" title="read the Attribution-Noncommercial-Share Alike 3.0 deed">details</a>). <span>Built with <a href="http://geodjango.org/" title="a GeoDjango joint">GeoDjango</a> and hosted on <a href="http://www.webfaction.com/" title="webfaction">Webfaction</a>.</span></p>
- </section>
- <nav>
- <ul>
- <li><a href="http://feeds2.feedburner.com/luxagraf/blog" title="RSS feed">RSS</a></li>
- <li><a href="http://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">Twitter</a></li>
- <li><a href="http://www.flickr.com/photos/luxagraf" rel="me" title="luxagraf on Flickr">Flickr</a></li>
- <li><a href="/contact/" title="contact luxagraf">Contact</a></li>
- </ul>
- </nav>
- </footer>
- {% block js %}{% endblock%}
- <script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
- </script>
- <script type="text/javascript">
- try {
- var pageTracker = _gat._getTracker("UA-1186171-1");
- pageTracker._trackPageview();
- } catch(err) {}</script>
-</body>
-</html>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-16 10:25:11 +0000