diff --git a/scipost/admin.py b/scipost/admin.py
index 2f628fd0294abb4f442b585995f2b4f7b881128e..db488d7cafea8ca1de0456e4d6d6e3253ba66ec1 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -5,13 +5,16 @@ from django.contrib.auth.models import User
from scipost.models import Contributor
-#class ContributorInline(admin.StackedInline):
-# model = Contributor
+class ContributorInline(admin.StackedInline):
+#class ContributorInline(admin.TabularInline):
+ model = Contributor
-#class UserAdmin(UserAdmin):
-# inlines = (ContributorInline, )
+class UserAdmin(UserAdmin):
+ inlines = [
+ ContributorInline,
+ ]
-#admin.site.unregister(User)
-#admin.site.register(User, UserAdmin)
+admin.site.unregister(User)
+admin.site.register(User, UserAdmin)
-admin.site.register(Contributor)
+#admin.site.register(Contributor)
diff --git a/scipost/static/scipost/info/SciPost_Description.pdf b/scipost/static/scipost/info/SciPost_Description.pdf
index 07c1c8e4ba5fe19634308a387d7b1b8a560d3a3d..ea137dfa37f7889011c67a6eaa49a1163029aaca 100644
Binary files a/scipost/static/scipost/info/SciPost_Description.pdf and b/scipost/static/scipost/info/SciPost_Description.pdf differ
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index ab52e6774fcd9600ff4ed763b66b5f1a42fbc2a6..5b7ce49d0146b0cceb2a8ca22cf6d3718d6255a5 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -75,7 +75,11 @@
<div class="row">
<div class="col-6">
<h3>The SciPost Foundation</h3>
- <p>J.-S. Caux (chairman), J. van Mameren, J. van Wezel</p>
+ <ul>
+ <li>Chairman: J.-S. Caux</li>
+ <li>Secretary: J. van Mameren</li>
+ <li>Treasurer: J. van Wezel</li>
+ </ul>
</div>
<div class="col-4">
<h3>Advisory Board</h3>
@@ -122,7 +126,7 @@
<div class="col-6">
<h4>Code Development and Maintenance</h4>
<p>J.-S. Caux</p>
- <h4>Technical assistance</h4>
+ <h4>Technical advice</h4>
<p>M. Moeys, J. Roodhart, R. van Dam</p>
</div>
<div class="col-6">
diff --git a/scipost/views.py b/scipost/views.py
index a89d22cd623729f1b6156c432ccc872d934be818..15951feb5dd9b7e94e78048f936306b630455170 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -85,7 +85,7 @@ def register(request):
user=user,
title = form.cleaned_data['title'],
orcid_id = form.cleaned_data['orcid_id'],
- nationality = form.cleaned_data['nationality'],
+ #nationality = form.cleaned_data['nationality'],
country_of_employment = form.cleaned_data['country_of_employment'],
address = form.cleaned_data['address'],
affiliation = form.cleaned_data['affiliation'],
diff --git a/static/admin/css/base.css b/static/admin/css/base.css
index 47ac79b1d0ce002982911c0044947ffcbb497bb3..a37555aeb5203c0b13ba2ac7cc52d476dbab50d9 100644
--- a/static/admin/css/base.css
+++ b/static/admin/css/base.css
@@ -2,11 +2,13 @@
DJANGO Admin styles
*/
+@import url(fonts.css);
+
body {
margin: 0;
padding: 0;
- font-size: 12px;
- font-family: "Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+ font-size: 14px;
+ font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
color: #333;
background: #fff;
}
@@ -14,14 +16,18 @@ body {
/* LINKS */
a:link, a:visited {
- color: #5b80b2;
+ color: #447e9b;
text-decoration: none;
}
-a:hover {
+a:focus, a:hover {
color: #036;
}
+a:focus {
+ text-decoration: underline;
+}
+
a img {
border: none;
}
@@ -31,6 +37,10 @@ a.section:link, a.section:visited {
text-decoration: none;
}
+a.section:focus, a.section:hover {
+ text-decoration: underline;
+}
+
/* GLOBAL DEFAULTS */
p, ol, ul, dl {
@@ -47,10 +57,10 @@ h1,h2,h3,h4,h5 {
}
h1 {
- font-size: 18px;
+ margin: 0 0 20px;
+ font-weight: 300;
+ font-size: 20px;
color: #666;
- padding: 0 6px 0 0;
- margin: 0 0 .2em 0;
}
h2 {
@@ -89,21 +99,13 @@ ul li {
padding: 1px 0;
}
-ul.plainlist {
- margin-left: 0 !important;
-}
-
-ul.plainlist li {
- list-style-type: none;
-}
-
li ul {
margin-bottom: 0;
}
li, dt, dd {
- font-size: 11px;
- line-height: 14px;
+ font-size: 13px;
+ line-height: 20px;
}
dt {
@@ -123,6 +125,8 @@ form {
fieldset {
margin: 0;
padding: 0;
+ border: none;
+ border-top: 1px solid #eee;
}
blockquote {
@@ -136,7 +140,7 @@ blockquote {
code, pre {
font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
color: #666;
- font-size: 11px;
+ font-size: 12px;
}
pre.literal-block {
@@ -176,19 +180,19 @@ p.tiny {
}
.mini {
- font-size: 9px;
+ font-size: 10px;
}
p.mini {
margin-top: -3px;
}
-.help, p.help {
- font-size: 10px !important;
+.help, p.help, form p.help {
+ font-size: 11px;
color: #999;
}
-img.help-tooltip {
+.help-tooltip {
cursor: help;
}
@@ -197,12 +201,8 @@ p img, h1 img, h2 img, h3 img, h4 img, td img {
}
.quiet, a.quiet:link, a.quiet:visited {
- color: #999 !important;
- font-weight: normal !important;
-}
-
-.quiet strong {
- font-weight: bold !important;
+ color: #999;
+ font-weight: normal;
}
.float-right {
@@ -243,55 +243,33 @@ table {
}
td, th {
- font-size: 11px;
- line-height: 13px;
+ font-size: 13px;
+ line-height: 16px;
border-bottom: 1px solid #eee;
vertical-align: top;
- padding: 5px;
- font-family: "Lucida Grande", Verdana, Arial, sans-serif;
+ padding: 8px;
+ font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
}
th {
+ font-weight: 600;
text-align: left;
- font-size: 12px;
- font-weight: bold;
}
thead th,
tfoot td {
color: #666;
- padding: 2px 5px;
+ padding: 5px 10px;
font-size: 11px;
- background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
- border-left: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
+ background: #fff;
+ border: none;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #eee;
}
tfoot td {
border-bottom: none;
- border-top: 1px solid #ddd;
-}
-
-thead th:first-child,
-tfoot td:first-child {
- border-left: none !important;
-}
-
-thead th.optional {
- font-weight: normal !important;
-}
-
-fieldset table {
- border-right: 1px solid #eee;
-}
-
-tr.row-label td {
- font-size: 9px;
- padding-top: 2px;
- padding-bottom: 0;
- border-bottom: none;
- color: #666;
- margin-top: -1px;
+ border-top: 1px solid #eee;
}
tr.alt {
@@ -299,18 +277,20 @@ tr.alt {
}
.row1 {
- background: #EDF3FE;
+ background: #fff;
}
.row2 {
- background: #fff;
+ background: #f9f9f9;
}
/* SORTABLE TABLES */
thead th {
- padding: 2px 5px;
+ padding: 5px 10px;
line-height: normal;
+ text-transform: uppercase;
+ background: #f6f6f6;
}
thead th a:link, thead th a:visited {
@@ -318,7 +298,7 @@ thead th a:link, thead th a:visited {
}
thead th.sorted {
- background: #c5c5c5 url(../img/nav-bg-selected.gif) top left repeat-x;
+ background: #eee;
}
thead th.sorted .text {
@@ -326,18 +306,18 @@ thead th.sorted .text {
}
table thead th .text span {
- padding: 2px 5px;
- display:block;
+ padding: 8px 10px;
+ display: block;
}
table thead th .text a {
display: block;
cursor: pointer;
- padding: 2px 5px;
+ padding: 8px 10px;
}
-table thead th.sortable:hover {
- background: #fff url(../img/nav-bg-reverse.gif) 0 -5px repeat-x;
+table thead th .text a:focus, table thead th .text a:hover {
+ background: #eee;
}
thead th.sorted a.sortremove {
@@ -350,7 +330,7 @@ table thead th.sorted:hover a.sortremove {
table thead th.sorted .sortoptions {
display: block;
- padding: 4px 5px 0 5px;
+ padding: 9px 5px 0 5px;
float: right;
text-align: right;
}
@@ -359,53 +339,61 @@ table thead th.sorted .sortpriority {
font-size: .8em;
min-width: 12px;
text-align: center;
- vertical-align: top;
+ vertical-align: 3px;
+ margin-left: 2px;
+ margin-right: 2px;
}
table thead th.sorted .sortoptions a {
+ position: relative;
width: 14px;
- height: 12px;
+ height: 14px;
display: inline-block;
+ background: url(../img/sorting-icons.svg) 0 0 no-repeat;
+ background-size: 14px auto;
}
table thead th.sorted .sortoptions a.sortremove {
- background: url(../img/sorting-icons.gif) -4px -5px no-repeat;
+ background-position: 0 0;
+}
+
+table thead th.sorted .sortoptions a.sortremove:after {
+ content: '\\';
+ position: absolute;
+ top: -6px;
+ left: 3px;
+ font-weight: 200;
+ font-size: 18px;
+ color: #999;
+}
+
+table thead th.sorted .sortoptions a.sortremove:focus:after,
+table thead th.sorted .sortoptions a.sortremove:hover:after {
+ color: #447e9b;
}
+table thead th.sorted .sortoptions a.sortremove:focus,
table thead th.sorted .sortoptions a.sortremove:hover {
- background: url(../img/sorting-icons.gif) -4px -27px no-repeat;
+ background-position: 0 -14px;
}
table thead th.sorted .sortoptions a.ascending {
- background: url(../img/sorting-icons.gif) -5px -50px no-repeat;
+ background-position: 0 -28px;
}
+table thead th.sorted .sortoptions a.ascending:focus,
table thead th.sorted .sortoptions a.ascending:hover {
- background: url(../img/sorting-icons.gif) -5px -72px no-repeat;
+ background-position: 0 -42px;
}
table thead th.sorted .sortoptions a.descending {
- background: url(../img/sorting-icons.gif) -5px -94px no-repeat;
+ top: 1px;
+ background-position: 0 -56px;
}
+table thead th.sorted .sortoptions a.descending:focus,
table thead th.sorted .sortoptions a.descending:hover {
- background: url(../img/sorting-icons.gif) -5px -115px no-repeat;
-}
-
-/* ORDERABLE TABLES */
-
-table.orderable tbody tr td:hover {
- cursor: move;
-}
-
-table.orderable tbody tr td:first-child {
- padding-left: 14px;
- background-image: url(../img/nav-bg-grabber.gif);
- background-repeat: repeat-y;
-}
-
-table.orderable-initalized .order-cell, body>tr>td.order-cell {
- display: none;
+ background-position: 0 -70px;
}
/* FORM DEFAULTS */
@@ -414,61 +402,78 @@ input, textarea, select, .form-row p, form .button {
margin: 2px 0;
padding: 2px 3px;
vertical-align: middle;
- font-family: "Lucida Grande", Verdana, Arial, sans-serif;
+ font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
font-weight: normal;
- font-size: 11px;
+ font-size: 13px;
}
textarea {
- vertical-align: top !important;
+ vertical-align: top;
}
-input[type=text], input[type=password], input[type=email], input[type=url], input[type=number],
-textarea, select, .vTextField {
+input[type=text], input[type=password], input[type=email], input[type=url],
+input[type=number], textarea, select, .vTextField {
border: 1px solid #ccc;
+ border-radius: 4px;
+ padding: 5px 6px;
+ margin-top: 0;
+}
+
+input[type=text]:focus, input[type=password]:focus, input[type=email]:focus,
+input[type=url]:focus, input[type=number]:focus, textarea:focus, select:focus,
+.vTextField:focus {
+ border-color: #999;
+}
+
+select {
+ height: 30px;
+}
+
+select[multiple] {
+ min-height: 150px;
}
/* FORM BUTTONS */
.button, input[type=submit], input[type=button], .submit-row input, a.button {
- background: #fff url(../img/nav-bg.gif) bottom repeat-x;
- padding: 3px 5px;
- color: black;
- border: 1px solid #bbb;
- border-color: #ddd #aaa #aaa #ddd;
+ background: #79aec8;
+ padding: 10px 15px;
+ border: none;
+ border-radius: 4px;
+ color: #fff;
+ cursor: pointer;
}
a.button {
padding: 4px 5px;
}
-.button:active, input[type=submit]:active, input[type=button]:active {
- background-image: url(../img/nav-bg-reverse.gif);
- background-position: top;
+.button:active, input[type=submit]:active, input[type=button]:active,
+.button:focus, input[type=submit]:focus, input[type=button]:focus,
+.button:hover, input[type=submit]:hover, input[type=button]:hover {
+ background: #609ab6;
}
.button[disabled], input[type=submit][disabled], input[type=button][disabled] {
- background-image: url(../img/nav-bg.gif);
- background-position: bottom;
opacity: 0.4;
}
.button.default, input[type=submit].default, .submit-row input.default {
- border: 2px solid #5b80b2;
- background: #7CA0C7 url(../img/default-bg.gif) bottom repeat-x;
- font-weight: bold;
- color: #fff;
float: right;
+ border: none;
+ font-weight: 400;
+ background: #417690;
}
-.button.default:active, input[type=submit].default:active {
- background-image: url(../img/default-bg-reverse.gif);
- background-position: top;
+.button.default:active, input[type=submit].default:active,
+.button.default:focus, input[type=submit].default:focus,
+.button.default:hover, input[type=submit].default:hover {
+ background: #205067;
}
-.button[disabled].default, input[type=submit][disabled].default, input[type=button][disabled].default {
- background-image: url(../img/default-bg.gif);
- background-position: bottom;
+.button[disabled].default,
+input[type=submit][disabled].default,
+input[type=button][disabled].default {
opacity: 0.4;
}
@@ -476,8 +481,8 @@ a.button {
/* MODULES */
.module {
- border: 1px solid #ccc;
- margin-bottom: 5px;
+ border: none;
+ margin-bottom: 30px;
background: #fff;
}
@@ -500,14 +505,21 @@ a.button {
.module h2, .module caption, .inline-group h2 {
margin: 0;
- padding: 2px 5px 3px 5px;
- font-size: 11px;
+ padding: 8px;
+ font-weight: 400;
+ font-size: 13px;
text-align: left;
- font-weight: bold;
- background: #7CA0C7 url(../img/default-bg.gif) top left repeat-x;
+ background: #79aec8;
color: #fff;
}
+.module caption,
+.inline-group h2 {
+ font-size: 12px;
+ letter-spacing: 0.5px;
+ text-transform: uppercase;
+}
+
.module table {
border-collapse: collapse;
}
@@ -520,51 +532,50 @@ ul.messagelist {
}
ul.messagelist li {
- font-size: 12px;
- font-weight: bold;
display: block;
- padding: 5px 5px 4px 25px;
- margin: 0 0 3px 0;
- border-bottom: 1px solid #ddd;
- color: #666;
- background: #dfd url(../img/icon_success.gif) 5px .3em no-repeat;
+ font-weight: 400;
+ font-size: 13px;
+ padding: 10px 10px 10px 65px;
+ margin: 0 0 10px 0;
+ background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat;
+ background-size: 16px auto;
+ color: #333;
}
ul.messagelist li.warning {
- background: #ffc url(../img/icon_alert.gif) 5px .3em no-repeat;
+ background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat;
+ background-size: 14px auto;
}
ul.messagelist li.error {
- background: #ffefef url(../img/icon_error.gif) 5px .3em no-repeat;
+ background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat;
+ background-size: 16px auto;
}
.errornote {
- font-size: 12px !important;
- font-weight: bold;
+ font-size: 14px;
+ font-weight: 700;
display: block;
- padding: 5px 5px 4px 25px;
- margin: 0 0 3px 0;
- border: 1px solid #c22;
- color: #c11;
- background: #ffefef url(../img/icon_error.gif) 5px .38em no-repeat;
-}
-
-.errornote, ul.errorlist {
- border-radius: 1px;
+ padding: 10px 12px;
+ margin: 0 0 10px 0;
+ color: #ba2121;
+ border: 1px solid #ba2121;
+ border-radius: 4px;
+ background-color: #fff;
+ background-position: 5px 12px;
}
ul.errorlist {
- margin: 0 0 4px !important;
- padding: 0 !important;
- color: #fff;
- background: #c11;
+ margin: 0 0 4px;
+ padding: 0;
+ color: #ba2121;
+ background: #fff;
}
ul.errorlist li {
- font-size: 12px !important;
+ font-size: 13px;
display: block;
- padding: 5px 5px 4px 7px;
- margin: 3px 0 0 0;
+ margin-bottom: 4px;
}
ul.errorlist li:first-child {
@@ -572,30 +583,32 @@ ul.errorlist li:first-child {
}
ul.errorlist li a {
- color: #fff;
+ color: inherit;
text-decoration: underline;
}
td ul.errorlist {
- margin: 0 !important;
- padding: 0 !important;
+ margin: 0;
+ padding: 0;
}
td ul.errorlist li {
- margin: 0 !important;
+ margin: 0;
}
-.errors, .form-row.errors {
- background: #ffefef;
+.form-row.errors {
+ margin: 0;
+ border: none;
+ border-bottom: 1px solid #eee;
+ background: none;
}
-.form-row.errors {
- border: 1px solid #c22;
- margin: -1px;
+.form-row.errors ul.errorlist li {
+ padding-left: 0;
}
.errors input, .errors select, .errors textarea {
- border: 1px solid #c11;
+ border: 1px solid #ba2121;
}
div.system-message {
@@ -609,7 +622,7 @@ div.system-message p.system-message-title {
padding: 4px 5px 4px 25px;
margin: 0;
color: #c11;
- background: #ffefef url(../img/icon_error.gif) 5px .3em no-repeat;
+ background: #ffefef url(../img/icon-no.svg) 5px 5px no-repeat;
}
.description {
@@ -620,38 +633,46 @@ div.system-message p.system-message-title {
/* BREADCRUMBS */
div.breadcrumbs {
- background: #fff url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
- padding: 2px 8px 3px 8px;
- font-size: 11px;
- color: #999;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
+ background: #79aec8;
+ padding: 10px 40px;
+ border: none;
+ font-size: 14px;
+ color: #c4dce8;
text-align: left;
}
+div.breadcrumbs a {
+ color: #fff;
+}
+
+div.breadcrumbs a:focus, div.breadcrumbs a:hover {
+ color: #c4dce8;
+}
+
/* ACTION ICONS */
.addlink {
- padding-left: 12px;
- background: url(../img/icon_addlink.gif) 0 .2em no-repeat;
+ padding-left: 16px;
+ background: url(../img/icon-addlink.svg) 0 1px no-repeat;
}
.changelink, .inlinechangelink {
- padding-left: 12px;
- background: url(../img/icon_changelink.gif) 0 .2em no-repeat;
+ padding-left: 16px;
+ background: url(../img/icon-changelink.svg) 0 1px no-repeat;
}
.deletelink {
- padding-left: 12px;
- background: url(../img/icon_deletelink.gif) 0 .25em no-repeat;
+ padding-left: 16px;
+ background: url(../img/icon-deletelink.svg) 0 1px no-repeat;
}
a.deletelink:link, a.deletelink:visited {
color: #CC3434;
}
-a.deletelink:hover {
+a.deletelink:focus, a.deletelink:hover {
color: #993333;
+ text-decoration: none;
}
/* OBJECT TOOLS */
@@ -659,12 +680,10 @@ a.deletelink:hover {
.object-tools {
font-size: 10px;
font-weight: bold;
- font-family: Arial,Helvetica,sans-serif;
padding-left: 0;
float: right;
position: relative;
- margin-top: -2.4em;
- margin-bottom: -2em;
+ margin-top: -48px;
}
.form-row .object-tools {
@@ -689,23 +708,35 @@ a.deletelink:hover {
.object-tools a:link, .object-tools a:visited {
display: block;
float: left;
- color: #fff;
- padding: .2em 10px;
+ padding: 3px 12px;
background: #999;
+ font-weight: 400;
+ font-size: 11px;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+ color: #fff;
}
-.object-tools a:hover, .object-tools li:hover a {
- background-color: #5b80b2;
+.object-tools a:focus, .object-tools a:hover {
+ background-color: #417690;
}
-.object-tools a.viewsitelink, .object-tools a.golink {
- background: #999 url(../img/tooltag-arrowright.png) 95% center no-repeat;
+.object-tools a:focus{
+ text-decoration: none;
+}
+
+.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {
+ background-repeat: no-repeat;
+ background-position: 93% center;
padding-right: 26px;
}
+.object-tools a.viewsitelink, .object-tools a.golink {
+ background-image: url(../img/tooltag-arrowright.svg);
+}
+
.object-tools a.addlink {
- background: #999 url(../img/tooltag-add.png) 95% center no-repeat;
- padding-right: 26px;
+ background-image: url(../img/tooltag-add.svg);
}
/* OBJECT HISTORY */
@@ -723,12 +754,16 @@ table#change-history tbody th {
#container {
position: relative;
width: 100%;
- min-width: 760px;
+ min-width: 980px;
padding: 0;
}
#content {
- margin: 10px 15px;
+ padding: 20px 40px;
+}
+
+.dashboard #content {
+ width: 600px;
}
#content-main {
@@ -738,9 +773,9 @@ table#change-history tbody th {
#content-related {
float: right;
- width: 18em;
+ width: 260px;
position: relative;
- margin-right: -19em;
+ margin-right: -300px;
}
#footer {
@@ -751,17 +786,17 @@ table#change-history tbody th {
/* COLUMN TYPES */
.colMS {
- margin-right: 20em !important;
+ margin-right: 300px;
}
.colSM {
- margin-left: 20em !important;
+ margin-left: 300px;
}
.colSM #content-related {
float: left;
margin-right: 0;
- margin-left: -19em;
+ margin-left: -300px;
}
.colSM #content-main {
@@ -769,24 +804,17 @@ table#change-history tbody th {
}
.popup .colM {
- width: 95%;
-}
-
-.subcol {
- float: left;
- width: 46%;
- margin-right: 15px;
-}
-
-.dashboard #content {
- width: 500px;
+ width: auto;
}
/* HEADER */
#header {
- width: 100%;
+ width: auto;
+ height: 40px;
+ padding: 10px 40px;
background: #417690;
+ line-height: 40px;
color: #ffc;
overflow: hidden;
}
@@ -795,22 +823,24 @@ table#change-history tbody th {
color: #fff;
}
-#header a:hover {
+#header a:focus , #header a:hover {
text-decoration: underline;
}
#branding {
float: left;
}
+
#branding h1 {
- padding: 0 10px;
- font-size: 18px;
- margin: 8px 0;
- font-weight: normal;
+ padding: 0;
+ margin: 0 20px 0 0;
+ font-weight: 300;
+ font-size: 24px;
+ color: #f5dd5d;
}
#branding h1, #branding h1 a:link, #branding h1 a:visited {
- color: #f4f379;
+ color: #f5dd5d;
}
#branding h2 {
@@ -827,24 +857,111 @@ table#change-history tbody th {
#user-tools {
float: right;
- padding: 1.2em 10px;
+ padding: 0;
+ margin: 0 0 0 20px;
+ font-weight: 300;
font-size: 11px;
+ letter-spacing: 0.5px;
+ text-transform: uppercase;
text-align: right;
}
+#user-tools a {
+ border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
+#user-tools a:focus, #user-tools a:hover {
+ text-decoration: none;
+ border-bottom-color: #79aec8;
+ color: #79aec8;
+}
+
/* SIDEBAR */
+#content-related {
+ background: #f8f8f8;
+}
+
+#content-related .module {
+ background: none;
+}
+
#content-related h3 {
- font-size: 12px;
+ font-size: 14px;
color: #666;
- margin-bottom: 3px;
+ padding: 0 16px;
+ margin: 0 0 16px;
}
#content-related h4 {
- font-size: 11px;
+ font-size: 13px;
+}
+
+#content-related p {
+ padding-left: 16px;
+ padding-right: 16px;
+}
+
+#content-related .actionlist {
+ padding: 0;
+ margin: 16px;
+}
+
+#content-related .actionlist li {
+ line-height: 1.2;
+ margin-bottom: 10px;
+ padding-left: 18px;
}
#content-related .module h2 {
- background: #eee url(../img/nav-bg.gif) bottom left repeat-x;
- color: #666;
+ background: none;
+ padding: 16px;
+ margin-bottom: 16px;
+ border-bottom: 1px solid #eaeaea;
+ font-size: 18px;
+ color: #333;
+}
+
+.delete-confirmation form input[type="submit"] {
+ background: #ba2121;
+ border-radius: 4px;
+ padding: 10px 15px;
+ color: #fff;
+}
+
+.delete-confirmation form input[type="submit"]:active,
+.delete-confirmation form input[type="submit"]:focus,
+.delete-confirmation form input[type="submit"]:hover {
+ background: #a41515;
+}
+
+.delete-confirmation form .cancel-link {
+ display: inline-block;
+ vertical-align: middle;
+ height: 15px;
+ line-height: 15px;
+ background: #ddd;
+ border-radius: 4px;
+ padding: 10px 15px;
+ color: #333;
+ margin: 0 0 0 10px;
+}
+
+.delete-confirmation form .cancel-link:active,
+.delete-confirmation form .cancel-link:focus,
+.delete-confirmation form .cancel-link:hover {
+ background: #ccc;
+}
+
+/* POPUP */
+.popup #content {
+ padding: 20px;
+}
+
+.popup #container {
+ min-width: 0;
+}
+
+.popup #header {
+ padding: 10px 20px;
}
diff --git a/static/admin/css/changelists.css b/static/admin/css/changelists.css
index 28021d02bd3862894dd31ba1034dea090d5751a9..fd9e784478c13e43b1e45d2f9317367e75dd421b 100644
--- a/static/admin/css/changelists.css
+++ b/static/admin/css/changelists.css
@@ -12,20 +12,17 @@
.change-list .hiddenfields { display:none; }
.change-list .filtered table {
- border-right: 1px solid #ddd;
+ border-right: none;
}
.change-list .filtered {
min-height: 400px;
}
-.change-list .filtered {
- background: white url(../img/changelist-bg.gif) top right repeat-y !important;
-}
-
-.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
- margin-right: 160px !important;
- width: auto !important;
+.change-list .filtered .results, .change-list .filtered .paginator,
+.filtered #toolbar, .filtered div.xfull {
+ margin-right: 280px;
+ width: auto;
}
.change-list .filtered table tbody th {
@@ -37,21 +34,16 @@
}
#changelist .toplinks {
- border-bottom: 1px solid #ccc !important;
+ border-bottom: 1px solid #ddd;
}
#changelist .paginator {
color: #666;
- border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
- background: white url(../img/nav-bg.gif) 0 180% repeat-x;
+ background: #fff;
overflow: hidden;
}
-.change-list .filtered .paginator {
- border-right: 1px solid #ddd;
-}
-
/* CHANGELIST TABLES */
#changelist table thead th {
@@ -65,17 +57,8 @@
text-align: center;
}
-#changelist table tbody td, #changelist table tbody th {
- border-left: 1px solid #ddd;
-}
-
-#changelist table tbody td:first-child, #changelist table tbody th:first-child {
- border-left: 0;
- border-right: 1px solid #ddd;
-}
-
#changelist table tbody td.action-checkbox {
- text-align:center;
+ text-align: center;
}
#changelist table tfoot {
@@ -85,23 +68,53 @@
/* TOOLBAR */
#changelist #toolbar {
- padding: 3px;
- border-bottom: 1px solid #ddd;
- background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
+ padding: 8px 10px;
+ margin-bottom: 15px;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #eee;
+ background: #f8f8f8;
color: #666;
}
#changelist #toolbar form input {
- font-size: 11px;
- padding: 1px 2px;
+ border-radius: 4px;
+ font-size: 14px;
+ padding: 5px;
+ color: #333;
}
#changelist #toolbar form #searchbar {
- padding: 2px;
+ height: 19px;
+ border: 1px solid #ccc;
+ padding: 2px 5px;
+ margin: 0;
+ vertical-align: top;
+ font-size: 13px;
+}
+
+#changelist #toolbar form #searchbar:focus {
+ border-color: #999;
+}
+
+#changelist #toolbar form input[type="submit"] {
+ border: 1px solid #ccc;
+ padding: 2px 10px;
+ margin: 0;
+ vertical-align: middle;
+ background: #fff;
+ box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
+ cursor: pointer;
+ color: #333;
+}
+
+#changelist #toolbar form input[type="submit"]:focus,
+#changelist #toolbar form input[type="submit"]:hover {
+ border-color: #999;
}
#changelist #changelist-search img {
vertical-align: middle;
+ margin-right: 4px;
}
/* FILTER COLUMN */
@@ -111,26 +124,37 @@
top: 0;
right: 0;
z-index: 1000;
- width: 160px;
- border-left: 1px solid #ddd;
- background: #efefef;
+ width: 240px;
+ background: #f8f8f8;
+ border-left: none;
margin: 0;
}
#changelist-filter h2 {
- font-size: 11px;
- padding: 2px 5px;
- border-bottom: 1px solid #ddd;
+ font-size: 14px;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+ padding: 5px 15px;
+ margin-bottom: 12px;
+ border-bottom: none;
}
#changelist-filter h3 {
- font-size: 12px;
- margin-bottom: 0;
+ font-weight: 400;
+ font-size: 14px;
+ padding: 0 15px;
+ margin-bottom: 10px;
}
#changelist-filter ul {
- padding-left: 0;
- margin-left: 10px;
+ margin: 5px 0;
+ padding: 0 15px 15px;
+ border-bottom: 1px solid #eaeaea;
+}
+
+#changelist-filter ul:last-child {
+ border-bottom: none;
+ padding-bottom: none;
}
#changelist-filter li {
@@ -140,32 +164,33 @@
}
#changelist-filter a {
+ display: block;
color: #999;
}
-#changelist-filter a:hover {
- color: #036;
-}
-
#changelist-filter li.selected {
- border-left: 5px solid #ccc;
- padding-left: 5px;
- margin-left: -10px;
+ border-left: 5px solid #eaeaea;
+ padding-left: 10px;
+ margin-left: -15px;
}
#changelist-filter li.selected a {
- color: #5b80b2 !important;
+ color: #5b80b2;
+}
+
+#changelist-filter a:focus, #changelist-filter a:hover,
+#changelist-filter li.selected a:focus,
+#changelist-filter li.selected a:hover {
+ color: #036;
}
/* DATE DRILLDOWN */
.change-list ul.toplinks {
display: block;
- background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
- border-top: 1px solid white;
float: left;
- padding: 0 !important;
- margin: 0 !important;
+ padding: 0;
+ margin: 0;
width: 100%;
}
@@ -180,6 +205,7 @@
color: #999;
}
+.change-list ul.toplinks .date-back a:focus,
.change-list ul.toplinks .date-back a:hover {
color: #036;
}
@@ -187,7 +213,7 @@
/* PAGINATOR */
.paginator {
- font-size: 11px;
+ font-size: 13px;
padding-top: 10px;
padding-bottom: 10px;
line-height: 22px;
@@ -197,23 +223,24 @@
.paginator a:link, .paginator a:visited {
padding: 2px 6px;
- border: solid 1px #ccc;
- background: white;
+ background: #79aec8;
text-decoration: none;
+ color: #fff;
}
.paginator a.showall {
- padding: 0 !important;
- border: none !important;
+ padding: 0;
+ border: none;
+ background: none;
+ color: #5b80b2;
}
-.paginator a.showall:hover {
- color: #036 !important;
- background: transparent !important;
+.paginator a.showall:focus, .paginator a.showall:hover {
+ background: none;
+ color: #036;
}
.paginator .end {
- border-width: 2px !important;
margin-right: 6px;
}
@@ -224,21 +251,21 @@
vertical-align: top;
}
-.paginator a:hover {
+.paginator a:focus, .paginator a:hover {
color: white;
- background: #5b80b2;
- border-color: #036;
+ background: #036;
}
/* ACTIONS */
.filtered .actions {
- margin-right: 160px !important;
- border-right: 1px solid #ddd;
+ margin-right: 280px;
+ border-right: none;
}
#changelist table input {
margin: 0;
+ vertical-align: baseline;
}
#changelist table tbody tr.selected {
@@ -246,11 +273,12 @@
}
#changelist .actions {
+ padding: 10px;
+ background: #fff;
+ border-top: none;
+ border-bottom: none;
+ line-height: 24px;
color: #999;
- padding: 3px;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
- background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
}
#changelist .actions.selected {
@@ -263,7 +291,7 @@
#changelist .actions span.action-counter,
#changelist .actions span.clear,
#changelist .actions span.question {
- font-size: 11px;
+ font-size: 13px;
margin: 0 0.5em;
display: none;
}
@@ -273,21 +301,41 @@
}
#changelist .actions select {
- border: 1px solid #aaa;
- margin-left: 0.5em;
- padding: 1px 2px;
+ vertical-align: top;
+ height: 24px;
+ background: none;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ font-size: 14px;
+ padding: 0 0 0 4px;
+ margin: 0;
+ margin-left: 10px;
}
-#changelist .actions label {
- font-size: 11px;
- margin-left: 0.5em;
+#changelist .actions select:focus {
+ border-color: #999;
}
-#changelist #action-toggle {
- display: none;
+#changelist .actions label {
+ display: inline-block;
+ vertical-align: middle;
+ font-size: 13px;
}
#changelist .actions .button {
- font-size: 11px;
- padding: 1px 2px;
+ font-size: 13px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ background: #fff;
+ box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
+ cursor: pointer;
+ height: 24px;
+ line-height: 1;
+ padding: 4px 8px;
+ margin: 0;
+ color: #333;
+}
+
+#changelist .actions .button:focus, #changelist .actions .button:hover {
+ border-color: #999;
}
diff --git a/static/admin/css/forms.css b/static/admin/css/forms.css
index b06bbba19440b4e5b8c892eea55606a077d9f899..2a21257b6a114cdf6d431c7bc4c6a2d057cea24d 100644
--- a/static/admin/css/forms.css
+++ b/static/admin/css/forms.css
@@ -4,8 +4,8 @@
.form-row {
overflow: hidden;
- padding: 8px 12px;
- font-size: 11px;
+ padding: 10px;
+ font-size: 13px;
border-bottom: 1px solid #eee;
}
@@ -13,9 +13,13 @@
vertical-align: middle;
}
+.form-row label input[type="checkbox"] {
+ margin-top: 0;
+ vertical-align: 0;
+}
+
form .form-row p {
padding-left: 0;
- font-size: 11px;
}
.hidden {
@@ -24,21 +28,15 @@ form .form-row p {
/* FORM LABELS */
-form h4 {
- margin: 0 !important;
- padding: 0 !important;
- border: none !important;
-}
-
label {
- font-weight: normal !important;
+ font-weight: normal;
color: #666;
- font-size: 12px;
+ font-size: 13px;
}
.required label, label.required {
- font-weight: bold !important;
- color: #333 !important;
+ font-weight: bold;
+ color: #333;
}
/* RADIO BUTTONS */
@@ -52,6 +50,11 @@ form ul.radiolist label {
display: inline;
}
+form ul.radiolist input[type="radio"] {
+ margin: -2px 4px 0 0;
+ padding: 0;
+}
+
form ul.inline {
margin-left: 0;
padding: 0;
@@ -66,10 +69,25 @@ form ul.inline li {
.aligned label {
display: block;
- padding: 3px 10px 0 0;
+ padding: 4px 10px 0 0;
float: left;
- width: 8em;
+ width: 160px;
word-wrap: break-word;
+ line-height: 1;
+}
+
+.aligned label:not(.vCheckboxLabel):after {
+ content: '';
+ display: inline-block;
+ vertical-align: middle;
+ height: 26px;
+}
+
+.aligned label + p {
+ padding: 6px 0;
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 170px;
}
.aligned ul label {
@@ -78,29 +96,68 @@ form ul.inline li {
width: auto;
}
+.aligned .form-row input {
+ margin-bottom: 0;
+}
+
.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField {
width: 350px;
}
-form .aligned p, form .aligned ul {
- margin-left: 7em;
- padding-left: 30px;
+form .aligned ul {
+ margin-left: 160px;
+ padding-left: 10px;
}
-form .aligned table p {
- margin-left: 0;
- padding-left: 0;
+form .aligned ul.radiolist {
+ display: inline-block;
+ margin: 0;
+ padding: 0;
}
form .aligned p.help {
clear: left;
- padding-left: 38px;
+ margin-top: 0;
+ margin-left: 160px;
+ padding-left: 10px;
+}
+
+form .aligned label + p.help {
+ margin-left: 0;
+ padding-left: 0;
+}
+
+form .aligned p.help:last-child {
+ margin-bottom: 0;
+ padding-bottom: 0;
+}
+
+form .aligned input + p.help,
+form .aligned textarea + p.help,
+form .aligned select + p.help {
+ margin-left: 160px;
+ padding-left: 10px;
+}
+
+form .aligned ul li {
+ list-style: none;
+}
+
+form .aligned table p {
+ margin-left: 0;
+ padding-left: 0;
}
.aligned .vCheckboxLabel {
- float: none !important;
- display: inline;
- padding-left: 4px;
+ float: none;
+ width: auto;
+ display: inline-block;
+ vertical-align: -3px;
+ padding: 0 0 5px 5px;
+}
+
+.aligned .vCheckboxLabel + p.help {
+ margin-top: -4px;
}
.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField {
@@ -109,7 +166,7 @@ form .aligned p.help {
.checkbox-row p.help {
margin-left: 0;
- padding-left: 0 !important;
+ padding-left: 0;
}
fieldset .field-box {
@@ -120,11 +177,11 @@ fieldset .field-box {
/* WIDE FIELDSETS */
.wide label {
- width: 15em !important;
+ width: 200px;
}
-form .wide p {
- margin-left: 15em;
+form .wide p, form .wide input + p.help {
+ margin-left: 200px;
}
form .wide p.help {
@@ -142,34 +199,45 @@ fieldset.collapsed * {
}
fieldset.collapsed h2, fieldset.collapsed {
- display: block !important;
+ display: block;
+}
+
+fieldset.collapsed {
+ border: 1px solid #eee;
+ border-radius: 4px;
+ overflow: hidden;
}
fieldset.collapsed h2 {
- background-image: url(../img/nav-bg.gif);
- background-position: bottom left;
- color: #999;
+ background: #f8f8f8;
+ color: #666;
+}
+
+fieldset .collapse-toggle {
+ color: #fff;
}
fieldset.collapsed .collapse-toggle {
background: transparent;
- display: inline !important;
+ display: inline;
+ color: #447e9b;
}
/* MONOSPACE TEXTAREAS */
fieldset.monospace textarea {
- font-family: "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace;
+ font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
}
/* SUBMIT ROW */
.submit-row {
- padding: 5px 7px;
+ padding: 12px 14px;
+ margin: 0 0 20px;
+ background: #f8f8f8;
+ border: 1px solid #eee;
+ border-radius: 4px;
text-align: right;
- background: white url(../img/nav-bg.gif) 0 100% repeat-x;
- border: 1px solid #ccc;
- margin: 5px 0;
overflow: hidden;
}
@@ -178,26 +246,45 @@ body.popup .submit-row {
}
.submit-row input {
+ height: 35px;
+ line-height: 15px;
margin: 0 0 0 5px;
}
+.submit-row input.default {
+ margin: 0 0 0 8px;
+ text-transform: uppercase;
+}
+
.submit-row p {
margin: 0.3em;
}
.submit-row p.deletelink-box {
float: left;
+ margin: 0;
}
-.submit-row .deletelink {
- background: url(../img/icon_deletelink.gif) 0 50% no-repeat;
- padding-left: 14px;
+.submit-row a.deletelink {
+ display: block;
+ background: #ba2121;
+ border-radius: 4px;
+ padding: 10px 15px;
+ height: 15px;
+ line-height: 15px;
+ color: #fff;
+}
+
+.submit-row a.deletelink:focus,
+.submit-row a.deletelink:hover,
+.submit-row a.deletelink:active {
+ background: #a41515;
}
/* CUSTOM FORM FIELDS */
.vSelectMultipleField {
- vertical-align: top !important;
+ vertical-align: top;
}
.vCheckboxField {
@@ -206,6 +293,7 @@ body.popup .submit-row {
.vDateField, .vTimeField {
margin-right: 2px;
+ margin-bottom: 4px;
}
.vDateField {
@@ -252,12 +340,15 @@ body.popup .submit-row {
.inline-group {
padding: 0;
- border: 1px solid #ccc;
- margin: 10px 0;
+ margin: 0 0 30px;
+}
+
+.inline-group thead th {
+ padding: 8px 10px;
}
.inline-group .aligned label {
- width: 8em;
+ width: 160px;
}
.inline-related {
@@ -267,10 +358,11 @@ body.popup .submit-row {
.inline-related h3 {
margin: 0;
color: #666;
- padding: 3px 5px;
- font-size: 11px;
- background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
- border-bottom: 1px solid #ddd;
+ padding: 5px;
+ font-size: 13px;
+ background: #f8f8f8;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #eee;
}
.inline-related h3 span.delete {
@@ -301,7 +393,6 @@ body.popup .submit-row {
.inline-group .tabular fieldset.module {
border: none;
- border-bottom: 1px solid #ddd;
}
.inline-related.tabular fieldset.module table {
@@ -331,7 +422,7 @@ body.popup .submit-row {
position: absolute;
left: 0;
height: 1.1em;
- padding: 2px 7px;
+ padding: 2px 9px;
overflow: hidden;
font-size: 9px;
font-weight: bold;
@@ -353,23 +444,22 @@ body.popup .submit-row {
.inline-group div.add-row,
.inline-group .tabular tr.add-row td {
color: #666;
- padding: 3px 5px;
- border-bottom: 1px solid #ddd;
- background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
+ background: #f8f8f8;
+ padding: 8px 10px;
+ border-bottom: 1px solid #eee;
}
.inline-group .tabular tr.add-row td {
- padding: 4px 5px 3px;
- border-bottom: none;
+ padding: 8px 10px;
+ border-bottom: 1px solid #eee;
}
.inline-group ul.tools a.add,
.inline-group div.add-row a,
.inline-group .tabular tr.add-row td a {
- background: url(../img/icon_addlink.gif) 0 50% no-repeat;
- padding-left: 14px;
- font-size: 11px;
- outline: 0; /* Remove dotted border around link */
+ background: url(../img/icon-addlink.svg) 0 1px no-repeat;
+ padding-left: 16px;
+ font-size: 12px;
}
.empty-form {
@@ -381,16 +471,29 @@ body.popup .submit-row {
.add-another, .related-lookup {
margin-left: 5px;
display: inline-block;
+ vertical-align: middle;
+ background-repeat: no-repeat;
+ background-size: 14px;
}
.add-another {
- width: 10px;
- height: 10px;
- background-image: url(../img/icon_addlink.gif);
+ width: 16px;
+ height: 16px;
+ background-image: url(../img/icon-addlink.svg);
}
.related-lookup {
width: 16px;
height: 16px;
- background-image: url(../img/selector-search.gif);
+ background-image: url(../img/search.svg);
+}
+
+form .related-widget-wrapper ul {
+ display: inline-block;
+ margin-left: 0;
+ padding-left: 0;
+}
+
+.clearable-file-input input {
+ margin-top: 0;
}
diff --git a/static/admin/css/login.css b/static/admin/css/login.css
index a91de117b44837079629b606a9f8c3763603cd5d..cab3bbf5856ddc60ff90c50c7f638a35d3d1b818 100644
--- a/static/admin/css/login.css
+++ b/static/admin/css/login.css
@@ -1,31 +1,45 @@
/* LOGIN FORM */
body.login {
- background: #eee;
+ background: #f8f8f8;
+}
+
+.login #header {
+ height: auto;
+ padding: 5px 16px;
+}
+
+.login #header h1 {
+ font-size: 18px;
+}
+
+.login #header h1 a {
+ color: #fff;
+}
+
+.login #content {
+ padding: 20px 20px 0;
}
.login #container {
- background: white;
- border: 1px solid #ccc;
+ background: #fff;
+ border: 1px solid #eaeaea;
+ border-radius: 4px;
+ overflow: hidden;
width: 28em;
min-width: 300px;
- margin-left: auto;
- margin-right: auto;
- margin-top: 100px;
+ margin: 100px auto;
}
.login #content-main {
width: 100%;
}
-.login form {
- margin-top: 1em;
-}
-
.login .form-row {
padding: 4px 0;
float: left;
width: 100%;
+ border-bottom: none;
}
.login .form-row label {
@@ -38,7 +52,7 @@ body.login {
.login .form-row #id_username, .login .form-row #id_password {
clear: both;
- padding: 6px;
+ padding: 8px;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -53,6 +67,10 @@ body.login {
.login .submit-row {
clear: both;
padding: 1em 0 0 9.4em;
+ margin: 0;
+ border: none;
+ background: none;
+ text-align: left;
}
.login .password-reset-link {
diff --git a/static/admin/css/rtl.css b/static/admin/css/rtl.css
index 15db4015504f4a01c131f89718ea773d0a5998ba..8c1ceb4fd168fe51d42c95e42637782e06b7d8a2 100644
--- a/static/admin/css/rtl.css
+++ b/static/admin/css/rtl.css
@@ -30,16 +30,21 @@ th {
text-align: right;
}
+.module ul, .module ol {
+ margin-left: 0;
+ margin-right: 1.5em;
+}
+
.addlink, .changelink {
- padding-left: 0px;
- padding-right: 12px;
- background-position: 100% 0.2em;
+ padding-left: 0;
+ padding-right: 16px;
+ background-position: 100% 1px;
}
.deletelink {
- padding-left: 0px;
- padding-right: 12px;
- background-position: 100% 0.25em;
+ padding-left: 0;
+ padding-right: 16px;
+ background-position: 100% 1px;
}
.object-tools {
@@ -48,7 +53,7 @@ th {
thead th:first-child,
tfoot td:first-child {
- border-left: 1px solid #ddd !important;
+ border-left: none;
}
/* LAYOUT */
@@ -69,13 +74,13 @@ div.breadcrumbs {
#content-related {
float: left;
- margin-left: -19em;
+ margin-left: -300px;
margin-right: auto;
}
.colMS {
- margin-left: 20em !important;
- margin-right: 10px !important;
+ margin-left: 300px;
+ margin-right: 0;
}
/* SORTABLE TABLES */
@@ -93,51 +98,45 @@ thead th.sorted .text {
.dashboard .module table td a {
padding-left: .6em;
- padding-right: 12px;
+ padding-right: 16px;
}
/* changelists styles */
-.change-list .filtered {
- background: white url(../img/changelist-bg_rtl.gif) top left repeat-y !important;
-}
-
.change-list .filtered table {
- border-left: 1px solid #ddd;
+ border-left: none;
border-right: 0px none;
}
#changelist-filter {
right: auto;
left: 0;
- border-left: 0px none;
- border-right: 1px solid #ddd;
+ border-left: none;
+ border-right: none;
}
.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
- margin-right: 0px !important;
- margin-left: 160px !important;
+ margin-right: 0;
+ margin-left: 280px;
}
#changelist-filter li.selected {
- border-left: 0px none;
- padding-left: 0px;
+ border-left: none;
+ padding-left: 10px;
margin-left: 0;
- border-right: 5px solid #ccc;
- padding-right: 5px;
- margin-right: -10px;
+ border-right: 5px solid #eaeaea;
+ padding-right: 10px;
+ margin-right: -15px;
}
.filtered .actions {
- border-left:1px solid #DDDDDD;
- margin-left:160px !important;
- border-right: 0 none;
- margin-right:0 !important;
+ margin-left: 280px;
+ margin-right: 0;
}
#changelist table tbody td:first-child, #changelist table tbody th:first-child {
- border-right: 0;
- border-left: 1px solid #ddd;
+ border-right: none;
+ border-left: none;
}
/* FORMS */
@@ -155,15 +154,18 @@ thead th.sorted .text {
float: right;
}
-.submit-row .deletelink {
- background: url(../img/icon_deletelink.gif) 0 50% no-repeat;
- padding-right: 14px;
+.submit-row input.default {
+ margin-left: 0;
}
.vDateField, .vTimeField {
margin-left: 2px;
}
+.aligned .form-row input {
+ margin-left: 5px;
+}
+
form ul.inline li {
float: right;
padding-right: 0;
@@ -181,13 +183,13 @@ fieldset .field-box {
}
.errorlist li {
- background-position: 100% .3em;
- padding: 4px 25px 4px 5px;
+ background-position: 100% 12px;
+ padding: 0;
}
.errornote {
- background-position: 100% .3em;
- padding: 4px 25px 4px 5px;
+ background-position: 100% 12px;
+ padding: 10px 12px;
}
/* WIDGETS */
@@ -195,13 +197,13 @@ fieldset .field-box {
.calendarnav-previous {
top: 0;
left: auto;
- right: 0;
+ right: 10px;
}
.calendarnav-next {
top: 0;
right: auto;
- left: 0;
+ left: 10px;
}
.calendar caption, .calendarbox h2 {
@@ -220,6 +222,10 @@ fieldset .field-box {
float: left;
}
+form .form-row p.datetime {
+ overflow: hidden;
+}
+
/* MISC */
.inline-related h2, .inline-group h2 {
diff --git a/static/admin/css/widgets.css b/static/admin/css/widgets.css
index 3defc70d7d2419c1ca62b0dda4680768aa5cc7c1..d3bd67ac931baf8399cb6c3279f26aa266d1772f 100644
--- a/static/admin/css/widgets.css
+++ b/static/admin/css/widgets.css
@@ -1,18 +1,18 @@
/* SELECTOR (FILTER INTERFACE) */
.selector {
- width: 840px;
+ width: 800px;
float: left;
}
.selector select {
- width: 400px;
+ width: 380px;
height: 17.2em;
}
.selector-available, .selector-chosen {
float: left;
- width: 400px;
+ width: 380px;
text-align: center;
margin-bottom: 5px;
}
@@ -23,10 +23,16 @@
.selector-available h2, .selector-chosen h2 {
border: 1px solid #ccc;
+ border-radius: 4px 4px 0 0;
+}
+
+.selector-chosen h2 {
+ background: #79aec8;
+ color: #fff;
}
.selector .selector-available h2 {
- background: white url(../img/nav-bg.gif) bottom left repeat-x;
+ background: #f8f8f8;
color: #666;
}
@@ -34,7 +40,7 @@
background: white;
border: 1px solid #ccc;
border-width: 0 1px;
- padding: 3px;
+ padding: 8px;
color: #999;
font-size: 10px;
margin: 0;
@@ -43,12 +49,18 @@
.selector .selector-filter label,
.inline-group .aligned .selector .selector-filter label {
- width: 16px;
- padding: 2px;
+ float: left;
+ margin: 7px 0 0;
+ width: 18px;
+ height: 18px;
+ padding: 0;
+ overflow: hidden;
+ line-height: 1;
}
.selector .selector-available input {
- width: 360px;
+ width: 320px;
+ margin-left: 8px;
}
.selector ul.selector-chooser {
@@ -67,8 +79,9 @@
}
.selector select {
- margin-bottom: 10px;
- margin-top: 0;
+ padding: 0 10px;
+ margin: 0 0 10px;
+ border-radius: 0 0 4px 4px;
}
.selector-add, .selector-remove {
@@ -77,75 +90,85 @@
display: block;
text-indent: -3000px;
overflow: hidden;
+ cursor: default;
+ opacity: 0.3;
}
-.selector-add {
- background: url(../img/selector-icons.gif) 0 -161px no-repeat;
- cursor: default;
- margin-bottom: 2px;
+.active.selector-add, .active.selector-remove {
+ opacity: 1;
}
-.active.selector-add {
- background: url(../img/selector-icons.gif) 0 -187px no-repeat;
+.active.selector-add:hover, .active.selector-remove:hover {
cursor: pointer;
}
+.selector-add {
+ background: url(../img/selector-icons.svg) 0 -96px no-repeat;
+}
+
+.active.selector-add:focus, .active.selector-add:hover {
+ background-position: 0 -112px;
+}
+
.selector-remove {
- background: url(../img/selector-icons.gif) 0 -109px no-repeat;
- cursor: default;
+ background: url(../img/selector-icons.svg) 0 -64px no-repeat;
}
-.active.selector-remove {
- background: url(../img/selector-icons.gif) 0 -135px no-repeat;
- cursor: pointer;
+.active.selector-remove:focus, .active.selector-remove:hover {
+ background-position: 0 -80px;
}
a.selector-chooseall, a.selector-clearall {
display: inline-block;
+ height: 16px;
text-align: left;
- margin-left: auto;
- margin-right: auto;
+ margin: 1px auto 3px;
+ overflow: hidden;
font-weight: bold;
+ line-height: 16px;
color: #666;
+ text-decoration: none;
+ opacity: 0.3;
}
-a.selector-chooseall {
- padding: 3px 18px 3px 0;
+a.active.selector-chooseall:focus, a.active.selector-clearall:focus,
+a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
+ color: #447e9b;
}
-a.selector-clearall {
- padding: 3px 0 3px 18px;
+a.active.selector-chooseall, a.active.selector-clearall {
+ opacity: 1;
}
a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
- color: #036;
+ cursor: pointer;
}
a.selector-chooseall {
- background: url(../img/selector-icons.gif) right -263px no-repeat;
+ padding: 0 18px 0 0;
+ background: url(../img/selector-icons.svg) right -160px no-repeat;
cursor: default;
}
-a.active.selector-chooseall {
- background: url(../img/selector-icons.gif) right -289px no-repeat;
- cursor: pointer;
+a.active.selector-chooseall:focus, a.active.selector-chooseall:hover {
+ background-position: 100% -176px;
}
a.selector-clearall {
- background: url(../img/selector-icons.gif) left -211px no-repeat;
+ padding: 0 0 0 18px;
+ background: url(../img/selector-icons.svg) 0 -128px no-repeat;
cursor: default;
}
-a.active.selector-clearall {
- background: url(../img/selector-icons.gif) left -237px no-repeat;
- cursor: pointer;
+a.active.selector-clearall:focus, a.active.selector-clearall:hover {
+ background-position: 0 -144px;
}
/* STACKED SELECTORS */
.stacked {
float: left;
- width: 500px;
+ width: 490px;
}
.stacked select {
@@ -162,13 +185,13 @@ a.active.selector-clearall {
}
.stacked .selector-available input {
- width: 442px;
+ width: 422px;
}
.stacked ul.selector-chooser {
height: 22px;
width: 50px;
- margin: 0 0 3px 40%;
+ margin: 0 0 10px 40%;
background-color: #eee;
border-radius: 10px;
}
@@ -183,25 +206,45 @@ a.active.selector-clearall {
}
.stacked .selector-add {
- background: url(../img/selector-icons.gif) 0 -57px no-repeat;
+ background: url(../img/selector-icons.svg) 0 -32px no-repeat;
cursor: default;
}
.stacked .active.selector-add {
- background: url(../img/selector-icons.gif) 0 -83px no-repeat;
+ background-position: 0 -48px;
cursor: pointer;
}
.stacked .selector-remove {
- background: url(../img/selector-icons.gif) 0 -5px no-repeat;
+ background: url(../img/selector-icons.svg) 0 0 no-repeat;
cursor: default;
}
.stacked .active.selector-remove {
- background: url(../img/selector-icons.gif) 0 -31px no-repeat;
+ background-position: 0 -16px;
cursor: pointer;
}
+.selector .help-icon {
+ background: url(../img/icon-unknown.svg) 0 0 no-repeat;
+ display: inline-block;
+ vertical-align: middle;
+ margin: -2px 0 0 2px;
+ width: 13px;
+ height: 13px;
+}
+
+.selector .selector-chosen .help-icon {
+ background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat;
+}
+
+.selector .search-label-icon {
+ background: url(../img/search.svg) 0 0 no-repeat;
+ display: inline-block;
+ height: 18px;
+ width: 18px;
+}
+
/* DATE AND TIME */
p.datetime {
@@ -209,23 +252,61 @@ p.datetime {
margin: 0;
padding: 0;
color: #666;
- font-size: 11px;
font-weight: bold;
}
.datetime span {
+ white-space: nowrap;
+ font-weight: normal;
font-size: 11px;
color: #ccc;
- font-weight: normal;
- white-space: nowrap;
+}
+
+.datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField {
+ min-width: 0;
+ margin-left: 5px;
+ margin-bottom: 4px;
}
table p.datetime {
- font-size: 10px;
+ font-size: 11px;
margin-left: 0;
padding-left: 0;
}
+.datetimeshortcuts .clock-icon, .datetimeshortcuts .date-icon {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+ height: 16px;
+ width: 16px;
+ overflow: hidden;
+}
+
+.datetimeshortcuts .clock-icon {
+ background: url(../img/icon-clock.svg) 0 0 no-repeat;
+}
+
+.datetimeshortcuts a:focus .clock-icon,
+.datetimeshortcuts a:hover .clock-icon {
+ background-position: 0 -16px;
+}
+
+.datetimeshortcuts .date-icon {
+ background: url(../img/icon-calendar.svg) 0 0 no-repeat;
+ top: -1px;
+}
+
+.datetimeshortcuts a:focus .date-icon,
+.datetimeshortcuts a:hover .date-icon {
+ background-position: 0 -16px;
+}
+
+.timezonewarning {
+ font-size: 11px;
+ color: #999;
+}
+
/* URL */
p.url {
@@ -252,6 +333,10 @@ p.file-upload {
font-weight: bold;
}
+.aligned p.file-upload {
+ margin-left: 170px;
+}
+
.file-upload a {
font-weight: normal;
}
@@ -271,10 +356,14 @@ span.clearable-file-input label {
.calendarbox, .clockbox {
margin: 5px auto;
- font-size: 11px;
- width: 16em;
+ font-size: 12px;
+ width: 19em;
text-align: center;
background: white;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
+ overflow: hidden;
position: relative;
}
@@ -297,22 +386,27 @@ span.clearable-file-input label {
.calendar caption, .calendarbox h2 {
margin: 0;
- font-size: 11px;
text-align: center;
border-top: none;
+ background: #f5dd5d;
+ font-weight: 700;
+ font-size: 12px;
+ color: #333;
}
.calendar th {
- font-size: 10px;
- color: #666;
- padding: 2px 3px;
- text-align: center;
- background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x;
+ padding: 8px 5px;
+ background: #f8f8f8;
border-bottom: 1px solid #ddd;
+ font-weight: 400;
+ font-size: 12px;
+ text-align: center;
+ color: #666;
}
.calendar td {
- font-size: 11px;
+ font-weight: 400;
+ font-size: 12px;
text-align: center;
padding: 0;
border-top: 1px solid #eee;
@@ -320,32 +414,34 @@ span.clearable-file-input label {
}
.calendar td.selected a {
- background: #C9DBED;
+ background: #79aec8;
+ color: #fff;
}
.calendar td.nonday {
- background: #efefef;
+ background: #f8f8f8;
}
.calendar td.today a {
- background: #ffc;
+ font-weight: 700;
}
.calendar td a, .timelist a {
display: block;
- font-weight: bold;
- padding: 4px;
+ font-weight: 400;
+ padding: 6px;
text-decoration: none;
color: #444;
}
+.calendar td a:focus, .timelist a:focus,
.calendar td a:hover, .timelist a:hover {
- background: #5b80b2;
+ background: #79aec8;
color: white;
}
.calendar td a:active, .timelist a:active {
- background: #036;
+ background: #417690;
color: white;
}
@@ -357,53 +453,61 @@ span.clearable-file-input label {
padding: 1px 3px;
}
-.calendarnav a:link, #calendarnav a:visited, #calendarnav a:hover {
+.calendarnav a:link, #calendarnav a:visited,
+#calendarnav a:focus, #calendarnav a:hover {
color: #999;
}
.calendar-shortcuts {
background: white;
- font-size: 10px;
+ font-size: 11px;
line-height: 11px;
border-top: 1px solid #eee;
- padding: 3px 0 4px;
+ padding: 8px 0;
color: #ccc;
}
.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next {
display: block;
position: absolute;
- font-weight: bold;
- font-size: 12px;
- background: #C9DBED url(../img/default-bg.gif) bottom left repeat-x;
- padding: 1px 4px 2px 4px;
- color: white;
+ top: 8px;
+ width: 15px;
+ height: 15px;
+ text-indent: -9999px;
+ padding: 0;
}
-.calendarnav-previous:hover, .calendarnav-next:hover {
- background: #036;
+.calendarnav-previous {
+ left: 10px;
+ background: url(../img/calendar-icons.svg) 0 0 no-repeat;
}
-.calendarnav-previous {
- top: 0;
- left: 0;
+.calendarbox .calendarnav-previous:focus,
+.calendarbox .calendarnav-previous:hover {
+ background-position: 0 -15px;
}
.calendarnav-next {
- top: 0;
- right: 0;
+ right: 10px;
+ background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
+}
+
+.calendarbox .calendarnav-next:focus,
+.calendarbox .calendarnav-next:hover {
+ background-position: 0 -45px;
}
.calendar-cancel {
- margin: 0 !important;
- padding: 0 !important;
- font-size: 10px;
- background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x;
+ margin: 0;
+ padding: 4px 0;
+ font-size: 12px;
+ background: #eee;
border-top: 1px solid #ddd;
+ color: #333;
}
-.calendar-cancel:hover {
- background: #e1e1e1 url(../img/nav-bg-reverse.gif) 0 50% repeat-x;
+.calendar-cancel:focus, .calendar-cancel:hover {
+ background: #ddd;
}
.calendar-cancel a {
@@ -421,162 +525,21 @@ ul.timelist, .timelist li {
padding: 2px;
}
-/* INLINE ORDERER */
-
-ul.orderer {
- position: relative;
- padding: 0 !important;
- margin: 0 !important;
- list-style-type: none;
-}
-
-ul.orderer li {
- list-style-type: none;
- display: block;
- padding: 0;
- margin: 0;
- border: 1px solid #bbb;
- border-width: 0 1px 1px 0;
- white-space: nowrap;
- overflow: hidden;
- background: #e2e2e2 url(../img/nav-bg-grabber.gif) repeat-y;
-}
-
-ul.orderer li:hover {
- cursor: move;
- background-color: #ddd;
-}
-
-ul.orderer li a.selector {
- margin-left: 12px;
- overflow: hidden;
- width: 83%;
- font-size: 10px !important;
- padding: 0.6em 0;
-}
-
-ul.orderer li a:link, ul.orderer li a:visited {
- color: #333;
-}
-
-ul.orderer li .inline-deletelink {
- position: absolute;
- right: 4px;
- margin-top: 0.6em;
-}
-
-ul.orderer li.selected {
- background-color: #f8f8f8;
- border-right-color: #f8f8f8;
-}
-
-ul.orderer li.deleted {
- background: #bbb url(../img/deleted-overlay.gif);
-}
-
-ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
- color: #888;
-}
-
-ul.orderer li.deleted .inline-deletelink {
- background-image: url(../img/inline-restore.png);
-}
-
-ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
- cursor: default;
-}
-
/* EDIT INLINE */
.inline-deletelink {
float: right;
text-indent: -9999px;
- background: transparent url(../img/inline-delete.png) no-repeat;
- width: 15px;
- height: 15px;
- border: 0px none;
- outline: 0; /* Remove dotted border around link */
-}
-
-.inline-deletelink:hover {
- background-position: -15px 0;
- cursor: pointer;
-}
-
-.editinline button.addlink {
+ background: url(../img/inline-delete.svg) 0 0 no-repeat;
+ width: 16px;
+ height: 16px;
border: 0px none;
- color: #5b80b2;
- font-size: 100%;
- cursor: pointer;
}
-.editinline button.addlink:hover {
- color: #036;
+.inline-deletelink:focus, .inline-deletelink:hover {
cursor: pointer;
}
-.editinline table .help {
- text-align: right;
- float: right;
- padding-left: 2em;
-}
-
-.editinline tfoot .addlink {
- white-space: nowrap;
-}
-
-.editinline table thead th:last-child {
- border-left: none;
-}
-
-.editinline tr.deleted {
- background: #ddd url(../img/deleted-overlay.gif);
-}
-
-.editinline tr.deleted .inline-deletelink {
- background-image: url(../img/inline-restore.png);
-}
-
-.editinline tr.deleted td:hover {
- cursor: default;
-}
-
-.editinline tr.deleted td:first-child {
- background-image: none !important;
-}
-
-/* EDIT INLINE - STACKED */
-
-.editinline-stacked {
- min-width: 758px;
-}
-
-.editinline-stacked .inline-object {
- margin-left: 210px;
- background: white;
-}
-
-.editinline-stacked .inline-source {
- float: left;
- width: 200px;
- background: #f8f8f8;
-}
-
-.editinline-stacked .inline-splitter {
- float: left;
- width: 9px;
- background: #f8f8f8 url(../img/inline-splitter-bg.gif) 50% 50% no-repeat;
- border-right: 1px solid #ccc;
-}
-
-.editinline-stacked .controls {
- clear: both;
- background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
- padding: 3px 4px;
- font-size: 11px;
- border-top: 1px solid #ddd;
-}
-
/* RELATED WIDGET WRAPPER */
.related-widget-wrapper {
float: left; /* display properly in form rows with multiple fields */
@@ -588,5 +551,15 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
}
.related-widget-wrapper-link:link {
+ opacity: .8;
+}
+
+.related-widget-wrapper-link:link:focus,
+.related-widget-wrapper-link:link:hover {
opacity: 1;
}
+
+select + .related-widget-wrapper-link,
+.related-widget-wrapper-link + .related-widget-wrapper-link {
+ margin-left: 7px;
+}
diff --git a/static/admin/js/SelectBox.js b/static/admin/js/SelectBox.js
index db3206ccf528fe0d87bb84477ddd17f426bbafa3..95825d86af5caf19cd4108188aeebc5245dbb310 100644
--- a/static/admin/js/SelectBox.js
+++ b/static/admin/js/SelectBox.js
@@ -1,114 +1,135 @@
-var SelectBox = {
- cache: new Object(),
- init: function(id) {
- var box = document.getElementById(id);
- var node;
- SelectBox.cache[id] = new Array();
- var cache = SelectBox.cache[id];
- for (var i = 0; (node = box.options[i]); i++) {
- cache.push({value: node.value, text: node.text, displayed: 1});
- }
- },
- redisplay: function(id) {
- // Repopulate HTML select box from cache
- var box = document.getElementById(id);
- box.options.length = 0; // clear all options
- for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) {
- var node = SelectBox.cache[id][i];
- if (node.displayed) {
- var new_option = new Option(node.text, node.value, false, false);
- // Shows a tooltip when hovering over the option
- new_option.setAttribute("title", node.text);
- box.options[box.options.length] = new_option;
+(function() {
+ 'use strict';
+ var SelectBox = {
+ cache: {},
+ init: function(id) {
+ var box = document.getElementById(id);
+ var node;
+ SelectBox.cache[id] = [];
+ var cache = SelectBox.cache[id];
+ for (var i = 0, j = box.options.length; i < j; i++) {
+ node = box.options[i];
+ cache.push({value: node.value, text: node.text, displayed: 1});
}
- }
- },
- filter: function(id, text) {
- // Redisplay the HTML select box, displaying only the choices containing ALL
- // the words in text. (It's an AND search.)
- var tokens = text.toLowerCase().split(/\s+/);
- var node, token;
- for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
- node.displayed = 1;
- for (var j = 0; (token = tokens[j]); j++) {
- if (node.text.toLowerCase().indexOf(token) == -1) {
- node.displayed = 0;
+ },
+ redisplay: function(id) {
+ // Repopulate HTML select box from cache
+ var box = document.getElementById(id);
+ var node;
+ box.options.length = 0; // clear all options
+ var cache = SelectBox.cache[id];
+ for (var i = 0, j = cache.length; i < j; i++) {
+ node = cache[i];
+ if (node.displayed) {
+ var new_option = new Option(node.text, node.value, false, false);
+ // Shows a tooltip when hovering over the option
+ new_option.setAttribute("title", node.text);
+ box.options[box.options.length] = new_option;
}
}
- }
- SelectBox.redisplay(id);
- },
- delete_from_cache: function(id, value) {
- var node, delete_index = null;
- for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
- if (node.value == value) {
- delete_index = i;
- break;
+ },
+ filter: function(id, text) {
+ // Redisplay the HTML select box, displaying only the choices containing ALL
+ // the words in text. (It's an AND search.)
+ var tokens = text.toLowerCase().split(/\s+/);
+ var node, token;
+ var cache = SelectBox.cache[id];
+ for (var i = 0, j = cache.length; i < j; i++) {
+ node = cache[i];
+ node.displayed = 1;
+ var numTokens = tokens.length;
+ for (var k = 0; k < numTokens; k++) {
+ token = tokens[k];
+ if (node.text.toLowerCase().indexOf(token) === -1) {
+ node.displayed = 0;
+ }
+ }
}
- }
- var j = SelectBox.cache[id].length - 1;
- for (var i = delete_index; i < j; i++) {
- SelectBox.cache[id][i] = SelectBox.cache[id][i+1];
- }
- SelectBox.cache[id].length--;
- },
- add_to_cache: function(id, option) {
- SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1});
- },
- cache_contains: function(id, value) {
- // Check if an item is contained in the cache
- var node;
- for (var i = 0; (node = SelectBox.cache[id][i]); i++) {
- if (node.value == value) {
- return true;
+ SelectBox.redisplay(id);
+ },
+ delete_from_cache: function(id, value) {
+ var node, delete_index = null;
+ var cache = SelectBox.cache[id];
+ for (var i = 0, j = cache.length; i < j; i++) {
+ node = cache[i];
+ if (node.value === value) {
+ delete_index = i;
+ break;
+ }
}
- }
- return false;
- },
- move: function(from, to) {
- var from_box = document.getElementById(from);
- var to_box = document.getElementById(to);
- var option;
- for (var i = 0; (option = from_box.options[i]); i++) {
- if (option.selected && SelectBox.cache_contains(from, option.value)) {
- SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
- SelectBox.delete_from_cache(from, option.value);
+ var k = cache.length - 1;
+ for (i = delete_index; i < k; i++) {
+ cache[i] = cache[i + 1];
}
- }
- SelectBox.redisplay(from);
- SelectBox.redisplay(to);
- },
- move_all: function(from, to) {
- var from_box = document.getElementById(from);
- var to_box = document.getElementById(to);
- var option;
- for (var i = 0; (option = from_box.options[i]); i++) {
- if (SelectBox.cache_contains(from, option.value)) {
- SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
- SelectBox.delete_from_cache(from, option.value);
+ cache.length--;
+ },
+ add_to_cache: function(id, option) {
+ SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1});
+ },
+ cache_contains: function(id, value) {
+ // Check if an item is contained in the cache
+ var node;
+ var cache = SelectBox.cache[id];
+ for (var i = 0, j = cache.length; i < j; i++) {
+ node = cache[i];
+ if (node.value === value) {
+ return true;
+ }
}
- }
- SelectBox.redisplay(from);
- SelectBox.redisplay(to);
- },
- sort: function(id) {
- SelectBox.cache[id].sort( function(a, b) {
- a = a.text.toLowerCase();
- b = b.text.toLowerCase();
- try {
- if (a > b) return 1;
- if (a < b) return -1;
+ return false;
+ },
+ move: function(from, to) {
+ var from_box = document.getElementById(from);
+ var option;
+ var boxOptions = from_box.options;
+ for (var i = 0, j = boxOptions.length; i < j; i++) {
+ option = boxOptions[i];
+ if (option.selected && SelectBox.cache_contains(from, option.value)) {
+ SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
+ SelectBox.delete_from_cache(from, option.value);
+ }
}
- catch (e) {
- // silently fail on IE 'unknown' exception
+ SelectBox.redisplay(from);
+ SelectBox.redisplay(to);
+ },
+ move_all: function(from, to) {
+ var from_box = document.getElementById(from);
+ var option;
+ var boxOptions = from_box.options;
+ for (var i = 0, j = boxOptions.length; i < j; i++) {
+ option = boxOptions[i];
+ if (SelectBox.cache_contains(from, option.value)) {
+ SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
+ SelectBox.delete_from_cache(from, option.value);
+ }
+ }
+ SelectBox.redisplay(from);
+ SelectBox.redisplay(to);
+ },
+ sort: function(id) {
+ SelectBox.cache[id].sort(function(a, b) {
+ a = a.text.toLowerCase();
+ b = b.text.toLowerCase();
+ try {
+ if (a > b) {
+ return 1;
+ }
+ if (a < b) {
+ return -1;
+ }
+ }
+ catch (e) {
+ // silently fail on IE 'unknown' exception
+ }
+ return 0;
+ } );
+ },
+ select_all: function(id) {
+ var box = document.getElementById(id);
+ for (var i = 0; i < box.options.length; i++) {
+ box.options[i].selected = 'selected';
}
- return 0;
- } );
- },
- select_all: function(id) {
- var box = document.getElementById(id);
- for (var i = 0; i < box.options.length; i++) {
- box.options[i].selected = 'selected';
}
- }
-}
+ };
+ window.SelectBox = SelectBox;
+})();
diff --git a/static/admin/js/SelectFilter2.js b/static/admin/js/SelectFilter2.js
index 6c8a4b4453972d46223590c3217863d38a4ff369..acf3996c389a3ff3c66ef3b73fb385f4fb9f215e 100644
--- a/static/admin/js/SelectFilter2.js
+++ b/static/admin/js/SelectFilter2.js
@@ -1,166 +1,198 @@
+/*global SelectBox, addEvent, gettext, interpolate, quickElement, SelectFilter*/
/*
SelectFilter2 - Turns a multiple-select box into a filter interface.
Requires core.js, SelectBox.js and addevent.js.
*/
(function($) {
-function findForm(node) {
- // returns the node of the form containing the given node
- if (node.tagName.toLowerCase() != 'form') {
- return findForm(node.parentNode);
- }
- return node;
-}
-
-window.SelectFilter = {
- init: function(field_id, field_name, is_stacked, admin_static_prefix) {
- if (field_id.match(/__prefix__/)){
- // Don't initialize on empty forms.
- return;
- }
- var from_box = document.getElementById(field_id);
- from_box.id += '_from'; // change its ID
- from_box.className = 'filtered';
-
- var ps = from_box.parentNode.getElementsByTagName('p');
- for (var i=0; i<ps.length; i++) {
- if (ps[i].className.indexOf("info") != -1) {
- // Remove <p class="info">, because it just gets in the way.
- from_box.parentNode.removeChild(ps[i]);
- } else if (ps[i].className.indexOf("help") != -1) {
- // Move help text up to the top so it isn't below the select
- // boxes or wrapped off on the side to the right of the add
- // button:
- from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild);
- }
+ 'use strict';
+ function findForm(node) {
+ // returns the node of the form containing the given node
+ if (node.tagName.toLowerCase() !== 'form') {
+ return findForm(node.parentNode);
}
+ return node;
+ }
- // <div class="selector"> or <div class="selector stacked">
- var selector_div = quickElement('div', from_box.parentNode);
- selector_div.className = is_stacked ? 'selector stacked' : 'selector';
-
- // <div class="selector-available">
- var selector_available = quickElement('div', selector_div);
- selector_available.className = 'selector-available';
- var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
- quickElement('img', title_available, '', 'src', admin_static_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of available %s. You may choose some by selecting them in the box below and then clicking the "Choose" arrow between the two boxes.'), [field_name]));
-
- var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
- filter_p.className = 'selector-filter';
-
- var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + "_input");
-
- var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_static_prefix + 'img/selector-search.gif', 'class', 'help-tooltip', 'alt', '', 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]));
-
- filter_p.appendChild(document.createTextNode(' '));
-
- var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
- filter_input.id = field_id + '_input';
-
- selector_available.appendChild(from_box);
- var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_all_link');
- choose_all.className = 'selector-chooseall';
-
- // <ul class="selector-chooser">
- var selector_chooser = quickElement('ul', selector_div);
- selector_chooser.className = 'selector-chooser';
- var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_add_link');
- add_link.className = 'selector-add';
- var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_link');
- remove_link.className = 'selector-remove';
-
- // <div class="selector-chosen">
- var selector_chosen = quickElement('div', selector_div);
- selector_chosen.className = 'selector-chosen';
- var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
- quickElement('img', title_chosen, '', 'src', admin_static_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of chosen %s. You may remove some by selecting them in the box below and then clicking the "Remove" arrow between the two boxes.'), [field_name]));
-
- var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
- to_box.className = 'filtered';
- var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_all_link');
- clear_all.className = 'selector-clearall';
-
- from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
-
- // Set up the JavaScript event handlers for the select box filter interface
- addEvent(filter_input, 'keypress', function(e) { SelectFilter.filter_key_press(e, field_id); });
- addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); });
- addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); });
- addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
- addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
- addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
- addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
- addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); });
- SelectBox.init(field_id + '_from');
- SelectBox.init(field_id + '_to');
- // Move selected from_box options to to_box
- SelectBox.move(field_id + '_from', field_id + '_to');
-
- if (!is_stacked) {
- // In horizontal mode, give the same height to the two boxes.
- var j_from_box = $(from_box);
- var j_to_box = $(to_box);
- var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); }
- if (j_from_box.outerHeight() > 0) {
- resize_filters(); // This fieldset is already open. Resize now.
- } else {
- // This fieldset is probably collapsed. Wait for its 'show' event.
- j_to_box.closest('fieldset').one('show.fieldset', resize_filters);
+ window.SelectFilter = {
+ init: function(field_id, field_name, is_stacked) {
+ if (field_id.match(/__prefix__/)) {
+ // Don't initialize on empty forms.
+ return;
+ }
+ var from_box = document.getElementById(field_id);
+ from_box.id += '_from'; // change its ID
+ from_box.className = 'filtered';
+
+ var ps = from_box.parentNode.getElementsByTagName('p');
+ for (var i = 0; i < ps.length; i++) {
+ if (ps[i].className.indexOf("info") !== -1) {
+ // Remove <p class="info">, because it just gets in the way.
+ from_box.parentNode.removeChild(ps[i]);
+ } else if (ps[i].className.indexOf("help") !== -1) {
+ // Move help text up to the top so it isn't below the select
+ // boxes or wrapped off on the side to the right of the add
+ // button:
+ from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild);
+ }
}
- }
- // Initial icon refresh
- SelectFilter.refresh_icons(field_id);
- },
- refresh_icons: function(field_id) {
- var from = $('#' + field_id + '_from');
- var to = $('#' + field_id + '_to');
- var is_from_selected = from.find('option:selected').length > 0;
- var is_to_selected = to.find('option:selected').length > 0;
- // Active if at least one item is selected
- $('#' + field_id + '_add_link').toggleClass('active', is_from_selected);
- $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected);
- // Active if the corresponding box isn't empty
- $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
- $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
- },
- filter_key_press: function(event, field_id) {
- var from = document.getElementById(field_id + '_from');
- // don't submit form if user pressed Enter
- if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) {
- from.selectedIndex = 0;
- SelectBox.move(field_id + '_from', field_id + '_to');
- from.selectedIndex = 0;
- event.preventDefault()
- return false;
- }
- },
- filter_key_up: function(event, field_id) {
- var from = document.getElementById(field_id + '_from');
- var temp = from.selectedIndex;
- SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
- from.selectedIndex = temp;
- return true;
- },
- filter_key_down: function(event, field_id) {
- var from = document.getElementById(field_id + '_from');
- // right arrow -- move across
- if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) {
- var old_index = from.selectedIndex;
+ // <div class="selector"> or <div class="selector stacked">
+ var selector_div = quickElement('div', from_box.parentNode);
+ selector_div.className = is_stacked ? 'selector stacked' : 'selector';
+
+ // <div class="selector-available">
+ var selector_available = quickElement('div', selector_div);
+ selector_available.className = 'selector-available';
+ var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
+ quickElement(
+ 'span', title_available, '',
+ 'class', 'help help-tooltip help-icon',
+ 'title', interpolate(
+ gettext(
+ 'This is the list of available %s. You may choose some by ' +
+ 'selecting them in the box below and then clicking the ' +
+ '"Choose" arrow between the two boxes.'
+ ),
+ [field_name]
+ )
+ );
+
+ var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
+ filter_p.className = 'selector-filter';
+
+ var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input');
+
+ quickElement(
+ 'span', search_filter_label, '',
+ 'class', 'help-tooltip search-label-icon',
+ 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name])
+ );
+
+ filter_p.appendChild(document.createTextNode(' '));
+
+ var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
+ filter_input.id = field_id + '_input';
+
+ selector_available.appendChild(from_box);
+ var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_add_all_link');
+ choose_all.className = 'selector-chooseall';
+
+ // <ul class="selector-chooser">
+ var selector_chooser = quickElement('ul', selector_div);
+ selector_chooser.className = 'selector-chooser';
+ var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', 'javascript:void(0);', 'id', field_id + '_add_link');
+ add_link.className = 'selector-add';
+ var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', 'javascript:void(0);', 'id', field_id + '_remove_link');
+ remove_link.className = 'selector-remove';
+
+ // <div class="selector-chosen">
+ var selector_chosen = quickElement('div', selector_div);
+ selector_chosen.className = 'selector-chosen';
+ var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
+ quickElement(
+ 'span', title_chosen, '',
+ 'class', 'help help-tooltip help-icon',
+ 'title', interpolate(
+ gettext(
+ 'This is the list of chosen %s. You may remove some by ' +
+ 'selecting them in the box below and then clicking the ' +
+ '"Remove" arrow between the two boxes.'
+ ),
+ [field_name]
+ )
+ );
+
+ var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
+ to_box.className = 'filtered';
+ var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_remove_all_link');
+ clear_all.className = 'selector-clearall';
+
+ from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
+
+ // Set up the JavaScript event handlers for the select box filter interface
+ addEvent(choose_all, 'click', function() { SelectBox.move_all(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+ addEvent(add_link, 'click', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+ addEvent(remove_link, 'click', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+ addEvent(clear_all, 'click', function() { SelectBox.move_all(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+ addEvent(filter_input, 'keypress', function(e) { SelectFilter.filter_key_press(e, field_id); });
+ addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); });
+ addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); });
+ addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); });
+ addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); });
+ addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+ addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+ addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); });
+ SelectBox.init(field_id + '_from');
+ SelectBox.init(field_id + '_to');
+ // Move selected from_box options to to_box
SelectBox.move(field_id + '_from', field_id + '_to');
- from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index;
- return false;
- }
- // down arrow -- wrap around
- if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) {
- from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1;
- }
- // up arrow -- wrap around
- if ((event.which && event.which == 38) || (event.keyCode && event.keyCode == 38)) {
- from.selectedIndex = (from.selectedIndex == 0) ? from.length - 1 : from.selectedIndex - 1;
+
+ if (!is_stacked) {
+ // In horizontal mode, give the same height to the two boxes.
+ var j_from_box = $(from_box);
+ var j_to_box = $(to_box);
+ var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); };
+ if (j_from_box.outerHeight() > 0) {
+ resize_filters(); // This fieldset is already open. Resize now.
+ } else {
+ // This fieldset is probably collapsed. Wait for its 'show' event.
+ j_to_box.closest('fieldset').one('show.fieldset', resize_filters);
+ }
+ }
+
+ // Initial icon refresh
+ SelectFilter.refresh_icons(field_id);
+ },
+ refresh_icons: function(field_id) {
+ var from = $('#' + field_id + '_from');
+ var to = $('#' + field_id + '_to');
+ var is_from_selected = from.find('option:selected').length > 0;
+ var is_to_selected = to.find('option:selected').length > 0;
+ // Active if at least one item is selected
+ $('#' + field_id + '_add_link').toggleClass('active', is_from_selected);
+ $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected);
+ // Active if the corresponding box isn't empty
+ $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
+ $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
+ },
+ filter_key_press: function(event, field_id) {
+ var from = document.getElementById(field_id + '_from');
+ // don't submit form if user pressed Enter
+ if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) {
+ from.selectedIndex = 0;
+ SelectBox.move(field_id + '_from', field_id + '_to');
+ from.selectedIndex = 0;
+ event.preventDefault();
+ return false;
+ }
+ },
+ filter_key_up: function(event, field_id) {
+ var from = document.getElementById(field_id + '_from');
+ var temp = from.selectedIndex;
+ SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
+ from.selectedIndex = temp;
+ return true;
+ },
+ filter_key_down: function(event, field_id) {
+ var from = document.getElementById(field_id + '_from');
+ // right arrow -- move across
+ if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) {
+ var old_index = from.selectedIndex;
+ SelectBox.move(field_id + '_from', field_id + '_to');
+ from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index;
+ return false;
+ }
+ // down arrow -- wrap around
+ if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) {
+ from.selectedIndex = (from.length === from.selectedIndex + 1) ? 0 : from.selectedIndex + 1;
+ }
+ // up arrow -- wrap around
+ if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) {
+ from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1;
+ }
+ return true;
}
- return true;
- }
-}
+ };
})(django.jQuery);
diff --git a/static/admin/js/actions.js b/static/admin/js/actions.js
index 58f572f252a7f23328f38dddb571f01dad1e5325..95e8492b98c4a089b3332555905305e594514184 100644
--- a/static/admin/js/actions.js
+++ b/static/admin/js/actions.js
@@ -1,144 +1,146 @@
+/*global _actions_icnt, gettext, interpolate, ngettext*/
(function($) {
- var lastChecked;
+ 'use strict';
+ var lastChecked;
- $.fn.actions = function(opts) {
- var options = $.extend({}, $.fn.actions.defaults, opts);
- var actionCheckboxes = $(this);
- var list_editable_changed = false;
- var checker = function(checked) {
- if (checked) {
- showQuestion();
- } else {
- reset();
- }
- $(actionCheckboxes).prop("checked", checked)
- .parent().parent().toggleClass(options.selectedClass, checked);
- },
- updateCounter = function() {
- var sel = $(actionCheckboxes).filter(":checked").length;
- // _actions_icnt is defined in the generated HTML
- // and contains the total amount of objects in the queryset
- $(options.counterContainer).html(interpolate(
- ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {
- sel: sel,
- cnt: _actions_icnt
- }, true));
- $(options.allToggle).prop("checked", function() {
- var value;
- if (sel == actionCheckboxes.length) {
- value = true;
- showQuestion();
- } else {
- value = false;
- clearAcross();
- }
- return value;
- });
- },
- showQuestion = function() {
- $(options.acrossClears).hide();
- $(options.acrossQuestions).show();
- $(options.allContainer).hide();
- },
- showClear = function() {
- $(options.acrossClears).show();
- $(options.acrossQuestions).hide();
- $(options.actionContainer).toggleClass(options.selectedClass);
- $(options.allContainer).show();
- $(options.counterContainer).hide();
- },
- reset = function() {
- $(options.acrossClears).hide();
- $(options.acrossQuestions).hide();
- $(options.allContainer).hide();
- $(options.counterContainer).show();
- },
- clearAcross = function() {
- reset();
- $(options.acrossInput).val(0);
- $(options.actionContainer).removeClass(options.selectedClass);
- };
- // Show counter by default
- $(options.counterContainer).show();
- // Check state of checkboxes and reinit state if needed
- $(this).filter(":checked").each(function(i) {
- $(this).parent().parent().toggleClass(options.selectedClass);
- updateCounter();
- if ($(options.acrossInput).val() == 1) {
- showClear();
- }
- });
- $(options.allToggle).show().click(function() {
- checker($(this).prop("checked"));
- updateCounter();
- });
- $("a", options.acrossQuestions).click(function(event) {
- event.preventDefault();
- $(options.acrossInput).val(1);
- showClear();
- });
- $("a", options.acrossClears).click(function(event) {
- event.preventDefault();
- $(options.allToggle).prop("checked", false);
- clearAcross();
- checker(0);
- updateCounter();
- });
- lastChecked = null;
- $(actionCheckboxes).click(function(event) {
- if (!event) { event = window.event; }
- var target = event.target ? event.target : event.srcElement;
- if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey === true) {
- var inrange = false;
- $(lastChecked).prop("checked", target.checked)
- .parent().parent().toggleClass(options.selectedClass, target.checked);
- $(actionCheckboxes).each(function() {
- if ($.data(this) == $.data(lastChecked) || $.data(this) == $.data(target)) {
- inrange = (inrange) ? false : true;
- }
- if (inrange) {
- $(this).prop("checked", target.checked)
- .parent().parent().toggleClass(options.selectedClass, target.checked);
- }
- });
- }
- $(target).parent().parent().toggleClass(options.selectedClass, target.checked);
- lastChecked = target;
- updateCounter();
- });
- $('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() {
- list_editable_changed = true;
- });
- $('form#changelist-form button[name="index"]').click(function(event) {
- if (list_editable_changed) {
- return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));
- }
- });
- $('form#changelist-form input[name="_save"]').click(function(event) {
- var action_changed = false;
- $('select option:selected', options.actionContainer).each(function() {
- if ($(this).val()) {
- action_changed = true;
- }
- });
- if (action_changed) {
- if (list_editable_changed) {
- return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."));
- } else {
- return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."));
- }
- }
- });
- };
- /* Setup plugin defaults */
- $.fn.actions.defaults = {
- actionContainer: "div.actions",
- counterContainer: "span.action-counter",
- allContainer: "div.actions span.all",
- acrossInput: "div.actions input.select-across",
- acrossQuestions: "div.actions span.question",
- acrossClears: "div.actions span.clear",
- allToggle: "#action-toggle",
- selectedClass: "selected"
- };
+ $.fn.actions = function(opts) {
+ var options = $.extend({}, $.fn.actions.defaults, opts);
+ var actionCheckboxes = $(this);
+ var list_editable_changed = false;
+ var showQuestion = function() {
+ $(options.acrossClears).hide();
+ $(options.acrossQuestions).show();
+ $(options.allContainer).hide();
+ },
+ showClear = function() {
+ $(options.acrossClears).show();
+ $(options.acrossQuestions).hide();
+ $(options.actionContainer).toggleClass(options.selectedClass);
+ $(options.allContainer).show();
+ $(options.counterContainer).hide();
+ },
+ reset = function() {
+ $(options.acrossClears).hide();
+ $(options.acrossQuestions).hide();
+ $(options.allContainer).hide();
+ $(options.counterContainer).show();
+ },
+ clearAcross = function() {
+ reset();
+ $(options.acrossInput).val(0);
+ $(options.actionContainer).removeClass(options.selectedClass);
+ },
+ checker = function(checked) {
+ if (checked) {
+ showQuestion();
+ } else {
+ reset();
+ }
+ $(actionCheckboxes).prop("checked", checked)
+ .parent().parent().toggleClass(options.selectedClass, checked);
+ },
+ updateCounter = function() {
+ var sel = $(actionCheckboxes).filter(":checked").length;
+ // _actions_icnt is defined in the generated HTML
+ // and contains the total amount of objects in the queryset
+ $(options.counterContainer).html(interpolate(
+ ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {
+ sel: sel,
+ cnt: _actions_icnt
+ }, true));
+ $(options.allToggle).prop("checked", function() {
+ var value;
+ if (sel === actionCheckboxes.length) {
+ value = true;
+ showQuestion();
+ } else {
+ value = false;
+ clearAcross();
+ }
+ return value;
+ });
+ };
+ // Show counter by default
+ $(options.counterContainer).show();
+ // Check state of checkboxes and reinit state if needed
+ $(this).filter(":checked").each(function(i) {
+ $(this).parent().parent().toggleClass(options.selectedClass);
+ updateCounter();
+ if ($(options.acrossInput).val() === 1) {
+ showClear();
+ }
+ });
+ $(options.allToggle).show().click(function() {
+ checker($(this).prop("checked"));
+ updateCounter();
+ });
+ $("a", options.acrossQuestions).click(function(event) {
+ event.preventDefault();
+ $(options.acrossInput).val(1);
+ showClear();
+ });
+ $("a", options.acrossClears).click(function(event) {
+ event.preventDefault();
+ $(options.allToggle).prop("checked", false);
+ clearAcross();
+ checker(0);
+ updateCounter();
+ });
+ lastChecked = null;
+ $(actionCheckboxes).click(function(event) {
+ if (!event) { event = window.event; }
+ var target = event.target ? event.target : event.srcElement;
+ if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) {
+ var inrange = false;
+ $(lastChecked).prop("checked", target.checked)
+ .parent().parent().toggleClass(options.selectedClass, target.checked);
+ $(actionCheckboxes).each(function() {
+ if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) {
+ inrange = (inrange) ? false : true;
+ }
+ if (inrange) {
+ $(this).prop("checked", target.checked)
+ .parent().parent().toggleClass(options.selectedClass, target.checked);
+ }
+ });
+ }
+ $(target).parent().parent().toggleClass(options.selectedClass, target.checked);
+ lastChecked = target;
+ updateCounter();
+ });
+ $('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() {
+ list_editable_changed = true;
+ });
+ $('form#changelist-form button[name="index"]').click(function(event) {
+ if (list_editable_changed) {
+ return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));
+ }
+ });
+ $('form#changelist-form input[name="_save"]').click(function(event) {
+ var action_changed = false;
+ $('select option:selected', options.actionContainer).each(function() {
+ if ($(this).val()) {
+ action_changed = true;
+ }
+ });
+ if (action_changed) {
+ if (list_editable_changed) {
+ return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."));
+ } else {
+ return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."));
+ }
+ }
+ });
+ };
+ /* Setup plugin defaults */
+ $.fn.actions.defaults = {
+ actionContainer: "div.actions",
+ counterContainer: "span.action-counter",
+ allContainer: "div.actions span.all",
+ acrossInput: "div.actions input.select-across",
+ acrossQuestions: "div.actions span.question",
+ acrossClears: "div.actions span.clear",
+ allToggle: "#action-toggle",
+ selectedClass: "selected"
+ };
})(django.jQuery);
diff --git a/static/admin/js/actions.min.js b/static/admin/js/actions.min.js
index 0dd6683fb393b09a92b45b2107161864be47886e..d0e87bcfa9387c83d737b7d084e453f478c78a7b 100644
--- a/static/admin/js/actions.min.js
+++ b/static/admin/js/actions.min.js
@@ -1,6 +1,6 @@
-(function(a){var f;a.fn.actions=function(q){var b=a.extend({},a.fn.actions.defaults,q),g=a(this),e=!1,m=function(c){c?k():l();a(g).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){var c=a(g).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).prop("checked",function(){var a;c==g.length?(a=!0,k()):(a=!1,n());return a})},k=function(){a(b.acrossClears).hide();
-a(b.acrossQuestions).show();a(b.allContainer).hide()},p=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},l=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},n=function(){l();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);
-h();1==a(b.acrossInput).val()&&p()});a(b.allToggle).show().click(function(){m(a(this).prop("checked"));h()});a("a",b.acrossQuestions).click(function(c){c.preventDefault();a(b.acrossInput).val(1);p()});a("a",b.acrossClears).click(function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);n();m(0);h()});f=null;a(g).click(function(c){c||(c=window.event);var d=c.target?c.target:c.srcElement;if(f&&a.data(f)!=a.data(d)&&!0===c.shiftKey){var e=!1;a(f).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,
-d.checked);a(g).each(function(){if(a.data(this)==a.data(f)||a.data(this)==a.data(d))e=e?!1:!0;e&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);f=d;h()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(a){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});
+(function(a){var f;a.fn.actions=function(q){var b=a.extend({},a.fn.actions.defaults,q),g=a(this),e=!1,k=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},l=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},m=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},n=function(){m();
+a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},p=function(c){c?k():m();a(g).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){var c=a(g).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).prop("checked",function(){var a;c===g.length?(a=!0,k()):(a=!1,n());return a})};a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);
+h();1===a(b.acrossInput).val()&&l()});a(b.allToggle).show().click(function(){p(a(this).prop("checked"));h()});a("a",b.acrossQuestions).click(function(c){c.preventDefault();a(b.acrossInput).val(1);l()});a("a",b.acrossClears).click(function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);n();p(0);h()});f=null;a(g).click(function(c){c||(c=window.event);var d=c.target?c.target:c.srcElement;if(f&&a.data(f)!==a.data(d)&&!0===c.shiftKey){var e=!1;a(f).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,
+d.checked);a(g).each(function(){if(a.data(this)===a.data(f)||a.data(this)===a.data(d))e=e?!1:!0;e&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);f=d;h()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(a){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});
a('form#changelist-form input[name="_save"]').click(function(c){var d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};
a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(django.jQuery);
diff --git a/static/admin/js/admin/DateTimeShortcuts.js b/static/admin/js/admin/DateTimeShortcuts.js
index faec5a49af14171d461944299c346c2e97cb2b78..bc7e1879e3891c490f9ea32b86284c0d1fad246d 100644
--- a/static/admin/js/admin/DateTimeShortcuts.js
+++ b/static/admin/js/admin/DateTimeShortcuts.js
@@ -1,357 +1,364 @@
+/*global addEvent, Calendar, cancelEventPropagation, findPosX, findPosY, getStyle, get_format, gettext, interpolate, ngettext, quickElement, removeEvent*/
// Inserts shortcut buttons after all of the following:
// <input type="text" class="vDateField">
// <input type="text" class="vTimeField">
+(function() {
+ 'use strict';
+ var DateTimeShortcuts = {
+ calendars: [],
+ calendarInputs: [],
+ clockInputs: [],
+ dismissClockFunc: [],
+ dismissCalendarFunc: [],
+ calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
+ calendarDivName2: 'calendarin', // name of <div> that contains calendar
+ calendarLinkName: 'calendarlink',// name of the link that is used to toggle
+ clockDivName: 'clockbox', // name of clock <div> that gets toggled
+ clockLinkName: 'clocklink', // name of the link that is used to toggle
+ shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts
+ timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch
+ timezoneOffset: 0,
+ init: function() {
+ var body = document.getElementsByTagName('body')[0];
+ var serverOffset = body.getAttribute('data-admin-utc-offset');
+ if (serverOffset) {
+ var localOffset = new Date().getTimezoneOffset() * -60;
+ DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
+ }
-var DateTimeShortcuts = {
- calendars: [],
- calendarInputs: [],
- clockInputs: [],
- dismissClockFunc: [],
- dismissCalendarFunc: [],
- calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
- calendarDivName2: 'calendarin', // name of <div> that contains calendar
- calendarLinkName: 'calendarlink',// name of the link that is used to toggle
- clockDivName: 'clockbox', // name of clock <div> that gets toggled
- clockLinkName: 'clocklink', // name of the link that is used to toggle
- shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts
- timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch
- timezoneOffset: 0,
- admin_media_prefix: '',
- init: function() {
- // Get admin_media_prefix by grabbing it off the window object. It's
- // set in the admin/base.html template, so if it's not there, someone's
- // overridden the template. In that case, we'll set a clearly-invalid
- // value in the hopes that someone will examine HTTP requests and see it.
- if (window.__admin_media_prefix__ != undefined) {
- DateTimeShortcuts.admin_media_prefix = window.__admin_media_prefix__;
- } else {
- DateTimeShortcuts.admin_media_prefix = '/missing-admin-media-prefix/';
- }
+ var inputs = document.getElementsByTagName('input');
+ for (var i = 0; i < inputs.length; i++) {
+ var inp = inputs[i];
+ if (inp.getAttribute('type') === 'text' && inp.className.match(/vTimeField/)) {
+ DateTimeShortcuts.addClock(inp);
+ DateTimeShortcuts.addTimezoneWarning(inp);
+ }
+ else if (inp.getAttribute('type') === 'text' && inp.className.match(/vDateField/)) {
+ DateTimeShortcuts.addCalendar(inp);
+ DateTimeShortcuts.addTimezoneWarning(inp);
+ }
+ }
+ },
+ // Return the current time while accounting for the server timezone.
+ now: function() {
+ var body = document.getElementsByTagName('body')[0];
+ var serverOffset = body.getAttribute('data-admin-utc-offset');
+ if (serverOffset) {
+ var localNow = new Date();
+ var localOffset = localNow.getTimezoneOffset() * -60;
+ localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));
+ return localNow;
+ } else {
+ return new Date();
+ }
+ },
+ // Add a warning when the time zone in the browser and backend do not match.
+ addTimezoneWarning: function(inp) {
+ var $ = django.jQuery;
+ var warningClass = DateTimeShortcuts.timezoneWarningClass;
+ var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600;
- if (window.__admin_utc_offset__ != undefined) {
- var serverOffset = window.__admin_utc_offset__;
- var localOffset = new Date().getTimezoneOffset() * -60;
- DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
- }
+ // Only warn if there is a time zone mismatch.
+ if (!timezoneOffset) {
+ return;
+ }
+
+ // Check if warning is already there.
+ if ($(inp).siblings('.' + warningClass).length) {
+ return;
+ }
- var inputs = document.getElementsByTagName('input');
- for (i=0; i<inputs.length; i++) {
- var inp = inputs[i];
- if (inp.getAttribute('type') == 'text' && inp.className.match(/vTimeField/)) {
- DateTimeShortcuts.addClock(inp);
- DateTimeShortcuts.addTimezoneWarning(inp);
+ var message;
+ if (timezoneOffset > 0) {
+ message = ngettext(
+ 'Note: You are %s hour ahead of server time.',
+ 'Note: You are %s hours ahead of server time.',
+ timezoneOffset
+ );
}
- else if (inp.getAttribute('type') == 'text' && inp.className.match(/vDateField/)) {
- DateTimeShortcuts.addCalendar(inp);
- DateTimeShortcuts.addTimezoneWarning(inp);
+ else {
+ timezoneOffset *= -1;
+ message = ngettext(
+ 'Note: You are %s hour behind server time.',
+ 'Note: You are %s hours behind server time.',
+ timezoneOffset
+ );
}
- }
- },
- // Return the current time while accounting for the server timezone.
- now: function() {
- if (window.__admin_utc_offset__ != undefined) {
- var serverOffset = window.__admin_utc_offset__;
- var localNow = new Date();
- var localOffset = localNow.getTimezoneOffset() * -60;
- localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));
- return localNow;
- } else {
- return new Date();
- }
- },
- // Add a warning when the time zone in the browser and backend do not match.
- addTimezoneWarning: function(inp) {
- var $ = django.jQuery;
- var warningClass = DateTimeShortcuts.timezoneWarningClass;
- var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600;
+ message = interpolate(message, [timezoneOffset]);
- // Only warn if there is a time zone mismatch.
- if (!timezoneOffset)
- return;
+ var $warning = $('<span>');
+ $warning.attr('class', warningClass);
+ $warning.text(message);
- // Check if warning is already there.
- if ($(inp).siblings('.' + warningClass).length)
- return;
+ $(inp).parent()
+ .append($('<br>'))
+ .append($warning);
+ },
+ // Add clock widget to a given field
+ addClock: function(inp) {
+ var num = DateTimeShortcuts.clockInputs.length;
+ DateTimeShortcuts.clockInputs[num] = inp;
+ DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };
- var message;
- if (timezoneOffset > 0) {
- message = ngettext(
- 'Note: You are %s hour ahead of server time.',
- 'Note: You are %s hours ahead of server time.',
- timezoneOffset
+ // Shortcut links (clock icon and "Now" link)
+ var shortcuts_span = document.createElement('span');
+ shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
+ inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
+ var now_link = document.createElement('a');
+ now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
+ now_link.appendChild(document.createTextNode(gettext('Now')));
+ var clock_link = document.createElement('a');
+ clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
+ clock_link.id = DateTimeShortcuts.clockLinkName + num;
+ quickElement(
+ 'span', clock_link, '',
+ 'class', 'clock-icon',
+ 'title', gettext('Choose a Time')
);
- }
- else {
- timezoneOffset *= -1
- message = ngettext(
- 'Note: You are %s hour behind server time.',
- 'Note: You are %s hours behind server time.',
- timezoneOffset
- );
- }
- message = interpolate(message, [timezoneOffset]);
-
- var $warning = $('<span>');
- $warning.attr('class', warningClass);
- $warning.text(message);
+ shortcuts_span.appendChild(document.createTextNode('\u00A0'));
+ shortcuts_span.appendChild(now_link);
+ shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0'));
+ shortcuts_span.appendChild(clock_link);
- $(inp).parent()
- .append($('<br>'))
- .append($warning)
- },
- // Add clock widget to a given field
- addClock: function(inp) {
- var num = DateTimeShortcuts.clockInputs.length;
- DateTimeShortcuts.clockInputs[num] = inp;
- DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };
+ // Create clock link div
+ //
+ // Markup looks like:
+ // <div id="clockbox1" class="clockbox module">
+ // <h2>Choose a time</h2>
+ // <ul class="timelist">
+ // <li><a href="#">Now</a></li>
+ // <li><a href="#">Midnight</a></li>
+ // <li><a href="#">6 a.m.</a></li>
+ // <li><a href="#">Noon</a></li>
+ // <li><a href="#">6 p.m.</a></li>
+ // </ul>
+ // <p class="calendar-cancel"><a href="#">Cancel</a></p>
+ // </div>
- // Shortcut links (clock icon and "Now" link)
- var shortcuts_span = document.createElement('span');
- shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
- inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
- var now_link = document.createElement('a');
- now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
- now_link.appendChild(document.createTextNode(gettext('Now')));
- var clock_link = document.createElement('a');
- clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
- clock_link.id = DateTimeShortcuts.clockLinkName + num;
- quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_clock.gif', 'alt', gettext('Clock'));
- shortcuts_span.appendChild(document.createTextNode('\240'));
- shortcuts_span.appendChild(now_link);
- shortcuts_span.appendChild(document.createTextNode('\240|\240'));
- shortcuts_span.appendChild(clock_link);
+ var clock_box = document.createElement('div');
+ clock_box.style.display = 'none';
+ clock_box.style.position = 'absolute';
+ clock_box.className = 'clockbox module';
+ clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
+ document.body.appendChild(clock_box);
+ addEvent(clock_box, 'click', cancelEventPropagation);
- // Create clock link div
- //
- // Markup looks like:
- // <div id="clockbox1" class="clockbox module">
- // <h2>Choose a time</h2>
- // <ul class="timelist">
- // <li><a href="#">Now</a></li>
- // <li><a href="#">Midnight</a></li>
- // <li><a href="#">6 a.m.</a></li>
- // <li><a href="#">Noon</a></li>
- // </ul>
- // <p class="calendar-cancel"><a href="#">Cancel</a></p>
- // </div>
+ quickElement('h2', clock_box, gettext('Choose a time'));
+ var time_list = quickElement('ul', clock_box);
+ time_list.className = 'timelist';
+ quickElement("a", quickElement("li", time_list), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
+ quickElement("a", quickElement("li", time_list), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 0);");
+ quickElement("a", quickElement("li", time_list), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 6);");
+ quickElement("a", quickElement("li", time_list), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 12);");
+ quickElement("a", quickElement("li", time_list), gettext("6 p.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 18);");
- var clock_box = document.createElement('div');
- clock_box.style.display = 'none';
- clock_box.style.position = 'absolute';
- clock_box.className = 'clockbox module';
- clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
- document.body.appendChild(clock_box);
- addEvent(clock_box, 'click', cancelEventPropagation);
+ var cancel_p = quickElement('p', clock_box);
+ cancel_p.className = 'calendar-cancel';
+ quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');');
+ django.jQuery(document).bind('keyup', function(event) {
+ if (event.which === 27) {
+ // ESC key closes popup
+ DateTimeShortcuts.dismissClock(num);
+ event.preventDefault();
+ }
+ });
+ },
+ openClock: function(num) {
+ var clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num);
+ var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num);
- quickElement('h2', clock_box, gettext('Choose a time'));
- var time_list = quickElement('ul', clock_box);
- time_list.className = 'timelist';
- quickElement("a", quickElement("li", time_list), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
- quickElement("a", quickElement("li", time_list), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 0);");
- quickElement("a", quickElement("li", time_list), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 6);");
- quickElement("a", quickElement("li", time_list), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 12);");
-
- var cancel_p = quickElement('p', clock_box);
- cancel_p.className = 'calendar-cancel';
- quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');');
- django.jQuery(document).bind('keyup', function(event) {
- if (event.which == 27) {
- // ESC key closes popup
- DateTimeShortcuts.dismissClock(num);
- event.preventDefault();
+ // Recalculate the clockbox position
+ // is it left-to-right or right-to-left layout ?
+ if (getStyle(document.body, 'direction') !== 'rtl') {
+ clock_box.style.left = findPosX(clock_link) + 17 + 'px';
+ }
+ else {
+ // since style's width is in em, it'd be tough to calculate
+ // px value of it. let's use an estimated px for now
+ // TODO: IE returns wrong value for findPosX when in rtl mode
+ // (it returns as it was left aligned), needs to be fixed.
+ clock_box.style.left = findPosX(clock_link) - 110 + 'px';
}
- });
- },
- openClock: function(num) {
- var clock_box = document.getElementById(DateTimeShortcuts.clockDivName+num)
- var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName+num)
+ clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px';
- // Recalculate the clockbox position
- // is it left-to-right or right-to-left layout ?
- if (getStyle(document.body,'direction')!='rtl') {
- clock_box.style.left = findPosX(clock_link) + 17 + 'px';
- }
- else {
- // since style's width is in em, it'd be tough to calculate
- // px value of it. let's use an estimated px for now
- // TODO: IE returns wrong value for findPosX when in rtl mode
- // (it returns as it was left aligned), needs to be fixed.
- clock_box.style.left = findPosX(clock_link) - 110 + 'px';
- }
- clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px';
+ // Show the clock box
+ clock_box.style.display = 'block';
+ addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
+ },
+ dismissClock: function(num) {
+ document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
+ removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
+ },
+ handleClockQuicklink: function(num, val) {
+ var d;
+ if (val === -1) {
+ d = DateTimeShortcuts.now();
+ }
+ else {
+ d = new Date(1970, 1, 1, val, 0, 0, 0);
+ }
+ DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]);
+ DateTimeShortcuts.clockInputs[num].focus();
+ DateTimeShortcuts.dismissClock(num);
+ },
+ // Add calendar widget to a given field.
+ addCalendar: function(inp) {
+ var num = DateTimeShortcuts.calendars.length;
- // Show the clock box
- clock_box.style.display = 'block';
- addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
- },
- dismissClock: function(num) {
- document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
- removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
- },
- handleClockQuicklink: function(num, val) {
- var d;
- if (val == -1) {
- d = DateTimeShortcuts.now();
- }
- else {
- d = new Date(1970, 1, 1, val, 0, 0, 0)
- }
- DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]);
- DateTimeShortcuts.clockInputs[num].focus();
- DateTimeShortcuts.dismissClock(num);
- },
- // Add calendar widget to a given field.
- addCalendar: function(inp) {
- var num = DateTimeShortcuts.calendars.length;
+ DateTimeShortcuts.calendarInputs[num] = inp;
+ DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; };
- DateTimeShortcuts.calendarInputs[num] = inp;
- DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; };
+ // Shortcut links (calendar icon and "Today" link)
+ var shortcuts_span = document.createElement('span');
+ shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
+ inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
+ var today_link = document.createElement('a');
+ today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
+ today_link.appendChild(document.createTextNode(gettext('Today')));
+ var cal_link = document.createElement('a');
+ cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
+ cal_link.id = DateTimeShortcuts.calendarLinkName + num;
+ quickElement(
+ 'span', cal_link, '',
+ 'class', 'date-icon',
+ 'title', gettext('Choose a Date')
+ );
+ shortcuts_span.appendChild(document.createTextNode('\u00A0'));
+ shortcuts_span.appendChild(today_link);
+ shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0'));
+ shortcuts_span.appendChild(cal_link);
- // Shortcut links (calendar icon and "Today" link)
- var shortcuts_span = document.createElement('span');
- shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
- inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
- var today_link = document.createElement('a');
- today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
- today_link.appendChild(document.createTextNode(gettext('Today')));
- var cal_link = document.createElement('a');
- cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
- cal_link.id = DateTimeShortcuts.calendarLinkName + num;
- quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_calendar.gif', 'alt', gettext('Calendar'));
- shortcuts_span.appendChild(document.createTextNode('\240'));
- shortcuts_span.appendChild(today_link);
- shortcuts_span.appendChild(document.createTextNode('\240|\240'));
- shortcuts_span.appendChild(cal_link);
+ // Create calendarbox div.
+ //
+ // Markup looks like:
+ //
+ // <div id="calendarbox3" class="calendarbox module">
+ // <h2>
+ // <a href="#" class="link-previous">‹</a>
+ // <a href="#" class="link-next">›</a> February 2003
+ // </h2>
+ // <div class="calendar" id="calendarin3">
+ // <!-- (cal) -->
+ // </div>
+ // <div class="calendar-shortcuts">
+ // <a href="#">Yesterday</a> | <a href="#">Today</a> | <a href="#">Tomorrow</a>
+ // </div>
+ // <p class="calendar-cancel"><a href="#">Cancel</a></p>
+ // </div>
+ var cal_box = document.createElement('div');
+ cal_box.style.display = 'none';
+ cal_box.style.position = 'absolute';
+ cal_box.className = 'calendarbox module';
+ cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
+ document.body.appendChild(cal_box);
+ addEvent(cal_box, 'click', cancelEventPropagation);
- // Create calendarbox div.
- //
- // Markup looks like:
- //
- // <div id="calendarbox3" class="calendarbox module">
- // <h2>
- // <a href="#" class="link-previous">‹</a>
- // <a href="#" class="link-next">›</a> February 2003
- // </h2>
- // <div class="calendar" id="calendarin3">
- // <!-- (cal) -->
- // </div>
- // <div class="calendar-shortcuts">
- // <a href="#">Yesterday</a> | <a href="#">Today</a> | <a href="#">Tomorrow</a>
- // </div>
- // <p class="calendar-cancel"><a href="#">Cancel</a></p>
- // </div>
- var cal_box = document.createElement('div');
- cal_box.style.display = 'none';
- cal_box.style.position = 'absolute';
- cal_box.className = 'calendarbox module';
- cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
- document.body.appendChild(cal_box);
- addEvent(cal_box, 'click', cancelEventPropagation);
+ // next-prev links
+ var cal_nav = quickElement('div', cal_box);
+ var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev(' + num + ');');
+ cal_nav_prev.className = 'calendarnav-previous';
+ var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext(' + num + ');');
+ cal_nav_next.className = 'calendarnav-next';
- // next-prev links
- var cal_nav = quickElement('div', cal_box);
- var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');');
- cal_nav_prev.className = 'calendarnav-previous';
- var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');');
- cal_nav_next.className = 'calendarnav-next';
+ // main box
+ var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
+ cal_main.className = 'calendar';
+ DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num));
+ DateTimeShortcuts.calendars[num].drawCurrent();
- // main box
- var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
- cal_main.className = 'calendar';
- DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num));
- DateTimeShortcuts.calendars[num].drawCurrent();
+ // calendar shortcuts
+ var shortcuts = quickElement('div', cal_box);
+ shortcuts.className = 'calendar-shortcuts';
+ quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);');
+ shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0'));
+ quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
+ shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0'));
+ quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);');
- // calendar shortcuts
- var shortcuts = quickElement('div', cal_box);
- shortcuts.className = 'calendar-shortcuts';
- quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);');
- shortcuts.appendChild(document.createTextNode('\240|\240'));
- quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
- shortcuts.appendChild(document.createTextNode('\240|\240'));
- quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);');
+ // cancel bar
+ var cancel_p = quickElement('p', cal_box);
+ cancel_p.className = 'calendar-cancel';
+ quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');');
+ django.jQuery(document).bind('keyup', function(event) {
+ if (event.which === 27) {
+ // ESC key closes popup
+ DateTimeShortcuts.dismissCalendar(num);
+ event.preventDefault();
+ }
+ });
+ },
+ openCalendar: function(num) {
+ var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num);
+ var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num);
+ var inp = DateTimeShortcuts.calendarInputs[num];
- // cancel bar
- var cancel_p = quickElement('p', cal_box);
- cancel_p.className = 'calendar-cancel';
- quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');');
- django.jQuery(document).bind('keyup', function(event) {
- if (event.which == 27) {
- // ESC key closes popup
- DateTimeShortcuts.dismissCalendar(num);
- event.preventDefault();
+ // Determine if the current value in the input has a valid date.
+ // If so, draw the calendar with that date's year and month.
+ if (inp.value) {
+ var format = get_format('DATE_INPUT_FORMATS')[0];
+ var selected = inp.value.strptime(format);
+ var year = selected.getFullYear();
+ var month = selected.getMonth() + 1;
+ var re = /\d{4}/;
+ if (re.test(year.toString()) && month >= 1 && month <= 12) {
+ DateTimeShortcuts.calendars[num].drawDate(month, year, selected);
+ }
}
- });
- },
- openCalendar: function(num) {
- var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1+num)
- var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName+num)
- var inp = DateTimeShortcuts.calendarInputs[num];
- // Determine if the current value in the input has a valid date.
- // If so, draw the calendar with that date's year and month.
- if (inp.value) {
- var format = get_format('DATE_INPUT_FORMATS')[0];
- var selected = inp.value.strptime(format);
- var year = selected.getFullYear();
- var month = selected.getMonth() + 1;
- var re = /\d{4}/
- if (re.test(year.toString()) && month >= 1 && month <= 12) {
- DateTimeShortcuts.calendars[num].drawDate(month, year, selected);
+ // Recalculate the clockbox position
+ // is it left-to-right or right-to-left layout ?
+ if (getStyle(document.body, 'direction') !== 'rtl') {
+ cal_box.style.left = findPosX(cal_link) + 17 + 'px';
}
- }
+ else {
+ // since style's width is in em, it'd be tough to calculate
+ // px value of it. let's use an estimated px for now
+ // TODO: IE returns wrong value for findPosX when in rtl mode
+ // (it returns as it was left aligned), needs to be fixed.
+ cal_box.style.left = findPosX(cal_link) - 180 + 'px';
+ }
+ cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
- // Recalculate the clockbox position
- // is it left-to-right or right-to-left layout ?
- if (getStyle(document.body,'direction')!='rtl') {
- cal_box.style.left = findPosX(cal_link) + 17 + 'px';
- }
- else {
- // since style's width is in em, it'd be tough to calculate
- // px value of it. let's use an estimated px for now
- // TODO: IE returns wrong value for findPosX when in rtl mode
- // (it returns as it was left aligned), needs to be fixed.
- cal_box.style.left = findPosX(cal_link) - 180 + 'px';
+ cal_box.style.display = 'block';
+ addEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
+ },
+ dismissCalendar: function(num) {
+ document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none';
+ removeEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
+ },
+ drawPrev: function(num) {
+ DateTimeShortcuts.calendars[num].drawPreviousMonth();
+ },
+ drawNext: function(num) {
+ DateTimeShortcuts.calendars[num].drawNextMonth();
+ },
+ handleCalendarCallback: function(num) {
+ var format = get_format('DATE_INPUT_FORMATS')[0];
+ // the format needs to be escaped a little
+ format = format.replace('\\', '\\\\');
+ format = format.replace('\r', '\\r');
+ format = format.replace('\n', '\\n');
+ format = format.replace('\t', '\\t');
+ format = format.replace("'", "\\'");
+ return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[",
+ num,
+ "].value = new Date(y, m-1, d).strftime('",
+ format,
+ "');DateTimeShortcuts.calendarInputs[",
+ num,
+ "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+",
+ num,
+ ").style.display='none';}"].join('');
+ },
+ handleCalendarQuickLink: function(num, offset) {
+ var d = DateTimeShortcuts.now();
+ d.setDate(d.getDate() + offset);
+ DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
+ DateTimeShortcuts.calendarInputs[num].focus();
+ DateTimeShortcuts.dismissCalendar(num);
}
- cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
-
- cal_box.style.display = 'block';
- addEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
- },
- dismissCalendar: function(num) {
- document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none';
- removeEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
- },
- drawPrev: function(num) {
- DateTimeShortcuts.calendars[num].drawPreviousMonth();
- },
- drawNext: function(num) {
- DateTimeShortcuts.calendars[num].drawNextMonth();
- },
- handleCalendarCallback: function(num) {
- var format = get_format('DATE_INPUT_FORMATS')[0];
- // the format needs to be escaped a little
- format = format.replace('\\', '\\\\');
- format = format.replace('\r', '\\r');
- format = format.replace('\n', '\\n');
- format = format.replace('\t', '\\t');
- format = format.replace("'", "\\'");
- return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[",
- num,
- "].value = new Date(y, m-1, d).strftime('",
- format,
- "');DateTimeShortcuts.calendarInputs[",
- num,
- "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+",
- num,
- ").style.display='none';}"].join('');
- },
- handleCalendarQuickLink: function(num, offset) {
- var d = DateTimeShortcuts.now();
- d.setDate(d.getDate() + offset)
- DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
- DateTimeShortcuts.calendarInputs[num].focus();
- DateTimeShortcuts.dismissCalendar(num);
- }
-}
+ };
-addEvent(window, 'load', DateTimeShortcuts.init);
+ addEvent(window, 'load', DateTimeShortcuts.init);
+ window.DateTimeShortcuts = DateTimeShortcuts;
+})();
diff --git a/static/admin/js/admin/RelatedObjectLookups.js b/static/admin/js/admin/RelatedObjectLookups.js
index ffba7cdf24d41ab48e20389ab18de024a09106aa..e661e0bcf465ba0abfc214428782d9f112695576 100644
--- a/static/admin/js/admin/RelatedObjectLookups.js
+++ b/static/admin/js/admin/RelatedObjectLookups.js
@@ -1,130 +1,181 @@
+/*global SelectBox, interpolate*/
// Handles related-objects functionality: lookup link for raw_id_fields
// and Add Another links.
-function html_unescape(text) {
- // Unescape a string that was escaped using django.utils.html.escape.
- text = text.replace(/</g, '<');
- text = text.replace(/>/g, '>');
- text = text.replace(/"/g, '"');
- text = text.replace(/'/g, "'");
- text = text.replace(/&/g, '&');
- return text;
-}
-
-// IE doesn't accept periods or dashes in the window name, but the element IDs
-// we use to generate popup window names may contain them, therefore we map them
-// to allowed characters in a reversible way so that we can locate the correct
-// element when the popup window is dismissed.
-function id_to_windowname(text) {
- text = text.replace(/\./g, '__dot__');
- text = text.replace(/\-/g, '__dash__');
- return text;
-}
-
-function windowname_to_id(text) {
- text = text.replace(/__dot__/g, '.');
- text = text.replace(/__dash__/g, '-');
- return text;
-}
-
-function showAdminPopup(triggeringLink, name_regexp) {
- var name = triggeringLink.id.replace(name_regexp, '');
- name = id_to_windowname(name);
- var href = triggeringLink.href;
- if (href.indexOf('?') == -1) {
- href += '?_popup=1';
- } else {
- href += '&_popup=1';
+(function($) {
+ 'use strict';
+
+ function html_unescape(text) {
+ // Unescape a string that was escaped using django.utils.html.escape.
+ text = text.replace(/</g, '<');
+ text = text.replace(/>/g, '>');
+ text = text.replace(/"/g, '"');
+ text = text.replace(/'/g, "'");
+ text = text.replace(/&/g, '&');
+ return text;
+ }
+
+ // IE doesn't accept periods or dashes in the window name, but the element IDs
+ // we use to generate popup window names may contain them, therefore we map them
+ // to allowed characters in a reversible way so that we can locate the correct
+ // element when the popup window is dismissed.
+ function id_to_windowname(text) {
+ text = text.replace(/\./g, '__dot__');
+ text = text.replace(/\-/g, '__dash__');
+ return text;
}
- var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
- win.focus();
- return false;
-}
-
-function showRelatedObjectLookupPopup(triggeringLink) {
- return showAdminPopup(triggeringLink, /^lookup_/);
-}
-
-function dismissRelatedLookupPopup(win, chosenId) {
- var name = windowname_to_id(win.name);
- var elem = document.getElementById(name);
- if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
- elem.value += ',' + chosenId;
- } else {
- document.getElementById(name).value = chosenId;
+
+ function windowname_to_id(text) {
+ text = text.replace(/__dot__/g, '.');
+ text = text.replace(/__dash__/g, '-');
+ return text;
}
- win.close();
-}
-
-function showRelatedObjectPopup(triggeringLink) {
- var name = triggeringLink.id.replace(/^(change|add|delete)_/, '');
- name = id_to_windowname(name);
- var href = triggeringLink.href;
- var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
- win.focus();
- return false;
-}
-
-function dismissAddRelatedObjectPopup(win, newId, newRepr) {
- // newId and newRepr are expected to have previously been escaped by
- // django.utils.html.escape.
- newId = html_unescape(newId);
- newRepr = html_unescape(newRepr);
- var name = windowname_to_id(win.name);
- var elem = document.getElementById(name);
- var o;
- if (elem) {
- var elemName = elem.nodeName.toUpperCase();
- if (elemName == 'SELECT') {
- o = new Option(newRepr, newId);
- elem.options[elem.options.length] = o;
- o.selected = true;
- } else if (elemName == 'INPUT') {
- if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
- elem.value += ',' + newId;
+
+ function showAdminPopup(triggeringLink, name_regexp, add_popup) {
+ var name = triggeringLink.id.replace(name_regexp, '');
+ name = id_to_windowname(name);
+ var href = triggeringLink.href;
+ if (add_popup) {
+ if (href.indexOf('?') === -1) {
+ href += '?_popup=1';
} else {
- elem.value = newId;
+ href += '&_popup=1';
}
}
- // Trigger a change event to update related links if required.
- django.jQuery(elem).trigger('change');
- } else {
- var toId = name + "_to";
- o = new Option(newRepr, newId);
- SelectBox.add_to_cache(toId, o);
- SelectBox.redisplay(toId);
+ var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+ win.focus();
+ return false;
+ }
+
+ function showRelatedObjectLookupPopup(triggeringLink) {
+ return showAdminPopup(triggeringLink, /^lookup_/, true);
+ }
+
+ function dismissRelatedLookupPopup(win, chosenId) {
+ var name = windowname_to_id(win.name);
+ var elem = document.getElementById(name);
+ if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+ elem.value += ',' + chosenId;
+ } else {
+ document.getElementById(name).value = chosenId;
+ }
+ win.close();
+ }
+
+ function showRelatedObjectPopup(triggeringLink) {
+ return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false);
}
- win.close();
-}
-
-function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
- objId = html_unescape(objId);
- newRepr = html_unescape(newRepr);
- var id = windowname_to_id(win.name).replace(/^edit_/, '');
- var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
- var selects = django.jQuery(selectsSelector);
- selects.find('option').each(function() {
- if (this.value == objId) {
- this.innerHTML = newRepr;
- this.value = newId;
+
+ function updateRelatedObjectLinks(triggeringLink) {
+ var $this = django.jQuery(triggeringLink);
+ var siblings = $this.nextAll('.change-related, .delete-related');
+ if (!siblings.length) {
+ return;
}
- });
- win.close();
-};
-
-function dismissDeleteRelatedObjectPopup(win, objId) {
- objId = html_unescape(objId);
- var id = windowname_to_id(win.name).replace(/^delete_/, '');
- var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
- var selects = django.jQuery(selectsSelector);
- selects.find('option').each(function() {
- if (this.value == objId) {
- django.jQuery(this).remove();
+ var value = $this.val();
+ if (value) {
+ siblings.each(function() {
+ var elm = django.jQuery(this);
+ elm.attr('href', elm.attr('data-href-template').replace('__fk__', value));
+ });
+ } else {
+ siblings.removeAttr('href');
+ }
+ }
+
+ function dismissAddRelatedObjectPopup(win, newId, newRepr) {
+ // newId and newRepr are expected to have previously been escaped by
+ // django.utils.html.escape.
+ newId = html_unescape(newId);
+ newRepr = html_unescape(newRepr);
+ var name = windowname_to_id(win.name);
+ var elem = document.getElementById(name);
+ if (elem) {
+ var elemName = elem.nodeName.toUpperCase();
+ if (elemName === 'SELECT') {
+ elem.options[elem.options.length] = new Option(newRepr, newId, true, true);
+ } else if (elemName === 'INPUT') {
+ if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+ elem.value += ',' + newId;
+ } else {
+ elem.value = newId;
+ }
+ }
+ // Trigger a change event to update related links if required.
+ django.jQuery(elem).trigger('change');
+ } else {
+ var toId = name + "_to";
+ var o = new Option(newRepr, newId);
+ SelectBox.add_to_cache(toId, o);
+ SelectBox.redisplay(toId);
}
- }).trigger('change');
- win.close();
-};
+ win.close();
+ }
+
+ function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
+ objId = html_unescape(objId);
+ newRepr = html_unescape(newRepr);
+ var id = windowname_to_id(win.name).replace(/^edit_/, '');
+ var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+ var selects = django.jQuery(selectsSelector);
+ selects.find('option').each(function() {
+ if (this.value === objId) {
+ this.innerHTML = newRepr;
+ this.value = newId;
+ }
+ });
+ win.close();
+ }
+
+ function dismissDeleteRelatedObjectPopup(win, objId) {
+ objId = html_unescape(objId);
+ var id = windowname_to_id(win.name).replace(/^delete_/, '');
+ var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+ var selects = django.jQuery(selectsSelector);
+ selects.find('option').each(function() {
+ if (this.value === objId) {
+ django.jQuery(this).remove();
+ }
+ }).trigger('change');
+ win.close();
+ }
+
+ // Global for testing purposes
+ window.html_unescape = html_unescape;
+ window.id_to_windowname = id_to_windowname;
+ window.windowname_to_id = windowname_to_id;
+
+ window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup;
+ window.dismissRelatedLookupPopup = dismissRelatedLookupPopup;
+ window.showRelatedObjectPopup = showRelatedObjectPopup;
+ window.updateRelatedObjectLinks = updateRelatedObjectLinks;
+ window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup;
+ window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup;
+ window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup;
+
+ // Kept for backward compatibility
+ window.showAddAnotherPopup = showRelatedObjectPopup;
+ window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup;
+
+ $(document).ready(function() {
+ $('body').on('click', '.related-widget-wrapper-link', function(e) {
+ e.preventDefault();
+ if (this.href) {
+ var event = $.Event('django:show-related', {href: this.href});
+ $(this).trigger(event);
+ if (!event.isDefaultPrevented()) {
+ showRelatedObjectPopup(this);
+ }
+ }
+ });
+ $('body').on('change', '.related-widget-wrapper select', function(e) {
+ var event = $.Event('django:update-related');
+ $(this).trigger(event);
+ if (!event.isDefaultPrevented()) {
+ updateRelatedObjectLinks(this);
+ }
+ });
+ $('.related-widget-wrapper select').trigger('change');
+ });
-// Kept for backward compatibility
-showAddAnotherPopup = showRelatedObjectPopup;
-dismissAddAnotherPopup = dismissAddRelatedObjectPopup;
+})(django.jQuery);
diff --git a/static/admin/js/calendar.js b/static/admin/js/calendar.js
index 458eece92fb846c06a7b3fcb0fbe63fe91bdc685..1043dd61efde5473ab91eaf416584d16722449d7 100644
--- a/static/admin/js/calendar.js
+++ b/static/admin/js/calendar.js
@@ -1,169 +1,178 @@
+/*global gettext, get_format, quickElement, removeChildren*/
/*
calendar.js - Calendar functions by Adrian Holovaty
depends on core.js for utility functions like removeChildren or quickElement
*/
-// CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
-var CalendarNamespace = {
- monthsOfYear: gettext('January February March April May June July August September October November December').split(' '),
- daysOfWeek: gettext('S M T W T F S').split(' '),
- firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')),
- isLeapYear: function(year) {
- return (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0));
- },
- getDaysInMonth: function(month,year) {
- var days;
- if (month==1 || month==3 || month==5 || month==7 || month==8 || month==10 || month==12) {
- days = 31;
- }
- else if (month==4 || month==6 || month==9 || month==11) {
- days = 30;
- }
- else if (month==2 && CalendarNamespace.isLeapYear(year)) {
- days = 29;
- }
- else {
- days = 28;
- }
- return days;
- },
- draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999
- var today = new Date();
- var todayDay = today.getDate();
- var todayMonth = today.getMonth()+1;
- var todayYear = today.getFullYear();
- var todayClass = '';
-
- // Use UTC functions here because the date field does not contain time
- // and using the UTC function variants prevent the local time offset
- // from altering the date, specifically the day field. For example:
- //
- // ```
- // var x = new Date('2013-10-02');
- // var day = x.getDate();
- // ```
- //
- // The day variable above will be 1 instead of 2 in, say, US Pacific time
- // zone.
- var isSelectedMonth = false;
- if (typeof selected != 'undefined') {
- isSelectedMonth = (selected.getUTCFullYear() == year && (selected.getUTCMonth()+1) == month);
- }
-
- month = parseInt(month);
- year = parseInt(year);
- var calDiv = document.getElementById(div_id);
- removeChildren(calDiv);
- var calTable = document.createElement('table');
- quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month-1] + ' ' + year);
- var tableBody = quickElement('tbody', calTable);
-
- // Draw days-of-week header
- var tableRow = quickElement('tr', tableBody);
- for (var i = 0; i < 7; i++) {
- quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
- }
+(function() {
+ 'use strict';
+ // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
+ var CalendarNamespace = {
+ monthsOfYear: gettext('January February March April May June July August September October November December').split(' '),
+ daysOfWeek: gettext('S M T W T F S').split(' '),
+ firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')),
+ isLeapYear: function(year) {
+ return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0));
+ },
+ getDaysInMonth: function(month, year) {
+ var days;
+ if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) {
+ days = 31;
+ }
+ else if (month === 4 || month === 6 || month === 9 || month === 11) {
+ days = 30;
+ }
+ else if (month === 2 && CalendarNamespace.isLeapYear(year)) {
+ days = 29;
+ }
+ else {
+ days = 28;
+ }
+ return days;
+ },
+ draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999
+ var today = new Date();
+ var todayDay = today.getDate();
+ var todayMonth = today.getMonth() + 1;
+ var todayYear = today.getFullYear();
+ var todayClass = '';
- var startingPos = new Date(year, month-1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
- var days = CalendarNamespace.getDaysInMonth(month, year);
+ // Use UTC functions here because the date field does not contain time
+ // and using the UTC function variants prevent the local time offset
+ // from altering the date, specifically the day field. For example:
+ //
+ // ```
+ // var x = new Date('2013-10-02');
+ // var day = x.getDate();
+ // ```
+ //
+ // The day variable above will be 1 instead of 2 in, say, US Pacific time
+ // zone.
+ var isSelectedMonth = false;
+ if (typeof selected !== 'undefined') {
+ isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month);
+ }
- // Draw blanks before first of month
- tableRow = quickElement('tr', tableBody);
- for (var i = 0; i < startingPos; i++) {
- var _cell = quickElement('td', tableRow, ' ');
- _cell.className = "nonday";
- }
+ month = parseInt(month);
+ year = parseInt(year);
+ var calDiv = document.getElementById(div_id);
+ removeChildren(calDiv);
+ var calTable = document.createElement('table');
+ quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year);
+ var tableBody = quickElement('tbody', calTable);
- // Draw days of month
- var currentDay = 1;
- for (var i = startingPos; currentDay <= days; i++) {
- if (i%7 == 0 && currentDay != 1) {
- tableRow = quickElement('tr', tableBody);
- }
- if ((currentDay==todayDay) && (month==todayMonth) && (year==todayYear)) {
- todayClass='today';
- } else {
- todayClass='';
+ // Draw days-of-week header
+ var tableRow = quickElement('tr', tableBody);
+ for (var i = 0; i < 7; i++) {
+ quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
}
- // use UTC function; see above for explanation.
- if (isSelectedMonth && currentDay == selected.getUTCDate()) {
- if (todayClass != '') todayClass += " ";
- todayClass += "selected";
+ var startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
+ var days = CalendarNamespace.getDaysInMonth(month, year);
+
+ var nonDayCell;
+
+ // Draw blanks before first of month
+ tableRow = quickElement('tr', tableBody);
+ for (i = 0; i < startingPos; i++) {
+ nonDayCell = quickElement('td', tableRow, ' ');
+ nonDayCell.className = "nonday";
}
- var cell = quickElement('td', tableRow, '', 'class', todayClass);
+ // Draw days of month
+ var currentDay = 1;
+ for (i = startingPos; currentDay <= days; i++) {
+ if (i % 7 === 0 && currentDay !== 1) {
+ tableRow = quickElement('tr', tableBody);
+ }
+ if ((currentDay === todayDay) && (month === todayMonth) && (year === todayYear)) {
+ todayClass = 'today';
+ } else {
+ todayClass = '';
+ }
- quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '('+year+','+month+','+currentDay+'));');
- currentDay++;
- }
+ // use UTC function; see above for explanation.
+ if (isSelectedMonth && currentDay === selected.getUTCDate()) {
+ if (todayClass !== '') {
+ todayClass += " ";
+ }
+ todayClass += "selected";
+ }
+
+ var cell = quickElement('td', tableRow, '', 'class', todayClass);
- // Draw blanks after end of month (optional, but makes for valid code)
- while (tableRow.childNodes.length < 7) {
- var _cell = quickElement('td', tableRow, ' ');
- _cell.className = "nonday";
+ quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '(' + year + ',' + month + ',' + currentDay + '));');
+ currentDay++;
+ }
+
+ // Draw blanks after end of month (optional, but makes for valid code)
+ while (tableRow.childNodes.length < 7) {
+ nonDayCell = quickElement('td', tableRow, ' ');
+ nonDayCell.className = "nonday";
+ }
+
+ calDiv.appendChild(calTable);
}
+ };
- calDiv.appendChild(calTable);
- }
-}
-
-// Calendar -- A calendar instance
-function Calendar(div_id, callback, selected) {
- // div_id (string) is the ID of the element in which the calendar will
- // be displayed
- // callback (string) is the name of a JavaScript function that will be
- // called with the parameters (year, month, day) when a day in the
- // calendar is clicked
- this.div_id = div_id;
- this.callback = callback;
- this.today = new Date();
- this.currentMonth = this.today.getMonth() + 1;
- this.currentYear = this.today.getFullYear();
- if (typeof selected != 'undefined') {
- this.selected = selected;
- }
-}
-Calendar.prototype = {
- drawCurrent: function() {
- CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected);
- },
- drawDate: function(month, year, selected) {
- this.currentMonth = month;
- this.currentYear = year;
-
- if(selected) {
+ // Calendar -- A calendar instance
+ function Calendar(div_id, callback, selected) {
+ // div_id (string) is the ID of the element in which the calendar will
+ // be displayed
+ // callback (string) is the name of a JavaScript function that will be
+ // called with the parameters (year, month, day) when a day in the
+ // calendar is clicked
+ this.div_id = div_id;
+ this.callback = callback;
+ this.today = new Date();
+ this.currentMonth = this.today.getMonth() + 1;
+ this.currentYear = this.today.getFullYear();
+ if (typeof selected !== 'undefined') {
this.selected = selected;
}
+ }
+ Calendar.prototype = {
+ drawCurrent: function() {
+ CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected);
+ },
+ drawDate: function(month, year, selected) {
+ this.currentMonth = month;
+ this.currentYear = year;
+
+ if(selected) {
+ this.selected = selected;
+ }
- this.drawCurrent();
- },
- drawPreviousMonth: function() {
- if (this.currentMonth == 1) {
- this.currentMonth = 12;
+ this.drawCurrent();
+ },
+ drawPreviousMonth: function() {
+ if (this.currentMonth === 1) {
+ this.currentMonth = 12;
+ this.currentYear--;
+ }
+ else {
+ this.currentMonth--;
+ }
+ this.drawCurrent();
+ },
+ drawNextMonth: function() {
+ if (this.currentMonth === 12) {
+ this.currentMonth = 1;
+ this.currentYear++;
+ }
+ else {
+ this.currentMonth++;
+ }
+ this.drawCurrent();
+ },
+ drawPreviousYear: function() {
this.currentYear--;
- }
- else {
- this.currentMonth--;
- }
- this.drawCurrent();
- },
- drawNextMonth: function() {
- if (this.currentMonth == 12) {
- this.currentMonth = 1;
+ this.drawCurrent();
+ },
+ drawNextYear: function() {
this.currentYear++;
+ this.drawCurrent();
}
- else {
- this.currentMonth++;
- }
- this.drawCurrent();
- },
- drawPreviousYear: function() {
- this.currentYear--;
- this.drawCurrent();
- },
- drawNextYear: function() {
- this.currentYear++;
- this.drawCurrent();
- }
-}
+ };
+ window.Calendar = Calendar;
+})();
diff --git a/static/admin/js/collapse.js b/static/admin/js/collapse.js
index 3b1f31bd23d7ee78404695f4c66eaea9beec4723..7cb936288edde45cbdbc0a420b9148ab3ac86b75 100644
--- a/static/admin/js/collapse.js
+++ b/static/admin/js/collapse.js
@@ -1,24 +1,26 @@
+/*global gettext*/
(function($) {
- $(document).ready(function() {
- // Add anchor tag for Show/Hide link
- $("fieldset.collapse").each(function(i, elem) {
- // Don't hide if fields in this fieldset have errors
- if ($(elem).find("div.errors").length == 0) {
- $(elem).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser' +
- i +'" class="collapse-toggle" href="#">' + gettext("Show") +
- '</a>)');
- }
- });
- // Add toggle to anchor tag
- $("fieldset.collapse a.collapse-toggle").click(function(ev) {
- if ($(this).closest("fieldset").hasClass("collapsed")) {
- // Show
- $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]);
- } else {
- // Hide
- $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]);
- }
- return false;
- });
- });
+ 'use strict';
+ $(document).ready(function() {
+ // Add anchor tag for Show/Hide link
+ $("fieldset.collapse").each(function(i, elem) {
+ // Don't hide if fields in this fieldset have errors
+ if ($(elem).find("div.errors").length === 0) {
+ $(elem).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser' +
+ i + '" class="collapse-toggle" href="#">' + gettext("Show") +
+ '</a>)');
+ }
+ });
+ // Add toggle to anchor tag
+ $("fieldset.collapse a.collapse-toggle").click(function(ev) {
+ if ($(this).closest("fieldset").hasClass("collapsed")) {
+ // Show
+ $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]);
+ } else {
+ // Hide
+ $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]);
+ }
+ return false;
+ });
+ });
})(django.jQuery);
diff --git a/static/admin/js/collapse.min.js b/static/admin/js/collapse.min.js
index 0a8c20ea4482c6d2b0c9cdaf74c4b05c2c8c44e9..6251d916668fbc4bdac1f5e267969e4f05ca97c6 100644
--- a/static/admin/js/collapse.min.js
+++ b/static/admin/js/collapse.min.js
@@ -1,2 +1,2 @@
-(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){a(b).find("div.errors").length==0&&a(b).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").click(function(){a(this).closest("fieldset").hasClass("collapsed")?a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]):a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
-[a(this).attr("id")]);return false})})})(django.jQuery);
+(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(b,c){0===a(c).find("div.errors").length&&a(c).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+b+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").click(function(b){a(this).closest("fieldset").hasClass("collapsed")?a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]):a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
+[a(this).attr("id")]);return!1})})})(django.jQuery);
diff --git a/static/admin/js/core.js b/static/admin/js/core.js
index 2c096aac6dbda4825fec7f0a136ce0e7215ac70e..34f99262c530e4d47a6f87303979427f1003961b 100644
--- a/static/admin/js/core.js
+++ b/static/admin/js/core.js
@@ -1,11 +1,12 @@
// Core javascript helper functions
// basic browser identification & version
-var isOpera = (navigator.userAgent.indexOf("Opera")>=0) && parseFloat(navigator.appVersion);
+var isOpera = (navigator.userAgent.indexOf("Opera") >= 0) && parseFloat(navigator.appVersion);
var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]);
// Cross-browser event handlers.
function addEvent(obj, evType, fn) {
+ 'use strict';
if (obj.addEventListener) {
obj.addEventListener(evType, fn, false);
return true;
@@ -18,6 +19,7 @@ function addEvent(obj, evType, fn) {
}
function removeEvent(obj, evType, fn) {
+ 'use strict';
if (obj.removeEventListener) {
obj.removeEventListener(evType, fn, false);
return true;
@@ -30,13 +32,19 @@ function removeEvent(obj, evType, fn) {
}
function cancelEventPropagation(e) {
- if (!e) e = window.event;
+ 'use strict';
+ if (!e) {
+ e = window.event;
+ }
e.cancelBubble = true;
- if (e.stopPropagation) e.stopPropagation();
+ if (e.stopPropagation) {
+ e.stopPropagation();
+ }
}
// quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]);
function quickElement() {
+ 'use strict';
var obj = document.createElement(arguments[0]);
if (arguments[2]) {
var textNode = document.createTextNode(arguments[2]);
@@ -44,7 +52,7 @@ function quickElement() {
}
var len = arguments.length;
for (var i = 3; i < len; i += 2) {
- obj.setAttribute(arguments[i], arguments[i+1]);
+ obj.setAttribute(arguments[i], arguments[i + 1]);
}
arguments[1].appendChild(obj);
return obj;
@@ -52,7 +60,10 @@ function quickElement() {
// "a" is reference to an object
function removeChildren(a) {
- while (a.hasChildNodes()) a.removeChild(a.lastChild);
+ 'use strict';
+ while (a.hasChildNodes()) {
+ a.removeChild(a.lastChild);
+ }
}
// ----------------------------------------------------------------------------
@@ -74,8 +85,8 @@ var xmlhttp;
@else
xmlhttp = false;
@end @*/
-if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
- xmlhttp = new XMLHttpRequest();
+if (!xmlhttp && typeof XMLHttpRequest !== 'undefined') {
+ xmlhttp = new XMLHttpRequest();
}
// ----------------------------------------------------------------------------
@@ -83,6 +94,7 @@ if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
// See http://www.quirksmode.org/js/findpos.html
// ----------------------------------------------------------------------------
function findPosX(obj) {
+ 'use strict';
var curleft = 0;
if (obj.offsetParent) {
while (obj.offsetParent) {
@@ -90,7 +102,7 @@ function findPosX(obj) {
obj = obj.offsetParent;
}
// IE offsetParent does not include the top-level
- if (isIE && obj.parentElement){
+ if (isIE && obj.parentElement) {
curleft += obj.offsetLeft - obj.scrollLeft;
}
} else if (obj.x) {
@@ -100,6 +112,7 @@ function findPosX(obj) {
}
function findPosY(obj) {
+ 'use strict';
var curtop = 0;
if (obj.offsetParent) {
while (obj.offsetParent) {
@@ -107,7 +120,7 @@ function findPosY(obj) {
obj = obj.offsetParent;
}
// IE offsetParent does not include the top-level
- if (isIE && obj.parentElement){
+ if (isIE && obj.parentElement) {
curtop += obj.offsetTop - obj.scrollTop;
}
} else if (obj.y) {
@@ -119,125 +132,129 @@ function findPosY(obj) {
//-----------------------------------------------------------------------------
// Date object extensions
// ----------------------------------------------------------------------------
+(function() {
+ 'use strict';
+ Date.prototype.getTwelveHours = function() {
+ var hours = this.getHours();
+ if (hours === 0) {
+ return 12;
+ }
+ else {
+ return hours <= 12 ? hours : hours - 12;
+ }
+ };
-Date.prototype.getTwelveHours = function() {
- hours = this.getHours();
- if (hours == 0) {
- return 12;
- }
- else {
- return hours <= 12 ? hours : hours-12
- }
-}
-
-Date.prototype.getTwoDigitMonth = function() {
- return (this.getMonth() < 9) ? '0' + (this.getMonth()+1) : (this.getMonth()+1);
-}
-
-Date.prototype.getTwoDigitDate = function() {
- return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate();
-}
+ Date.prototype.getTwoDigitMonth = function() {
+ return (this.getMonth() < 9) ? '0' + (this.getMonth() + 1) : (this.getMonth() + 1);
+ };
-Date.prototype.getTwoDigitTwelveHour = function() {
- return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours();
-}
+ Date.prototype.getTwoDigitDate = function() {
+ return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate();
+ };
-Date.prototype.getTwoDigitHour = function() {
- return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours();
-}
+ Date.prototype.getTwoDigitTwelveHour = function() {
+ return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours();
+ };
-Date.prototype.getTwoDigitMinute = function() {
- return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes();
-}
+ Date.prototype.getTwoDigitHour = function() {
+ return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours();
+ };
-Date.prototype.getTwoDigitSecond = function() {
- return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
-}
+ Date.prototype.getTwoDigitMinute = function() {
+ return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes();
+ };
-Date.prototype.getHourMinute = function() {
- return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
-}
+ Date.prototype.getTwoDigitSecond = function() {
+ return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
+ };
-Date.prototype.getHourMinuteSecond = function() {
- return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
-}
+ Date.prototype.getHourMinute = function() {
+ return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
+ };
-Date.prototype.strftime = function(format) {
- var fields = {
- c: this.toString(),
- d: this.getTwoDigitDate(),
- H: this.getTwoDigitHour(),
- I: this.getTwoDigitTwelveHour(),
- m: this.getTwoDigitMonth(),
- M: this.getTwoDigitMinute(),
- p: (this.getHours() >= 12) ? 'PM' : 'AM',
- S: this.getTwoDigitSecond(),
- w: '0' + this.getDay(),
- x: this.toLocaleDateString(),
- X: this.toLocaleTimeString(),
- y: ('' + this.getFullYear()).substr(2, 4),
- Y: '' + this.getFullYear(),
- '%' : '%'
+ Date.prototype.getHourMinuteSecond = function() {
+ return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
};
- var result = '', i = 0;
- while (i < format.length) {
- if (format.charAt(i) === '%') {
- result = result + fields[format.charAt(i + 1)];
+
+ Date.prototype.strftime = function(format) {
+ var fields = {
+ c: this.toString(),
+ d: this.getTwoDigitDate(),
+ H: this.getTwoDigitHour(),
+ I: this.getTwoDigitTwelveHour(),
+ m: this.getTwoDigitMonth(),
+ M: this.getTwoDigitMinute(),
+ p: (this.getHours() >= 12) ? 'PM' : 'AM',
+ S: this.getTwoDigitSecond(),
+ w: '0' + this.getDay(),
+ x: this.toLocaleDateString(),
+ X: this.toLocaleTimeString(),
+ y: ('' + this.getFullYear()).substr(2, 4),
+ Y: '' + this.getFullYear(),
+ '%': '%'
+ };
+ var result = '', i = 0;
+ while (i < format.length) {
+ if (format.charAt(i) === '%') {
+ result = result + fields[format.charAt(i + 1)];
+ ++i;
+ }
+ else {
+ result = result + format.charAt(i);
+ }
++i;
}
- else {
- result = result + format.charAt(i);
- }
- ++i;
- }
- return result;
-}
+ return result;
+ };
// ----------------------------------------------------------------------------
// String object extensions
// ----------------------------------------------------------------------------
-String.prototype.pad_left = function(pad_length, pad_string) {
- var new_string = this;
- for (var i = 0; new_string.length < pad_length; i++) {
- new_string = pad_string + new_string;
- }
- return new_string;
-}
+ String.prototype.pad_left = function(pad_length, pad_string) {
+ var new_string = this;
+ for (var i = 0; new_string.length < pad_length; i++) {
+ new_string = pad_string + new_string;
+ }
+ return new_string;
+ };
-String.prototype.strptime = function(format) {
- var split_format = format.split(/[.\-/]/);
- var date = this.split(/[.\-/]/);
- var i = 0;
- while (i < split_format.length) {
- switch (split_format[i]) {
- case "%d":
- var day = date[i];
- break;
- case "%m":
- var month = date[i] - 1;
- break;
- case "%Y":
- var year = date[i];
- break;
- case "%y":
- var year = date[i];
- break;
+ String.prototype.strptime = function(format) {
+ var split_format = format.split(/[.\-/]/);
+ var date = this.split(/[.\-/]/);
+ var i = 0;
+ var day, month, year;
+ while (i < split_format.length) {
+ switch (split_format[i]) {
+ case "%d":
+ day = date[i];
+ break;
+ case "%m":
+ month = date[i] - 1;
+ break;
+ case "%Y":
+ year = date[i];
+ break;
+ case "%y":
+ year = date[i];
+ break;
+ }
+ ++i;
}
- ++i;
+ return new Date(year, month, day);
};
- return new Date(year, month, day);
-}
+})();
// ----------------------------------------------------------------------------
// Get the computed style for and element
// ----------------------------------------------------------------------------
-function getStyle(oElm, strCssRule){
+function getStyle(oElm, strCssRule) {
+ 'use strict';
var strValue = "";
- if(document.defaultView && document.defaultView.getComputedStyle){
+ if(document.defaultView && document.defaultView.getComputedStyle) {
strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
}
- else if(oElm.currentStyle){
- strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+ else if(oElm.currentStyle) {
+ strCssRule = strCssRule.replace(/\-(\w)/g, function(strMatch, p1) {
return p1.toUpperCase();
});
strValue = oElm.currentStyle[strCssRule];
diff --git a/static/admin/js/inlines.js b/static/admin/js/inlines.js
index 0bfcd341242c562592f680c940741b1c6986e9ec..c725e30cbb29c9be12217d06be1d3eed3c0f10c5 100644
--- a/static/admin/js/inlines.js
+++ b/static/admin/js/inlines.js
@@ -1,3 +1,4 @@
+/*global DateTimeShortcuts, SelectFilter*/
/**
* Django admin inlines
*
@@ -15,258 +16,260 @@
* See: http://www.opensource.org/licenses/bsd-license.php
*/
(function($) {
- $.fn.formset = function(opts) {
- var options = $.extend({}, $.fn.formset.defaults, opts);
- var $this = $(this);
- var $parent = $this.parent();
- var updateElementIndex = function(el, prefix, ndx) {
- var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
- var replacement = prefix + "-" + ndx;
- if ($(el).prop("for")) {
- $(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
- }
- if (el.id) {
- el.id = el.id.replace(id_regex, replacement);
- }
- if (el.name) {
- el.name = el.name.replace(id_regex, replacement);
- }
- };
- var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
- var nextIndex = parseInt(totalForms.val(), 10);
- var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
- // only show the add button if we are allowed to add more items,
+ 'use strict';
+ $.fn.formset = function(opts) {
+ var options = $.extend({}, $.fn.formset.defaults, opts);
+ var $this = $(this);
+ var $parent = $this.parent();
+ var updateElementIndex = function(el, prefix, ndx) {
+ var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
+ var replacement = prefix + "-" + ndx;
+ if ($(el).prop("for")) {
+ $(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
+ }
+ if (el.id) {
+ el.id = el.id.replace(id_regex, replacement);
+ }
+ if (el.name) {
+ el.name = el.name.replace(id_regex, replacement);
+ }
+ };
+ var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
+ var nextIndex = parseInt(totalForms.val(), 10);
+ var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
+ // only show the add button if we are allowed to add more items,
// note that max_num = None translates to a blank string.
- var showAddButton = maxForms.val() === '' || (maxForms.val()-totalForms.val()) > 0;
- $this.each(function(i) {
- $(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
- });
- if ($this.length && showAddButton) {
- var addButton;
- if ($this.prop("tagName") == "TR") {
- // If forms are laid out as table rows, insert the
- // "add" button in a new table row:
- var numCols = this.eq(-1).children().length;
- $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
- addButton = $parent.find("tr:last a");
- } else {
- // Otherwise, insert it immediately after the last form:
- $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
- addButton = $this.filter(":last").next().find("a");
- }
- addButton.click(function(e) {
- e.preventDefault();
- var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS");
- var template = $("#" + options.prefix + "-empty");
- var row = template.clone(true);
- row.removeClass(options.emptyCssClass)
- .addClass(options.formCssClass)
- .attr("id", options.prefix + "-" + nextIndex);
- if (row.is("tr")) {
- // If the forms are laid out in table rows, insert
- // the remove button into the last table cell:
- row.children(":last").append('<div><a class="' + options.deleteCssClass +'" href="javascript:void(0)">' + options.deleteText + "</a></div>");
- } else if (row.is("ul") || row.is("ol")) {
- // If they're laid out as an ordered/unordered list,
- // insert an <li> after the last list item:
- row.append('<li><a class="' + options.deleteCssClass +'" href="javascript:void(0)">' + options.deleteText + "</a></li>");
- } else {
- // Otherwise, just insert the remove button as the
- // last child element of the form's container:
- row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></span>");
- }
- row.find("*").each(function() {
- updateElementIndex(this, options.prefix, totalForms.val());
+ var showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0;
+ $this.each(function(i) {
+ $(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
});
- // Insert the new form when it has been fully edited
- row.insertBefore($(template));
- // Update number of total forms
- $(totalForms).val(parseInt(totalForms.val(), 10) + 1);
- nextIndex += 1;
- // Hide add button in case we've hit the max, except we want to add infinitely
- if ((maxForms.val() !== '') && (maxForms.val()-totalForms.val()) <= 0) {
- addButton.parent().hide();
- }
- // The delete button of each row triggers a bunch of other things
- row.find("a." + options.deleteCssClass).click(function(e) {
- e.preventDefault();
- // Remove the parent form containing this button:
- var row = $(this).parents("." + options.formCssClass);
- row.remove();
- nextIndex -= 1;
- // If a post-delete callback was provided, call it with the deleted form:
- if (options.removed) {
- options.removed(row);
- }
- // Update the TOTAL_FORMS form count.
- var forms = $("." + options.formCssClass);
- $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
- // Show add button again once we drop below max
- if ((maxForms.val() === '') || (maxForms.val()-forms.length) > 0) {
- addButton.parent().show();
- }
- // Also, update names and ids for all remaining form controls
- // so they remain in sequence:
- for (var i=0, formCount=forms.length; i<formCount; i++)
- {
- updateElementIndex($(forms).get(i), options.prefix, i);
- $(forms.get(i)).find("*").each(function() {
- updateElementIndex(this, options.prefix, i);
+ if ($this.length && showAddButton) {
+ var addButton;
+ if ($this.prop("tagName") === "TR") {
+ // If forms are laid out as table rows, insert the
+ // "add" button in a new table row:
+ var numCols = this.eq(-1).children().length;
+ $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
+ addButton = $parent.find("tr:last a");
+ } else {
+ // Otherwise, insert it immediately after the last form:
+ $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
+ addButton = $this.filter(":last").next().find("a");
+ }
+ addButton.click(function(e) {
+ e.preventDefault();
+ var template = $("#" + options.prefix + "-empty");
+ var row = template.clone(true);
+ row.removeClass(options.emptyCssClass)
+ .addClass(options.formCssClass)
+ .attr("id", options.prefix + "-" + nextIndex);
+ if (row.is("tr")) {
+ // If the forms are laid out in table rows, insert
+ // the remove button into the last table cell:
+ row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></div>");
+ } else if (row.is("ul") || row.is("ol")) {
+ // If they're laid out as an ordered/unordered list,
+ // insert an <li> after the last list item:
+ row.append('<li><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></li>");
+ } else {
+ // Otherwise, just insert the remove button as the
+ // last child element of the form's container:
+ row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></span>");
+ }
+ row.find("*").each(function() {
+ updateElementIndex(this, options.prefix, totalForms.val());
+ });
+ // Insert the new form when it has been fully edited
+ row.insertBefore($(template));
+ // Update number of total forms
+ $(totalForms).val(parseInt(totalForms.val(), 10) + 1);
+ nextIndex += 1;
+ // Hide add button in case we've hit the max, except we want to add infinitely
+ if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) {
+ addButton.parent().hide();
+ }
+ // The delete button of each row triggers a bunch of other things
+ row.find("a." + options.deleteCssClass).click(function(e1) {
+ e1.preventDefault();
+ // Remove the parent form containing this button:
+ row.remove();
+ nextIndex -= 1;
+ // If a post-delete callback was provided, call it with the deleted form:
+ if (options.removed) {
+ options.removed(row);
+ }
+ $(document).trigger('formset:removed', [row, options.prefix]);
+ // Update the TOTAL_FORMS form count.
+ var forms = $("." + options.formCssClass);
+ $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
+ // Show add button again once we drop below max
+ if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) {
+ addButton.parent().show();
+ }
+ // Also, update names and ids for all remaining form controls
+ // so they remain in sequence:
+ var i, formCount;
+ var updateElementCallback = function() {
+ updateElementIndex(this, options.prefix, i);
+ };
+ for (i = 0, formCount = forms.length; i < formCount; i++) {
+ updateElementIndex($(forms).get(i), options.prefix, i);
+ $(forms.get(i)).find("*").each(updateElementCallback);
+ }
+ });
+ // If a post-add callback was supplied, call it with the added form:
+ if (options.added) {
+ options.added(row);
+ }
+ $(document).trigger('formset:added', [row, options.prefix]);
});
- }
- });
- // If a post-add callback was supplied, call it with the added form:
- if (options.added) {
- options.added(row);
}
- });
- }
- return this;
- };
+ return this;
+ };
- /* Setup plugin defaults */
- $.fn.formset.defaults = {
- prefix: "form", // The form prefix for your django formset
- addText: "add another", // Text for the add link
- deleteText: "remove", // Text for the delete link
- addCssClass: "add-row", // CSS class applied to the add link
- deleteCssClass: "delete-row", // CSS class applied to the delete link
- emptyCssClass: "empty-row", // CSS class applied to the empty row
- formCssClass: "dynamic-form", // CSS class applied to each form in a formset
- added: null, // Function called each time a new form is added
- removed: null // Function called each time a form is deleted
- };
+ /* Setup plugin defaults */
+ $.fn.formset.defaults = {
+ prefix: "form", // The form prefix for your django formset
+ addText: "add another", // Text for the add link
+ deleteText: "remove", // Text for the delete link
+ addCssClass: "add-row", // CSS class applied to the add link
+ deleteCssClass: "delete-row", // CSS class applied to the delete link
+ emptyCssClass: "empty-row", // CSS class applied to the empty row
+ formCssClass: "dynamic-form", // CSS class applied to each form in a formset
+ added: null, // Function called each time a new form is added
+ removed: null // Function called each time a form is deleted
+ };
- // Tabular inlines ---------------------------------------------------------
- $.fn.tabularFormset = function(options) {
- var $rows = $(this);
- var alternatingRows = function(row) {
- $($rows.selector).not(".add-row").removeClass("row1 row2")
- .filter(":even").addClass("row1").end()
- .filter(":odd").addClass("row2");
- };
+ // Tabular inlines ---------------------------------------------------------
+ $.fn.tabularFormset = function(options) {
+ var $rows = $(this);
+ var alternatingRows = function(row) {
+ $($rows.selector).not(".add-row").removeClass("row1 row2")
+ .filter(":even").addClass("row1").end()
+ .filter(":odd").addClass("row2");
+ };
- var reinitDateTimeShortCuts = function() {
- // Reinitialize the calendar and clock widgets by force
- if (typeof DateTimeShortcuts != "undefined") {
- $(".datetimeshortcuts").remove();
- DateTimeShortcuts.init();
- }
- };
+ var reinitDateTimeShortCuts = function() {
+ // Reinitialize the calendar and clock widgets by force
+ if (typeof DateTimeShortcuts !== "undefined") {
+ $(".datetimeshortcuts").remove();
+ DateTimeShortcuts.init();
+ }
+ };
- var updateSelectFilter = function() {
- // If any SelectFilter widgets are a part of the new form,
- // instantiate a new SelectFilter instance for it.
- if (typeof SelectFilter != 'undefined'){
- $('.selectfilter').each(function(index, value){
- var namearr = value.name.split('-');
- SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix );
- });
- $('.selectfilterstacked').each(function(index, value){
- var namearr = value.name.split('-');
- SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix );
- });
- }
- };
+ var updateSelectFilter = function() {
+ // If any SelectFilter widgets are a part of the new form,
+ // instantiate a new SelectFilter instance for it.
+ if (typeof SelectFilter !== 'undefined') {
+ $('.selectfilter').each(function(index, value) {
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length - 1], false);
+ });
+ $('.selectfilterstacked').each(function(index, value) {
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length - 1], true);
+ });
+ }
+ };
+
+ var initPrepopulatedFields = function(row) {
+ row.find('.prepopulated_field').each(function() {
+ var field = $(this),
+ input = field.find('input, select, textarea'),
+ dependency_list = input.data('dependency_list') || [],
+ dependencies = [];
+ $.each(dependency_list, function(i, field_name) {
+ dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
+ });
+ if (dependencies.length) {
+ input.prepopulate(dependencies, input.attr('maxlength'));
+ }
+ });
+ };
- var initPrepopulatedFields = function(row) {
- row.find('.prepopulated_field').each(function() {
- var field = $(this),
- input = field.find('input, select, textarea'),
- dependency_list = input.data('dependency_list') || [],
- dependencies = [];
- $.each(dependency_list, function(i, field_name) {
- dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
+ $rows.formset({
+ prefix: options.prefix,
+ addText: options.addText,
+ formCssClass: "dynamic-" + options.prefix,
+ deleteCssClass: "inline-deletelink",
+ deleteText: options.deleteText,
+ emptyCssClass: "empty-form",
+ removed: alternatingRows,
+ added: function(row) {
+ initPrepopulatedFields(row);
+ reinitDateTimeShortCuts();
+ updateSelectFilter();
+ alternatingRows(row);
+ }
});
- if (dependencies.length) {
- input.prepopulate(dependencies, input.attr('maxlength'));
- }
- });
+
+ return $rows;
};
- $rows.formset({
- prefix: options.prefix,
- addText: options.addText,
- formCssClass: "dynamic-" + options.prefix,
- deleteCssClass: "inline-deletelink",
- deleteText: options.deleteText,
- emptyCssClass: "empty-form",
- removed: alternatingRows,
- added: function(row) {
- initPrepopulatedFields(row);
- reinitDateTimeShortCuts();
- updateSelectFilter();
- alternatingRows(row);
- }
- });
+ // Stacked inlines ---------------------------------------------------------
+ $.fn.stackedFormset = function(options) {
+ var $rows = $(this);
+ var updateInlineLabel = function(row) {
+ $($rows.selector).find(".inline_label").each(function(i) {
+ var count = i + 1;
+ $(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
+ });
+ };
- return $rows;
- };
+ var reinitDateTimeShortCuts = function() {
+ // Reinitialize the calendar and clock widgets by force, yuck.
+ if (typeof DateTimeShortcuts !== "undefined") {
+ $(".datetimeshortcuts").remove();
+ DateTimeShortcuts.init();
+ }
+ };
- // Stacked inlines ---------------------------------------------------------
- $.fn.stackedFormset = function(options) {
- var $rows = $(this);
- var updateInlineLabel = function(row) {
- $($rows.selector).find(".inline_label").each(function(i) {
- var count = i + 1;
- $(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
- });
- };
+ var updateSelectFilter = function() {
+ // If any SelectFilter widgets were added, instantiate a new instance.
+ if (typeof SelectFilter !== "undefined") {
+ $(".selectfilter").each(function(index, value) {
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length - 1], false);
+ });
+ $(".selectfilterstacked").each(function(index, value) {
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length - 1], true);
+ });
+ }
+ };
- var reinitDateTimeShortCuts = function() {
- // Reinitialize the calendar and clock widgets by force, yuck.
- if (typeof DateTimeShortcuts != "undefined") {
- $(".datetimeshortcuts").remove();
- DateTimeShortcuts.init();
- }
- };
+ var initPrepopulatedFields = function(row) {
+ row.find('.prepopulated_field').each(function() {
+ var field = $(this),
+ input = field.find('input, select, textarea'),
+ dependency_list = input.data('dependency_list') || [],
+ dependencies = [];
+ $.each(dependency_list, function(i, field_name) {
+ dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
+ });
+ if (dependencies.length) {
+ input.prepopulate(dependencies, input.attr('maxlength'));
+ }
+ });
+ };
- var updateSelectFilter = function() {
- // If any SelectFilter widgets were added, instantiate a new instance.
- if (typeof SelectFilter != "undefined"){
- $(".selectfilter").each(function(index, value){
- var namearr = value.name.split('-');
- SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix);
+ $rows.formset({
+ prefix: options.prefix,
+ addText: options.addText,
+ formCssClass: "dynamic-" + options.prefix,
+ deleteCssClass: "inline-deletelink",
+ deleteText: options.deleteText,
+ emptyCssClass: "empty-form",
+ removed: updateInlineLabel,
+ added: function(row) {
+ initPrepopulatedFields(row);
+ reinitDateTimeShortCuts();
+ updateSelectFilter();
+ updateInlineLabel(row);
+ }
});
- $(".selectfilterstacked").each(function(index, value){
- var namearr = value.name.split('-');
- SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix);
- });
- }
- };
- var initPrepopulatedFields = function(row) {
- row.find('.prepopulated_field').each(function() {
- var field = $(this),
- input = field.find('input, select, textarea'),
- dependency_list = input.data('dependency_list') || [],
- dependencies = [];
- $.each(dependency_list, function(i, field_name) {
- dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
- });
- if (dependencies.length) {
- input.prepopulate(dependencies, input.attr('maxlength'));
- }
- });
+ return $rows;
};
-
- $rows.formset({
- prefix: options.prefix,
- addText: options.addText,
- formCssClass: "dynamic-" + options.prefix,
- deleteCssClass: "inline-deletelink",
- deleteText: options.deleteText,
- emptyCssClass: "empty-form",
- removed: updateInlineLabel,
- added: (function(row) {
- initPrepopulatedFields(row);
- reinitDateTimeShortCuts();
- updateSelectFilter();
- updateInlineLabel(row);
- })
- });
-
- return $rows;
- };
})(django.jQuery);
diff --git a/static/admin/js/inlines.min.js b/static/admin/js/inlines.min.js
index cc888a562857b2f1e6cf3b9c49cc14d22deeb1ed..f83cbec6fc365b8f8f2df8e16d20de760d6d1f0f 100644
--- a/static/admin/js/inlines.min.js
+++ b/static/admin/js/inlines.min.js
@@ -1,9 +1,9 @@
-(function(a){a.fn.formset=function(g){var b=a.extend({},a.fn.formset.defaults,g),i=a(this);g=i.parent();var m=function(e,k,h){var j=RegExp("("+k+"-(\\d+|__prefix__))");k=k+"-"+h;a(e).prop("for")&&a(e).prop("for",a(e).prop("for").replace(j,k));if(e.id)e.id=e.id.replace(j,k);if(e.name)e.name=e.name.replace(j,k)},l=a("#id_"+b.prefix+"-TOTAL_FORMS").prop("autocomplete","off"),d=parseInt(l.val(),10),c=a("#id_"+b.prefix+"-MAX_NUM_FORMS").prop("autocomplete","off");l=c.val()===""||c.val()-l.val()>0;i.each(function(){a(this).not("."+
-b.emptyCssClass).addClass(b.formCssClass)});if(i.length&&l){var f;if(i.prop("tagName")=="TR"){i=this.eq(-1).children().length;g.append('<tr class="'+b.addCssClass+'"><td colspan="'+i+'"><a href="javascript:void(0)">'+b.addText+"</a></tr>");f=g.find("tr:last a")}else{i.filter(":last").after('<div class="'+b.addCssClass+'"><a href="javascript:void(0)">'+b.addText+"</a></div>");f=i.filter(":last").next().find("a")}f.click(function(e){e.preventDefault();var k=a("#id_"+b.prefix+"-TOTAL_FORMS");e=a("#"+
-b.prefix+"-empty");var h=e.clone(true);h.removeClass(b.emptyCssClass).addClass(b.formCssClass).attr("id",b.prefix+"-"+d);if(h.is("tr"))h.children(":last").append('<div><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></div>");else h.is("ul")||h.is("ol")?h.append('<li><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></li>"):h.children(":first").append('<span><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></span>");
-h.find("*").each(function(){m(this,b.prefix,k.val())});h.insertBefore(a(e));a(k).val(parseInt(k.val(),10)+1);d+=1;c.val()!==""&&c.val()-k.val()<=0&&f.parent().hide();h.find("a."+b.deleteCssClass).click(function(j){j.preventDefault();j=a(this).parents("."+b.formCssClass);j.remove();d-=1;b.removed&&b.removed(j);j=a("."+b.formCssClass);a("#id_"+b.prefix+"-TOTAL_FORMS").val(j.length);if(c.val()===""||c.val()-j.length>0)f.parent().show();for(var n=0,o=j.length;n<o;n++){m(a(j).get(n),b.prefix,n);a(j.get(n)).find("*").each(function(){m(this,
-b.prefix,n)})}});b.added&&b.added(h)})}return this};a.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null};a.fn.tabularFormset=function(g){var b=a(this),i=function(){a(b.selector).not(".add-row").removeClass("row1 row2").filter(":even").addClass("row1").end().filter(":odd").addClass("row2")},m=function(){if(typeof SelectFilter!="undefined"){a(".selectfilter").each(function(d,
-c){var f=c.name.split("-");SelectFilter.init(c.id,f[f.length-1],false,g.adminStaticPrefix)});a(".selectfilterstacked").each(function(d,c){var f=c.name.split("-");SelectFilter.init(c.id,f[f.length-1],true,g.adminStaticPrefix)})}},l=function(d){d.find(".prepopulated_field").each(function(){var c=a(this).find("input, select, textarea"),f=c.data("dependency_list")||[],e=[];a.each(f,function(k,h){e.push("#"+d.find(".field-"+h).find("input, select, textarea").attr("id"))});e.length&&c.prepopulate(e,c.attr("maxlength"))})};
-b.formset({prefix:g.prefix,addText:g.addText,formCssClass:"dynamic-"+g.prefix,deleteCssClass:"inline-deletelink",deleteText:g.deleteText,emptyCssClass:"empty-form",removed:i,added:function(d){l(d);if(typeof DateTimeShortcuts!="undefined"){a(".datetimeshortcuts").remove();DateTimeShortcuts.init()}m();i(d)}});return b};a.fn.stackedFormset=function(g){var b=a(this),i=function(){a(b.selector).find(".inline_label").each(function(d){d=d+1;a(this).html(a(this).html().replace(/(#\d+)/g,"#"+d))})},m=function(){if(typeof SelectFilter!=
-"undefined"){a(".selectfilter").each(function(d,c){var f=c.name.split("-");SelectFilter.init(c.id,f[f.length-1],false,g.adminStaticPrefix)});a(".selectfilterstacked").each(function(d,c){var f=c.name.split("-");SelectFilter.init(c.id,f[f.length-1],true,g.adminStaticPrefix)})}},l=function(d){d.find(".prepopulated_field").each(function(){var c=a(this).find("input, select, textarea"),f=c.data("dependency_list")||[],e=[];a.each(f,function(k,h){e.push("#"+d.find(".form-row .field-"+h).find("input, select, textarea").attr("id"))});
-e.length&&c.prepopulate(e,c.attr("maxlength"))})};b.formset({prefix:g.prefix,addText:g.addText,formCssClass:"dynamic-"+g.prefix,deleteCssClass:"inline-deletelink",deleteText:g.deleteText,emptyCssClass:"empty-form",removed:i,added:function(d){l(d);if(typeof DateTimeShortcuts!="undefined"){a(".datetimeshortcuts").remove();DateTimeShortcuts.init()}m();i(d)}});return b}})(django.jQuery);
+(function(b){b.fn.formset=function(d){var a=b.extend({},b.fn.formset.defaults,d),e=b(this);d=e.parent();var k=function(a,f,l){var c=new RegExp("("+f+"-(\\d+|__prefix__))");f=f+"-"+l;b(a).prop("for")&&b(a).prop("for",b(a).prop("for").replace(c,f));a.id&&(a.id=a.id.replace(c,f));a.name&&(a.name=a.name.replace(c,f))},h=b("#id_"+a.prefix+"-TOTAL_FORMS").prop("autocomplete","off"),l=parseInt(h.val(),10),f=b("#id_"+a.prefix+"-MAX_NUM_FORMS").prop("autocomplete","off"),c=""===f.val()||0<f.val()-h.val();
+e.each(function(f){b(this).not("."+a.emptyCssClass).addClass(a.formCssClass)});if(e.length&&c){var m;"TR"===e.prop("tagName")?(e=this.eq(-1).children().length,d.append('<tr class="'+a.addCssClass+'"><td colspan="'+e+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),m=d.find("tr:last a")):(e.filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),m=e.filter(":last").next().find("a"));m.click(function(c){c.preventDefault();c=b("#"+a.prefix+
+"-empty");var g=c.clone(!0);g.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+l);g.is("tr")?g.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):g.is("ul")||g.is("ol")?g.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):g.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></span>");g.find("*").each(function(){k(this,
+a.prefix,h.val())});g.insertBefore(b(c));b(h).val(parseInt(h.val(),10)+1);l+=1;""!==f.val()&&0>=f.val()-h.val()&&m.parent().hide();g.find("a."+a.deleteCssClass).click(function(c){c.preventDefault();g.remove();--l;a.removed&&a.removed(g);b(document).trigger("formset:removed",[g,a.prefix]);c=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(c.length);(""===f.val()||0<f.val()-c.length)&&m.parent().show();var d,e,h=function(){k(this,a.prefix,d)};d=0;for(e=c.length;d<e;d++)k(b(c).get(d),a.prefix,
+d),b(c.get(d)).find("*").each(h)});a.added&&a.added(g);b(document).trigger("formset:added",[g,a.prefix])})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null};b.fn.tabularFormset=function(d){var a=b(this),e=function(l){b(a.selector).not(".add-row").removeClass("row1 row2").filter(":even").addClass("row1").end().filter(":odd").addClass("row2")},
+k=function(){"undefined"!==typeof SelectFilter&&(b(".selectfilter").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!1)}),b(".selectfilterstacked").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!0)}))},h=function(a){a.find(".prepopulated_field").each(function(){var f=b(this).find("input, select, textarea"),c=f.data("dependency_list")||[],d=[];b.each(c,function(b,c){d.push("#"+a.find(".field-"+c).find("input, select, textarea").attr("id"))});
+d.length&&f.prepopulate(d,f.attr("maxlength"))})};a.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:e,added:function(a){h(a);"undefined"!==typeof DateTimeShortcuts&&(b(".datetimeshortcuts").remove(),DateTimeShortcuts.init());k();e(a)}});return a};b.fn.stackedFormset=function(d){var a=b(this),e=function(d){b(a.selector).find(".inline_label").each(function(a){a+=1;b(this).html(b(this).html().replace(/(#\d+)/g,
+"#"+a))})},k=function(){"undefined"!==typeof SelectFilter&&(b(".selectfilter").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!1)}),b(".selectfilterstacked").each(function(a,b){var c=b.name.split("-");SelectFilter.init(b.id,c[c.length-1],!0)}))},h=function(a){a.find(".prepopulated_field").each(function(){var d=b(this).find("input, select, textarea"),c=d.data("dependency_list")||[],e=[];b.each(c,function(b,c){e.push("#"+a.find(".form-row .field-"+c).find("input, select, textarea").attr("id"))});
+e.length&&d.prepopulate(e,d.attr("maxlength"))})};a.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+d.prefix,deleteCssClass:"inline-deletelink",deleteText:d.deleteText,emptyCssClass:"empty-form",removed:e,added:function(a){h(a);"undefined"!==typeof DateTimeShortcuts&&(b(".datetimeshortcuts").remove(),DateTimeShortcuts.init());k();e(a)}});return a}})(django.jQuery);
diff --git a/static/admin/js/jquery.init.js b/static/admin/js/jquery.init.js
index 22a4c8bfd304b7789d90b9ff9c1c294d771cfb53..f3ac162514eea0924f5e2af80633ed86e053c224 100644
--- a/static/admin/js/jquery.init.js
+++ b/static/admin/js/jquery.init.js
@@ -1,3 +1,4 @@
+/*global django:true, jQuery:false*/
/* Puts the included jQuery into our own namespace using noConflict and passing
* it 'true'. This ensures that the included jQuery doesn't pollute the global
* namespace (i.e. this preserves pre-existing values for both window.$ and
diff --git a/static/admin/js/prepopulate.js b/static/admin/js/prepopulate.js
index db7903a5ef865c7f1d0252ee62c2ed657544c863..5d4b0e8c277377e225578a238ea4757013237d81 100644
--- a/static/admin/js/prepopulate.js
+++ b/static/admin/js/prepopulate.js
@@ -1,16 +1,19 @@
+/*global URLify*/
(function($) {
- $.fn.prepopulate = function(dependencies, maxLength) {
+ 'use strict';
+ $.fn.prepopulate = function(dependencies, maxLength, allowUnicode) {
/*
Depends on urlify.js
Populates a selected field with the values of the dependent fields,
URLifies and shortens the string.
dependencies - array of dependent fields ids
maxLength - maximum length of the URLify'd string
+ allowUnicode - Unicode support of the URLify'd string
*/
return this.each(function() {
var prepopulatedField = $(this);
- var populate = function () {
+ var populate = function() {
// Bail if the field's value has been changed by the user
if (prepopulatedField.data('_changed')) {
return;
@@ -23,7 +26,7 @@
values.push(field.val());
}
});
- prepopulatedField.val(URLify(values.join(' '), maxLength));
+ prepopulatedField.val(URLify(values.join(' '), maxLength, allowUnicode));
};
prepopulatedField.data('_changed', false);
diff --git a/static/admin/js/prepopulate.min.js b/static/admin/js/prepopulate.min.js
index 4a75827c97b2462a2cf2740bdaee1849363c6dc5..75f3c17aa98b1ee8b37e840ee7cc71a7aee54a66 100644
--- a/static/admin/js/prepopulate.min.js
+++ b/static/admin/js/prepopulate.min.js
@@ -1 +1 @@
-(function(b){b.fn.prepopulate=function(e,g){return this.each(function(){var a=b(this),d=function(){if(!a.data("_changed")){var f=[];b.each(e,function(h,c){c=b(c);c.val().length>0&&f.push(c.val())});a.val(URLify(f.join(" "),g))}};a.data("_changed",false);a.change(function(){a.data("_changed",true)});a.val()||b(e.join(",")).keyup(d).change(d).focus(d)})}})(django.jQuery);
+(function(c){c.fn.prepopulate=function(e,f,g){return this.each(function(){var a=c(this),b=function(){if(!a.data("_changed")){var b=[];c.each(e,function(a,d){d=c(d);0<d.val().length&&b.push(d.val())});a.val(URLify(b.join(" "),f,g))}};a.data("_changed",!1);a.change(function(){a.data("_changed",!0)});a.val()||c(e.join(",")).keyup(b).change(b).focus(b)})}})(django.jQuery);
diff --git a/static/admin/js/timeparse.js b/static/admin/js/timeparse.js
index 882f41d56ef240a5fe5f522f27fc81b5b8ecd35c..3cdc7ec7ce9592684c049f27e7b9d1a86e512439 100644
--- a/static/admin/js/timeparse.js
+++ b/static/admin/js/timeparse.js
@@ -1,94 +1,106 @@
-var timeParsePatterns = [
- // 9
- { re: /^\d{1,2}$/i,
- handler: function(bits) {
- if (bits[0].length == 1) {
- return '0' + bits[0] + ':00';
- } else {
- return bits[0] + ':00';
+(function() {
+ 'use strict';
+ var timeParsePatterns = [
+ // 9
+ {
+ re: /^\d{1,2}$/i,
+ handler: function(bits) {
+ if (bits[0].length === 1) {
+ return '0' + bits[0] + ':00';
+ } else {
+ return bits[0] + ':00';
+ }
}
- }
- },
- // 13:00
- { re: /^\d{2}[:.]\d{2}$/i,
- handler: function(bits) {
- return bits[0].replace('.', ':');
- }
- },
- // 9:00
- { re: /^\d[:.]\d{2}$/i,
- handler: function(bits) {
- return '0' + bits[0].replace('.', ':');
- }
- },
- // 3 am / 3 a.m. / 3am
- { re: /^(\d+)\s*([ap])(?:.?m.?)?$/i,
- handler: function(bits) {
- var hour = parseInt(bits[1]);
- if (hour == 12) {
- hour = 0;
+ },
+ // 13:00
+ {
+ re: /^\d{2}[:.]\d{2}$/i,
+ handler: function(bits) {
+ return bits[0].replace('.', ':');
}
- if (bits[2].toLowerCase() == 'p') {
- if (hour == 12) {
+ },
+ // 9:00
+ {
+ re: /^\d[:.]\d{2}$/i,
+ handler: function(bits) {
+ return '0' + bits[0].replace('.', ':');
+ }
+ },
+ // 3 am / 3 a.m. / 3am
+ {
+ re: /^(\d+)\s*([ap])(?:.?m.?)?$/i,
+ handler: function(bits) {
+ var hour = parseInt(bits[1]);
+ if (hour === 12) {
hour = 0;
}
- return (hour + 12) + ':00';
- } else {
- if (hour < 10) {
- return '0' + hour + ':00';
+ if (bits[2].toLowerCase() === 'p') {
+ if (hour === 12) {
+ hour = 0;
+ }
+ return (hour + 12) + ':00';
} else {
- return hour + ':00';
+ if (hour < 10) {
+ return '0' + hour + ':00';
+ } else {
+ return hour + ':00';
+ }
}
}
- }
- },
- // 3.30 am / 3:15 a.m. / 3.00am
- { re: /^(\d+)[.:](\d{2})\s*([ap]).?m.?$/i,
- handler: function(bits) {
- var hour = parseInt(bits[1]);
- var mins = parseInt(bits[2]);
- if (mins < 10) {
- mins = '0' + mins;
- }
- if (hour == 12) {
- hour = 0;
- }
- if (bits[3].toLowerCase() == 'p') {
- if (hour == 12) {
+ },
+ // 3.30 am / 3:15 a.m. / 3.00am
+ {
+ re: /^(\d+)[.:](\d{2})\s*([ap]).?m.?$/i,
+ handler: function(bits) {
+ var hour = parseInt(bits[1]);
+ var mins = parseInt(bits[2]);
+ if (mins < 10) {
+ mins = '0' + mins;
+ }
+ if (hour === 12) {
hour = 0;
}
- return (hour + 12) + ':' + mins;
- } else {
- if (hour < 10) {
- return '0' + hour + ':' + mins;
+ if (bits[3].toLowerCase() === 'p') {
+ if (hour === 12) {
+ hour = 0;
+ }
+ return (hour + 12) + ':' + mins;
} else {
- return hour + ':' + mins;
+ if (hour < 10) {
+ return '0' + hour + ':' + mins;
+ } else {
+ return hour + ':' + mins;
+ }
}
}
+ },
+ // noon
+ {
+ re: /^no/i,
+ handler: function(bits) {
+ return '12:00';
+ }
+ },
+ // midnight
+ {
+ re: /^mid/i,
+ handler: function(bits) {
+ return '00:00';
+ }
}
- },
- // noon
- { re: /^no/i,
- handler: function(bits) {
- return '12:00';
- }
- },
- // midnight
- { re: /^mid/i,
- handler: function(bits) {
- return '00:00';
- }
- }
-];
+ ];
-function parseTimeString(s) {
- for (var i = 0; i < timeParsePatterns.length; i++) {
- var re = timeParsePatterns[i].re;
- var handler = timeParsePatterns[i].handler;
- var bits = re.exec(s);
- if (bits) {
- return handler(bits);
+ function parseTimeString(s) {
+ for (var i = 0; i < timeParsePatterns.length; i++) {
+ var re = timeParsePatterns[i].re;
+ var handler = timeParsePatterns[i].handler;
+ var bits = re.exec(s);
+ if (bits) {
+ return handler(bits);
+ }
}
+ return s;
}
- return s;
-}
+
+ window.parseTimeString = parseTimeString;
+})();
diff --git a/static/admin/js/urlify.js b/static/admin/js/urlify.js
index bcf158f0a167d145f2c921782b330cd23bb12e7c..b27325e6b72ab6d750b8646eae87afe2ece0a801 100644
--- a/static/admin/js/urlify.js
+++ b/static/admin/js/urlify.js
@@ -1,147 +1,171 @@
-var LATIN_MAP = {
- 'À': 'A', 'Ã': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Ã…': 'A', 'Æ': 'AE', 'Ç':
- 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'ÃŒ': 'I', 'Ã': 'I', 'ÃŽ': 'I',
- 'Ã': 'I', 'Ã': 'D', 'Ñ': 'N', 'Ã’': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö':
- 'O', 'Å': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ãœ': 'U', 'Å°': 'U',
- 'Ã': 'Y', 'Þ': 'TH', 'Ÿ': 'Y', 'ß': 'ss', 'à ':'a', 'á':'a', 'â': 'a', 'ã':
- 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e',
- 'ë': 'e', 'ì': 'i', 'Ã': 'i', 'î': 'i', 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò':
- 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u',
- 'ú': 'u', 'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
-};
-var LATIN_SYMBOLS_MAP = {
- '©':'(c)'
-};
-var GREEK_MAP = {
- 'α':'a', 'β':'b', 'γ':'g', 'δ':'d', 'ε':'e', 'ζ':'z', 'η':'h', 'θ':'8',
- 'ι':'i', 'κ':'k', 'λ':'l', 'μ':'m', 'ν':'n', 'ξ':'3', 'ο':'o', 'π':'p',
- 'Ï':'r', 'σ':'s', 'Ï„':'t', 'Ï…':'y', 'φ':'f', 'χ':'x', 'ψ':'ps', 'ω':'w',
- 'ά':'a', 'Î':'e', 'ί':'i', 'ÏŒ':'o', 'Ï':'y', 'ή':'h', 'ÏŽ':'w', 'Ï‚':'s',
- 'ÏŠ':'i', 'ΰ':'y', 'Ï‹':'y', 'Î':'i',
- 'Α':'A', 'Β':'B', 'Γ':'G', 'Δ':'D', 'Ε':'E', 'Ζ':'Z', 'Η':'H', 'Θ':'8',
- 'Ι':'I', 'Κ':'K', 'Λ':'L', 'Îœ':'M', 'Î':'N', 'Ξ':'3', 'Ο':'O', 'Î ':'P',
- 'Ρ':'R', 'Σ':'S', 'Τ':'T', 'Υ':'Y', 'Φ':'F', 'Χ':'X', 'Ψ':'PS', 'Ω':'W',
- 'Ά':'A', 'Έ':'E', 'Ί':'I', 'ÎŒ':'O', 'ÎŽ':'Y', 'Ή':'H', 'Î':'W', 'Ϊ':'I',
- 'Ϋ':'Y'
-};
-var TURKISH_MAP = {
- 'ş':'s', 'Ş':'S', 'ı':'i', 'İ':'I', 'ç':'c', 'Ç':'C', 'ü':'u', 'Ü':'U',
- 'ö':'o', 'Ö':'O', 'ğ':'g', 'Ğ':'G'
-};
-var RUSSIAN_MAP = {
- 'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh',
- 'з':'z', 'и':'i', 'й':'j', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o',
- 'п':'p', 'Ñ€':'r', 'Ñ':'s', 'Ñ‚':'t', 'у':'u', 'Ñ„':'f', 'Ñ…':'h', 'ц':'c',
- 'ч':'ch', 'ш':'sh', 'щ':'sh', 'ÑŠ':'', 'Ñ‹':'y', 'ÑŒ':'', 'Ñ':'e', 'ÑŽ':'yu',
- 'Ñ':'ya',
- 'Ð':'A', 'Б':'B', 'Ð’':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ð':'Yo', 'Ж':'Zh',
- 'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'Ðœ':'M', 'Ð':'N', 'О':'O',
- 'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'C',
- 'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sh', 'Ъ':'', 'Ы':'Y', 'Ь':'', 'Ð':'E', 'Ю':'Yu',
- 'Я':'Ya'
-};
-var UKRAINIAN_MAP = {
- 'Є':'Ye', 'І':'I', 'Ї':'Yi', 'Ò':'G', 'Ñ”':'ye', 'Ñ–':'i', 'Ñ—':'yi', 'Ò‘':'g'
-};
-var CZECH_MAP = {
- 'Ä':'c', 'Ä':'d', 'Ä›':'e', 'ň': 'n', 'Å™':'r', 'Å¡':'s', 'Å¥':'t', 'ů':'u',
- 'ž':'z', 'Č':'C', 'Ď':'D', 'Ě':'E', 'Ň': 'N', 'Ř':'R', 'Š':'S', 'Ť':'T',
- 'Ů':'U', 'Ž':'Z'
-};
-var POLISH_MAP = {
- 'ą':'a', 'ć':'c', 'ę':'e', 'ł':'l', 'ń':'n', 'ó':'o', 'ś':'s', 'ź':'z',
- 'ż':'z', 'Ä„':'A', 'Ć':'C', 'Ę':'E', 'Å':'L', 'Ń':'N', 'Ó':'O', 'Åš':'S',
- 'Ź':'Z', 'Ż':'Z'
-};
-var LATVIAN_MAP = {
- 'Ä':'a', 'Ä':'c', 'Ä“':'e', 'Ä£':'g', 'Ä«':'i', 'Ä·':'k', 'ļ':'l', 'ņ':'n',
- 'š':'s', 'ū':'u', 'ž':'z', 'Ā':'A', 'Č':'C', 'Ē':'E', 'Ģ':'G', 'Ī':'I',
- 'Ķ':'K', 'Ļ':'L', 'Ņ':'N', 'Š':'S', 'Ū':'U', 'Ž':'Z'
-};
-var ARABIC_MAP = {
- 'Ø£':'a', 'ب':'b', 'ت':'t', 'Ø«': 'th', 'ج':'g', 'Ø':'h', 'Ø®':'kh', 'د':'d',
- 'ذ':'th', 'ر':'r', 'ز':'z', 'س':'s', 'ش':'sh', 'ص':'s', 'ض':'d', 'ط':'t',
- 'ظ':'th', 'ع':'aa', 'غ':'gh', 'Ù':'f', 'Ù‚':'k', 'Ùƒ':'k', 'Ù„':'l', 'Ù…':'m',
- 'Ù†':'n', 'Ù‡':'h', 'Ùˆ':'o', 'ÙŠ':'y'
-};
-var LITHUANIAN_MAP = {
- 'Ä…':'a', 'Ä':'c', 'Ä™':'e', 'Ä—':'e', 'į':'i', 'Å¡':'s', 'ų':'u', 'Å«':'u',
- 'ž':'z',
- 'Ą':'A', 'Č':'C', 'Ę':'E', 'Ė':'E', 'Į':'I', 'Š':'S', 'Ų':'U', 'Ū':'U',
- 'Ž':'Z'
-};
-var SERBIAN_MAP = {
- 'ђ':'dj', 'ј':'j', 'љ':'lj', 'њ':'nj', 'ћ':'c', 'џ':'dz', 'đ':'dj',
- 'Ђ':'Dj', 'Ј':'j', 'Љ':'Lj', 'Њ':'Nj', 'Ћ':'C', 'Ð':'Dz', 'Ä':'Dj'
-};
-var AZERBAIJANI_MAP = {
- 'ç':'c', 'ə':'e', 'ğ':'g', 'ı':'i', 'ö':'o', 'ş':'s', 'ü':'u',
- 'Ç':'C', 'Æ':'E', 'Äž':'G', 'Ä°':'I', 'Ö':'O', 'Åž':'S', 'Ãœ':'U'
-};
+/*global XRegExp*/
+(function() {
+ 'use strict';
-var ALL_DOWNCODE_MAPS = [
- LATIN_MAP,
- LATIN_SYMBOLS_MAP,
- GREEK_MAP,
- TURKISH_MAP,
- RUSSIAN_MAP,
- UKRAINIAN_MAP,
- CZECH_MAP,
- POLISH_MAP,
- LATVIAN_MAP,
- ARABIC_MAP,
- LITHUANIAN_MAP,
- SERBIAN_MAP,
- AZERBAIJANI_MAP
-];
+ var LATIN_MAP = {
+ 'À': 'A', 'Ã': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Ã…': 'A', 'Æ': 'AE',
+ 'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'ÃŒ': 'I', 'Ã': 'I',
+ 'ÃŽ': 'I', 'Ã': 'I', 'Ã': 'D', 'Ñ': 'N', 'Ã’': 'O', 'Ó': 'O', 'Ô': 'O',
+ 'Õ': 'O', 'Ö': 'O', 'Å': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U',
+ 'Ãœ': 'U', 'Å°': 'U', 'Ã': 'Y', 'Þ': 'TH', 'Ÿ': 'Y', 'ß': 'ss', 'à ': 'a',
+ 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c',
+ 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'Ã': 'i', 'î': 'i',
+ 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o',
+ 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u',
+ 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y'
+ };
+ var LATIN_SYMBOLS_MAP = {
+ '©': '(c)'
+ };
+ var GREEK_MAP = {
+ 'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h',
+ 'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3',
+ 'ο': 'o', 'Ï€': 'p', 'Ï': 'r', 'σ': 's', 'Ï„': 't', 'Ï…': 'y', 'φ': 'f',
+ 'χ': 'x', 'ψ': 'ps', 'ω': 'w', 'ά': 'a', 'Î': 'e', 'ί': 'i', 'ÏŒ': 'o',
+ 'Ï': 'y', 'ή': 'h', 'ÏŽ': 'w', 'Ï‚': 's', 'ÏŠ': 'i', 'ΰ': 'y', 'Ï‹': 'y',
+ 'Î': 'i', 'Α': 'A', 'Î’': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z',
+ 'Η': 'H', 'Θ': '8', 'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Îœ': 'M', 'Î': 'N',
+ 'Ξ': '3', 'Ο': 'O', 'Π': 'P', 'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y',
+ 'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W', 'Ά': 'A', 'Έ': 'E', 'Ί': 'I',
+ 'ÎŒ': 'O', 'ÎŽ': 'Y', 'Ή': 'H', 'Î': 'W', 'Ϊ': 'I', 'Ϋ': 'Y'
+ };
+ var TURKISH_MAP = {
+ 'ş': 's', 'Ş': 'S', 'ı': 'i', 'İ': 'I', 'ç': 'c', 'Ç': 'C', 'ü': 'u',
+ 'Ü': 'U', 'ö': 'o', 'Ö': 'O', 'ğ': 'g', 'Ğ': 'G'
+ };
+ var ROMANIAN_MAP = {
+ 'ă': 'a', 'î': 'i', 'ș': 's', 'ț': 't', 'â': 'a',
+ 'Ă': 'A', 'Î': 'I', 'Ș': 'S', 'Ț': 'T', 'Â': 'A'
+ };
+ var RUSSIAN_MAP = {
+ 'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo',
+ 'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm',
+ 'н': 'n', 'о': 'o', 'п': 'p', 'Ñ€': 'r', 'Ñ': 's', 'Ñ‚': 't', 'у': 'u',
+ 'ф': 'f', 'х': 'h', 'ц': 'c', 'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '',
+ 'Ñ‹': 'y', 'ÑŒ': '', 'Ñ': 'e', 'ÑŽ': 'yu', 'Ñ': 'ya',
+ 'Ð': 'A', 'Б': 'B', 'Ð’': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ð': 'Yo',
+ 'Ж': 'Zh', 'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M',
+ 'Ð': 'N', 'О': 'O', 'П': 'P', 'Ð ': 'R', 'С': 'S', 'Т': 'T', 'У': 'U',
+ 'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '',
+ 'Ы': 'Y', 'Ь': '', 'Ð': 'E', 'Ю': 'Yu', 'Я': 'Ya'
+ };
+ var UKRAINIAN_MAP = {
+ 'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ò': 'G', 'Ñ”': 'ye', 'Ñ–': 'i',
+ 'Ñ—': 'yi', 'Ò‘': 'g'
+ };
+ var CZECH_MAP = {
+ 'Ä': 'c', 'Ä': 'd', 'Ä›': 'e', 'ň': 'n', 'Å™': 'r', 'Å¡': 's', 'Å¥': 't',
+ 'ů': 'u', 'ž': 'z', 'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R',
+ 'Š': 'S', 'Ť': 'T', 'Ů': 'U', 'Ž': 'Z'
+ };
+ var POLISH_MAP = {
+ 'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's',
+ 'ź': 'z', 'ż': 'z',
+ 'Ä„': 'A', 'Ć': 'C', 'Ę': 'E', 'Å': 'L', 'Ń': 'N', 'Ó': 'O', 'Åš': 'S',
+ 'Ź': 'Z', 'Ż': 'Z'
+ };
+ var LATVIAN_MAP = {
+ 'Ä': 'a', 'Ä': 'c', 'Ä“': 'e', 'Ä£': 'g', 'Ä«': 'i', 'Ä·': 'k', 'ļ': 'l',
+ 'ņ': 'n', 'š': 's', 'ū': 'u', 'ž': 'z',
+ 'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'I', 'Ķ': 'K', 'Ļ': 'L',
+ 'Ņ': 'N', 'Š': 'S', 'Ū': 'U', 'Ž': 'Z'
+ };
+ var ARABIC_MAP = {
+ 'Ø£': 'a', 'ب': 'b', 'ت': 't', 'Ø«': 'th', 'ج': 'g', 'Ø': 'h', 'Ø®': 'kh', 'د': 'd',
+ 'ذ': 'th', 'ر': 'r', 'ز': 'z', 'س': 's', 'ش': 'sh', 'ص': 's', 'ض': 'd', 'ط': 't',
+ 'ظ': 'th', 'ع': 'aa', 'غ': 'gh', 'Ù': 'f', 'Ù‚': 'k', 'Ùƒ': 'k', 'Ù„': 'l', 'Ù…': 'm',
+ 'Ù†': 'n', 'Ù‡': 'h', 'Ùˆ': 'o', 'ÙŠ': 'y'
+ };
+ var LITHUANIAN_MAP = {
+ 'Ä…': 'a', 'Ä': 'c', 'Ä™': 'e', 'Ä—': 'e', 'į': 'i', 'Å¡': 's', 'ų': 'u',
+ 'ū': 'u', 'ž': 'z',
+ 'Ą': 'A', 'Č': 'C', 'Ę': 'E', 'Ė': 'E', 'Į': 'I', 'Š': 'S', 'Ų': 'U',
+ 'Ū': 'U', 'Ž': 'Z'
+ };
+ var SERBIAN_MAP = {
+ 'ђ': 'dj', 'ј': 'j', 'љ': 'lj', 'њ': 'nj', 'ћ': 'c', 'џ': 'dz',
+ 'đ': 'dj', 'Ђ': 'Dj', 'Ј': 'j', 'Љ': 'Lj', 'Њ': 'Nj', 'Ћ': 'C',
+ 'Ð': 'Dz', 'Ä': 'Dj'
+ };
+ var AZERBAIJANI_MAP = {
+ 'ç': 'c', 'ə': 'e', 'ğ': 'g', 'ı': 'i', 'ö': 'o', 'ş': 's', 'ü': 'u',
+ 'Ç': 'C', 'Æ': 'E', 'Äž': 'G', 'Ä°': 'I', 'Ö': 'O', 'Åž': 'S', 'Ãœ': 'U'
+ };
-var Downcoder = {
- 'Initialize': function() {
- if (Downcoder.map) { // already made
- return;
- }
- Downcoder.map = {};
- Downcoder.chars = [];
- for (var i=0; i<ALL_DOWNCODE_MAPS.length; i++) {
- var lookup = ALL_DOWNCODE_MAPS[i];
- for (var c in lookup) {
- if (lookup.hasOwnProperty(c)) {
- Downcoder.map[c] = lookup[c];
+ var ALL_DOWNCODE_MAPS = [
+ LATIN_MAP,
+ LATIN_SYMBOLS_MAP,
+ GREEK_MAP,
+ TURKISH_MAP,
+ ROMANIAN_MAP,
+ RUSSIAN_MAP,
+ UKRAINIAN_MAP,
+ CZECH_MAP,
+ POLISH_MAP,
+ LATVIAN_MAP,
+ ARABIC_MAP,
+ LITHUANIAN_MAP,
+ SERBIAN_MAP,
+ AZERBAIJANI_MAP
+ ];
+
+ var Downcoder = {
+ 'Initialize': function() {
+ if (Downcoder.map) { // already made
+ return;
+ }
+ Downcoder.map = {};
+ Downcoder.chars = [];
+ for (var i = 0; i < ALL_DOWNCODE_MAPS.length; i++) {
+ var lookup = ALL_DOWNCODE_MAPS[i];
+ for (var c in lookup) {
+ if (lookup.hasOwnProperty(c)) {
+ Downcoder.map[c] = lookup[c];
+ }
}
}
- }
- for (var k in Downcoder.map) {
- if (Downcoder.map.hasOwnProperty(k)) {
- Downcoder.chars.push(k);
+ for (var k in Downcoder.map) {
+ if (Downcoder.map.hasOwnProperty(k)) {
+ Downcoder.chars.push(k);
+ }
}
+ Downcoder.regex = new RegExp(Downcoder.chars.join('|'), 'g');
}
- Downcoder.regex = new RegExp(Downcoder.chars.join('|'), 'g');
- }
-};
+ };
-function downcode(slug) {
- Downcoder.Initialize();
- return slug.replace(Downcoder.regex, function(m) {
- return Downcoder.map[m];
- });
-}
+ function downcode(slug) {
+ Downcoder.Initialize();
+ return slug.replace(Downcoder.regex, function(m) {
+ return Downcoder.map[m];
+ });
+ }
-function URLify(s, num_chars) {
- // changes, e.g., "Petty theft" to "petty_theft"
- // remove all these words from the string before urlifying
- s = downcode(s);
- var removelist = [
- "a", "an", "as", "at", "before", "but", "by", "for", "from", "is",
- "in", "into", "like", "of", "off", "on", "onto", "per", "since",
- "than", "the", "this", "that", "to", "up", "via", "with"
- ];
- var r = new RegExp('\\b(' + removelist.join('|') + ')\\b', 'gi');
- s = s.replace(r, '');
- // if downcode doesn't hit, the char will be stripped here
- s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars
- s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
- s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
- s = s.toLowerCase(); // convert to lowercase
- return s.substring(0, num_chars);// trim to first num_chars chars
-}
+ function URLify(s, num_chars, allowUnicode) {
+ // changes, e.g., "Petty theft" to "petty-theft"
+ // remove all these words from the string before urlifying
+ if (!allowUnicode) {
+ s = downcode(s);
+ }
+ var removelist = [
+ "a", "an", "as", "at", "before", "but", "by", "for", "from", "is",
+ "in", "into", "like", "of", "off", "on", "onto", "per", "since",
+ "than", "the", "this", "that", "to", "up", "via", "with"
+ ];
+ var r = new RegExp('\\b(' + removelist.join('|') + ')\\b', 'gi');
+ s = s.replace(r, '');
+ // if downcode doesn't hit, the char will be stripped here
+ if (allowUnicode) {
+ // Keep Unicode letters including both lowercase and uppercase
+ // characters, whitespace, and dash; remove other characters.
+ s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), '');
+ } else {
+ s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars
+ }
+ s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
+ s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
+ s = s.toLowerCase(); // convert to lowercase
+ return s.substring(0, num_chars); // trim to first num_chars chars
+ }
+ window.URLify = URLify;
+})();
diff --git a/static/scipost/SciPost.css b/static/scipost/SciPost.css
index e81195282c47bcf50afe91b627e4d286b4df7d17..96135df1b26d74a5b254bb3a609b97b1a255d62e 100644
--- a/static/scipost/SciPost.css
+++ b/static/scipost/SciPost.css
@@ -182,7 +182,8 @@ header {
// background-color: #333333;
// background-color: #102040;
// background: linear-gradient(to right,#002240, #003360);
- background: linear-gradient(to right,#103050, #204060);
+// background: linear-gradient(to right,#103050, #204060);
+ background-color: rgb(18, 52, 85);
color: #ffffff;
// border: 1px solid grey; border-radius:5px;
border: 0px solid grey; border-radius:0px;
diff --git a/static/scipost/info/SciPost_Description.pdf b/static/scipost/info/SciPost_Description.pdf
index 07c1c8e4ba5fe19634308a387d7b1b8a560d3a3d..ea137dfa37f7889011c67a6eaa49a1163029aaca 100644
Binary files a/static/scipost/info/SciPost_Description.pdf and b/static/scipost/info/SciPost_Description.pdf differ
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index 8ce441026fae1954806b7bedaabe983a0c26742d..f69c2b0c96faa3cf549c6bc557db26c9ce08c5c8 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -16,23 +16,24 @@
<ol>
<li>Prepare your manuscript using the SciPost LaTeX template (<a href="{% static 'submissions/latex/SciPost_LaTeX_template.tex' %}">.tex</a>, <a href="{% static 'submissions/latex/SciPost_LaTeX_template.pdf' %}">.pdf</a>)</li>
<li>Make your preprint publicly available on <a href="http://arxiv.org">arXiv.org</a></li>
- <li>After appearance on the arXiv, fill the SciPost <a href="{% url 'submissions:submit_manuscript' %}">Submission</a> form, choosing which SciPost Journal you wish to submit to. </li>
+ <li>After appearance on arxiv.org, fill the SciPost <a href="{% url 'submissions:submit_manuscript' %}">Submission</a> form, selecting which SciPost Journal to submit to and providing domain and speciality specifications.</li>
</ol>
<p>Note that you cannot submit directly to SciPost Physics Select or SciPost Physics X. Submissions to SciPost Physics Letters deemed of superlative quality will be editorially promoted to SPS (and similarly for articles from SciPost Physics to SciPost Physics X).</p>
<br/>
<h3>Refereeing procedure</h3>
- <p>Papers submitted to SciPost are put through the <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> process, implementing the highest possible standard of refereeing. The precise procedure differs slightly between SciPost Journals but follows this pattern:</p>
+ <p>All incoming Submissions to SciPost Journals are peer-reviewed using SciPost's <a href="{% url 'scipost:peer_witnessed_refereeing' %}">peer-witnessed refereeing</a> process, implementing the highest standard of refereeing available. The precise procedure follows this pattern (the various types of Editors are described in the next section):</p>
<ul>
- <li>A SciPost Submission Page is activated for the Submission (this is similar to a Commentary Page, but with Reports also enabled). This page is immediately open to Contributor Comments and Author Replies.</li>
- <li>An Editor-in-charge starts a Refereeing round (whose duration depends on the Journal), inviting specific Contributors to provide an Invited Report.</li>
+ <li>A Specialty Editor is internally selected and becomes Editor-in-charge of the manuscript. A Submission Page is activated (this is similar to a Commentary Page, but with Reports also enabled), and is immediately open to Contributor Comments and Author Replies, all of which are vetted by the Editor-in-charge of the submission.</li>
+ <li>The Editor-in-charge starts a Refereeing round (whose duration depends on the Journal, see below), inviting specific Contributors to provide an Invited Report.</li>
<li>During a refereeing round, registered Contributors to SciPost can volunteer a Contributed Report.</li>
- <li>Authors can continuously provide Replies to Reports and Comments.</li>
- <li>At the end of the refereeing round, the Authors are given a short time to provide Replies to the gathered Reports and Comments.</li>
- <li>Reports, Replies and Comments are assessed by SciPost Editors, and an Editorial decision is taken.</li>
- <li>The Editorial decision consists in either a publication offer, request for resubmission (with minor revisions, or major revisions (leading to another refereeing round)), or rejection.</li>
- <li>The Authors can respond to the Editorial decision by accepting an eventual publication offer (in which case the Submission Page and its contents are moved to a SciPost Publication Page), by revising their manuscript and resubmitting to SciPost, or by withdrawing their Submission (in which case the Submission Page is deactivated and all its contents removed from public view).</li>
+ <li>During the refereeing round, authors can continuously provide Replies to Reports and Comments.</li>
+ <li>At the end of the refereeing round, the Authors are given a 3 working days to provide Replies to the gathered Reports and Comments before the Editorial assessment takes place.</li>
+ <li>Reports, Replies and Comments are assessed by the Editor-in-charge, who formulates an editorial recommendation and forwards it to the Journal's Editors-in-chief, who fix the editorial decision.</li>
+ <li>The Editorial decision is communicated to the Authors. This consists in either a publication offer, request for resubmission (with minor revisions, or major revisions (leading to another refereeing round)), or rejection.</li>
+ <li>The Authors can respond to the Editorial decision by accepting an eventual publication offer (in which case the Submission Page and its contents are moved to a SciPost Publication Page), by revising their manuscript and resubmitting to SciPost (in which case a new Submission Page is opened, retaining a link to the previous version's Submission Page), or by withdrawing their Submission (in which case the Submission Page is deactivated and all its contents removed from public view).</li>
</ul>
<p>The duration of refereeing rounds depends on the Journal: 3 weeks for Letters, 4 weeks for traditional articles, and 8 weeks for Lecture Notes.</p>
+
</section>
{% endif %} <!-- Temporary strip -->