Commit 68f7f5bc authored by fred's avatar fred

update and adapt to/for latest gadjo

parent 5f189ee0
...@@ -82,11 +82,8 @@ STATICFILES_DIRS = ( ...@@ -82,11 +82,8 @@ STATICFILES_DIRS = (
# List of finder classes that know how to find static files in # List of finder classes that know how to find static files in
# various locations. # various locations.
STATICFILES_FINDERS = ( STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \
'django.contrib.staticfiles.finders.FileSystemFinder', ('gadjo.finders.XStaticFinder',)
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
# Make this unique, and don't share it with anybody. # Make this unique, and don't share it with anybody.
SECRET_KEY = '(jwx-1y#d#vps93glikirr&tq_!^_4g+9-qj(jy#l=sllqw(^j' SECRET_KEY = '(jwx-1y#d#vps93glikirr&tq_!^_4g+9-qj(jy#l=sllqw(^j'
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/* theme derived and inspired by TerraFirma div#header {
* <http://www.oswd.org/design/information/id/3557/> background: #282f2e url(../images/banner-1054.png) no-repeat 0px top;
*/ height: 93px;
@font-face {
font-family: "FontAwesome";
src: url('fontawesome-webfont.eot');
src: url('fontawesome-webfont.eot?#iefix') format('eot'), url('fontawesome-webfont.woff') format('woff'), url('fontawesome-webfont.ttf') format('truetype'), url('fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;
font-style: normal;
}
html {
margin: 0;
background: #F9F9F7 url(../images/a1.gif) repeat-x;
}
/* bootstrap <sigh/> */
h1, h2, h3, h4 {
font-family: sans-serif;
}
body {
margin: 0;
background: transparent;
color: #8c8c73;
line-height: inherit;
font-size: 14px;
}
a {
color: #FF7800;
text-decoration: underline;
transition: all .2s ease-in-out;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
}
a:hover {
text-decoration: none;
color: #D76500;
} }
div#wrap { div#top {
background: white; float: right;
margin: 1em auto 1em auto; background: rgba(0, 0, 0, 0.8);
margin-bottom: 0; height: auto;
padding: 15px; box-sizing: border-box;
border-radius: 6px; padding: 1ex;
-moz-border-radius: 6px; color: #eee;
-webkit-border-radius:6px;
box-shadow: 0 0 4px rgba(0,0,0,0.75);
-moz-box-shadow: 0 0 4px rgba(0,0,0,0.75);
-webkit-box-shadow: 0 0 4px rgba(0,0,0,0.75);
position: relative; position: relative;
width: 90%; z-index: 1000;
border-radius: 0 0 0 1ex;
} }
.narrow div#wrap { div#top a {
width: 60%; padding: 0 1ex;
min-width: 600px;
}
#header
{
position: absolute;
background: #FF7800 url(../images/a8.gif) repeat-x;
border-radius: 6px 0 0 6px;
-moz-border-radius: 6px 0 0 6px;
-webkit-border-radius: 6px 0 0 6px;
width: 212px;
width: 212px;
height: 92px;
color: #fff;
padding-left: 10px;
z-index: 14;
}
#header h1
{
font-size: 23px;
letter-spacing: -1px;
margin: 0;
height: 100%;
} }
#header span div#main-content {
{ padding-top: 0;
margin: 0; overflow: visible;
font-size: 10px;
font-weight: normal;
color: #FCE2CA;
} }
#header h1 a { div#more-user-links {
color: white; margin-top: -1ex;
text-decoration: none; margin-bottom: 1em;
display: block;
height: 100%;
padding-top: 30px;
}
#splash
{
position: absolute;
right: 15px;
background: #282f2e url(../images/banner-1054.png) no-repeat 0px top;
width: 90%;
height: 92px;
border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
-webkit-border-radius: 0 6px 6px 0;
z-index: 10;
color: white;
font-weight: bold;
text-align: right;
padding-top: 5px;
} }
div#content { div#content {
margin: 1em 1ex; margin-top: 1ex;
margin-top: 20px;
padding: 7px;
position: relative;
} }
div#appbar button, div#appbar button,
...@@ -140,33 +49,8 @@ div#appbar button { ...@@ -140,33 +49,8 @@ div#appbar button {
} }
div#appbar a { div#appbar a {
font-size: 80%; font-size: 80%;
font-weight: normal;
}
div#content h2 {
margin-top: 0;
font-weight: normal; font-weight: normal;
color: #656551;
font-size: 18px;
letter-spacing: -1px;
line-height: 25px;
margin-bottom: 20px;
padding: 0 0 10px 15px;
position: relative;
top: 4px;
background: url(../images/a22.gif) bottom repeat-x;
clear: both;
}
div#content h2 a {
color: inherit;
text-decoration: inherit;
}
div#content h2 a:hover {
color: #FF7800;
text-decoration: underline;
} }
div#content h3 { div#content h3 {
...@@ -184,41 +68,44 @@ div#content ul { ...@@ -184,41 +68,44 @@ div#content ul {
padding: 1ex 2ex 1ex 3ex; padding: 1ex 2ex 1ex 3ex;
} }
div.newsitems hr, hr {
div.emission hr {
clear: both; clear: both;
border: 0;
border-bottom: 1px solid #888; border-bottom: 1px solid #888;
margin: 10px auto 20px auto; margin: 10px auto 20px auto;
width: 80%; width: 80%;
} }
#footer body.login {
{ margin-top: 3em;
font-size: 70%; }
position: relative;
clear: both; body.login div#search,
height: 66px; body.login div#more-user-links {
text-align: center; display: none;
line-height: 66px; }
background-image: url(../images/a50.gif);
color: #A8A88D; body.login #header {
border: 1px solid #666;
} }
#footer a body.login #main {
{ max-width: 100ex;
color: #8C8C73; margin: 0 auto;
} }
body.login div#main-content {
border-width: 0 1px 1px 1px;
box-sizing: border-box;
}
form#login-form p { form#login-form p {
float: left; float: left;
width: 40%; width: 40%;
} }
form input.submit { form#login-form input[type=submit] {
float: right; margin-top: 2ex;
width: 18%;
margin-top: 30px;
} }
div.login-actions { div.login-actions {
...@@ -230,10 +117,6 @@ div.login-actions p { ...@@ -230,10 +117,6 @@ div.login-actions p {
margin: 0; margin: 0;
} }
form p {
margin: 0 0 1em 0;
}
form.inline p label { form.inline p label {
display: inline; display: inline;
} }
...@@ -245,23 +128,7 @@ form .inline li { ...@@ -245,23 +128,7 @@ form .inline li {
display: inline; display: inline;
} }
form p label { span.add-on {
display: block;
}
form p input,
form p textarea {
margin-left: 10px;
}
ul.errorlist {
margin: 0;
padding: 0;
color: #e80404;
list-style: none;
}
input, textarea, span.add-on {
padding: 5px; padding: 5px;
border: 1px solid #cccccc; border: 1px solid #cccccc;
color:#666666; color:#666666;
...@@ -272,77 +139,11 @@ input, textarea, span.add-on { ...@@ -272,77 +139,11 @@ input, textarea, span.add-on {
border-radius: 4px; border-radius: 4px;
} }
textarea:focus, input[type="text"]:focus, input[type="password"]:focus {
border: 1px solid #4690d6;
color:#333333;
}
input[type=submit] {
color: #ffffff;
background:#4690d6;
border: 1px solid #2a567f;
font-weight: bold;
padding: 2px 8px 2px 8px;
margin: 0;
cursor: pointer;
}
input[type=submit]:hover {
border-color: #0e1d2b;
}
form#login-form ul.errorlist {
margin-bottom: 1em;
width: 80%;
font-weight: normal;
}
.form-row {
margin: 1em 0;
}
.form-row label {
display: block;
}
.form-row input {
margin-left: 10px;
}
div#content h4 { div#content h4 {
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 30px; margin-top: 30px;
} }
div.errors {
margin: 0;
padding: 0;
color: #e80404;
list-style: none;
}
div#breadcrumb {
font-size: 80%;
margin-bottom: 1em;
}
form input.submit {
position: relative;
top: -22px;
}
form#login-form input.submit {
position: relative;
top: -5px;
}
div.content {
float: left;
width: 82%;
margin-left: 8px;
margin-top: -10px;
}
abbr { abbr {
border-bottom: 1px dotted #8c8c73; border-bottom: 1px dotted #8c8c73;
cursor: help; cursor: help;
...@@ -385,8 +186,6 @@ ul.newsitem-list { ...@@ -385,8 +186,6 @@ ul.newsitem-list {
-webkit-column-count: 2; -webkit-column-count: 2;
} }
.fileprogress { .fileprogress {
border: 1px solid #888; border: 1px solid #888;
} }
...@@ -468,44 +267,6 @@ span.add-on { ...@@ -468,44 +267,6 @@ span.add-on {
width: 30em; width: 30em;
} }
#user-links {
color: black;
margin-top: 100px;
}
button,
#user-links a {
background: #ccc;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border: 1px solid #bbb;
box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
padding: 4px 12px;
border-radius: 4px;
color: black;
text-decoration: none;
}
button:hover,
#user-links a:hover {
background: #aaa;
}
#user-links span.middle {
padding-left: 15px;
}
#user-links span.right {
position: absolute;
right: 20px;
top: 80px;
z-index: 100;
}
#user-links span.right span {
color: #ddd;
}
.image { .image {
text-align: right; text-align: right;
} }
...@@ -534,19 +295,6 @@ div.text { ...@@ -534,19 +295,6 @@ div.text {
margin-bottom: 1em; margin-bottom: 1em;
} }
ul.messages {
position: absolute;
background: rgba(10, 10, 10, 0.8);
display: block;
top: 5px;
right: 0px;
color: white;
border-radius: 1em;
list-style: none;
z-index: 10;
box-shadow: 0px 0px 5px black;
}
#piece-details { #piece-details {
float: right; float: right;
margin: 1em; margin: 1em;
...@@ -647,13 +395,6 @@ div#placeholders h3 { ...@@ -647,13 +395,6 @@ div#placeholders h3 {
padding: 0.5ex 1ex; padding: 0.5ex 1ex;
} }
div#appbar > a {
position: relative;
top: -45px;
float: right;
margin-left: 2em;
}
body.combo div.select2-container { body.combo div.select2-container {
width: 100%; width: 100%;
} }
...@@ -799,3 +540,46 @@ ul.gallery li span.image-actions { ...@@ -799,3 +540,46 @@ ul.gallery li span.image-actions {
bottom: 0; bottom: 0;
right: 0; right: 0;
} }
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
margin-top: 2px;
font-size: 14px;
list-style: none;
background-color: #ffffff;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
div#search {
position: absolute;
top: 40px;
right: 10px;
}
select#id_datetime_0, select#id_datetime_1, select#id_datetime_2 {
width: auto;
margin-right: 1em;
}
div.ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close::after {
content: "×";
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
{% load url from future %}{% load i18n panikdbtags django_select2_tags %}<!DOCTYPE html> {% extends "gadjo/base.html" %}
<html> {% load gadjo i18n panikdbtags django_select2_tags %}
<head> {% block page-title %}Panik DB{% endblock %}
<meta charset="utf-8"/>
<title>{% block page-title %}Panik DB{% endblock %}</title>
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script> {% block bodyargs %}data-no-moving-header="x"{%endblock %}
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.js"></script>
<link href="{{ STATIC_URL }}css/bootstrap.css" rel="stylesheet" type="text/css"/>
<script src="{{ STATIC_URL }}js/jquery-ui.js"></script> {% block gadjo-js %}
{{ block.super }}
<script src="{{ STATIC_URL }}js/jquery.fileupload.js"></script> <script src="{{ STATIC_URL }}js/jquery.fileupload.js"></script>
<script src="{{ STATIC_URL }}js/jquery.iframe-transport.js"></script> <script src="{{ STATIC_URL }}js/jquery.iframe-transport.js"></script>
<script src="{{ STATIC_URL }}js/qommon.fileupload.js"></script> <script src="{{ STATIC_URL }}js/qommon.fileupload.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js"></script>
{% endblock %}
{% block css %}
{{ block.super }}
{% import_django_select2_js_css %} {% import_django_select2_js_css %}
<link href="{{ STATIC_URL }}css/datetimepicker.css" rel="stylesheet" type="text/css"/> <link href="{{ STATIC_URL }}css/datetimepicker.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js"></script> {% endblock %}
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css"/>
<!-- <script src="{{ STATIC_URL }}js/qommon.ahah.js"></script> --> {% block site-title %}PanikDB{% endblock %}
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/smoothness/jquery-ui-1.10.0.custom.css"/>
{% block extrascripts %} {% block sidepage %}
{% endblock %} {% endblock %}
</head>
<body {% block bodyattr %}{% endblock %}> {% block subheader %}
{% block wrapper %} <div id="search">
<div id="wrap">
{% endblock %}
{% if not popup %}
<div id="header">
<h1><a href="{% url 'home' %}">Panik DB</a></h1>
</div>
<div id="splash">
{% if user.id %} {% if user.id %}
<form class="gadjo-popup-ignore" action="{% url 'haystack_search' %}"> <form class="gadjo-popup-ignore" action="{% url 'haystack_search' %}">
<input type="search" name="q" placeholder="Rechercher"/> <input type="search" name="q" placeholder="Rechercher"/>
...@@ -42,8 +32,9 @@ ...@@ -42,8 +32,9 @@
</form> </form>
{% endif %} {% endif %}
</div> </div>
<div id="user-links"> {% endblock %}
{% block user-links %}
{% block more-user-links %}
<a href="{% url 'home' %}" class="icon-home-space">Accueil</a>