# HG changeset patch # User Brian Neal # Date 1301444192 0 # Node ID efb2da0b5d1021ca2fb7c2f27108baedf19b3a43 # Parent f3052378ab477cb94fe51719f0cce3bc6f4e1120 Merging the django1.3 branch into trunk. diff -r f3052378ab47 -r efb2da0b5d10 media/css/blueprint/ie.css --- a/media/css/blueprint/ie.css Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* ie.css */ -body {text-align:center;} -.container {text-align:left;} -* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {overflow-x:hidden;} -* html legend {margin:0px -8px 16px 0;padding:0;} -ol {margin-left:2em;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -html>body p code {*white-space:normal;} -hr {margin:-8px auto 11px;} -img {-ms-interpolation-mode:bicubic;} -.clearfix, .container {display:inline-block;} -* html .clearfix, * html .container {height:1%;} -fieldset {padding-top:0;} -input.text, input.title {background-color:#fff;border:1px solid #bbb;} -input.text:focus, input.title:focus {border-color:#666;} -input.text, input.title, textarea, select {margin:0.5em 0;} -input.checkbox, input.radio {position:relative;top:.25em;} -form.inline div, form.inline p {vertical-align:middle;} -form.inline label {position:relative;top:-0.25em;} -form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;} -button, input.button {position:relative;top:0.25em;} \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/css/blueprint/print.css --- a/media/css/blueprint/print.css Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;} -.container {background:none;} -hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} -hr.space {background:#fff;color:#fff;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} -img {float:left;margin:1.5em 1.5em 1.5em 0;} -a img {border:none;} -p img.top {margin-top:0;} -blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} -.small {font-size:.9em;} -.large {font-size:1.1em;} -.quiet {color:#999;} -.hide {display:none;} -a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;} \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/css/blueprint/screen.css --- a/media/css/blueprint/screen.css Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* reset.css */ -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} -body {line-height:1.5;} -table {border-collapse:separate;border-spacing:0;} -caption, th, td {text-align:left;font-weight:normal;} -table, td, th {vertical-align:middle;} -blockquote:before, blockquote:after, q:before, q:after {content:"";} -blockquote, q {quotes:"" "";} -a img {border:none;} - -/* typography.css */ -body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} -h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} -h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} -h2 {font-size:2em;margin-bottom:0.75em;} -h3 {font-size:1.5em;line-height:1;margin-bottom:1em;} -h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} -h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} -h6 {font-size:1em;font-weight:bold;} -h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} -p {margin:0 0 1.5em;} -p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;} -p img.right {float:right;margin:1.5em 0 1.5em 1.5em;} -a:focus, a:hover {color:#000;} -a {color:#009;text-decoration:underline;} -blockquote {margin:1.5em;color:#666;font-style:italic;} -strong {font-weight:bold;} -em, dfn {font-style:italic;} -dfn {font-weight:bold;} -sup, sub {line-height:0;} -abbr, acronym {border-bottom:1px dotted #666;} -address {margin:0 0 1.5em;font-style:italic;} -del {color:#666;} -pre {margin:1.5em 0;white-space:pre;} -pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} -li ul, li ol {margin:0 1.5em;} -ul, ol {margin:0 1.5em 1.5em 1.5em;} -ul {list-style-type:disc;} -ol {list-style-type:decimal;} -dl {margin:0 0 1.5em 0;} -dl dt {font-weight:bold;} -dd {margin-left:1.5em;} -table {margin-bottom:1.4em;width:100%;} -th {font-weight:bold;} -thead th {background:#c3d9ff;} -th, td, caption {padding:4px 10px 4px 5px;} -tr.even td {background:#e5ecf9;} -tfoot {font-style:italic;} -caption {background:#eee;} -.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} -.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} -.hide {display:none;} -.quiet {color:#666;} -.loud {color:#000;} -.highlight {background:#ff0;} -.added {background:#060;color:#fff;} -.removed {background:#900;color:#fff;} -.first {margin-left:0;padding-left:0;} -.last {margin-right:0;padding-right:0;} -.top {margin-top:0;padding-top:0;} -.bottom {margin-bottom:0;padding-bottom:0;} - -/* forms.css */ -label {font-weight:bold;} -fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} -legend {font-weight:bold;font-size:1.2em;} -input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;} -input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;} -input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} -input.text, input.title {width:300px;padding:5px;} -input.title {font-size:1.5em;} -textarea {width:390px;height:250px;padding:5px;} -input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;} -form.inline {line-height:3;} -form.inline p {margin-bottom:0;} -.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;} -.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} -.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} -.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} -.error a {color:#8a1f11;} -.notice a {color:#514721;} -.success a {color:#264409;} - -/* grid.css */ -.container {width:950px;margin:0 auto;} -.showgrid {background:url(src/grid.png);} -.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;} -.last, div.last {margin-right:0;} -.span-1 {width:30px;} -.span-2 {width:70px;} -.span-3 {width:110px;} -.span-4 {width:150px;} -.span-5 {width:190px;} -.span-6 {width:230px;} -.span-7 {width:270px;} -.span-8 {width:310px;} -.span-9 {width:350px;} -.span-10 {width:390px;} -.span-11 {width:430px;} -.span-12 {width:470px;} -.span-13 {width:510px;} -.span-14 {width:550px;} -.span-15 {width:590px;} -.span-16 {width:630px;} -.span-17 {width:670px;} -.span-18 {width:710px;} -.span-19 {width:750px;} -.span-20 {width:790px;} -.span-21 {width:830px;} -.span-22 {width:870px;} -.span-23 {width:910px;} -.span-24, div.span-24 {width:950px;margin:0;} -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;} -input.span-1, textarea.span-1 {width:18px!important;} -input.span-2, textarea.span-2 {width:58px!important;} -input.span-3, textarea.span-3 {width:98px!important;} -input.span-4, textarea.span-4 {width:138px!important;} -input.span-5, textarea.span-5 {width:178px!important;} -input.span-6, textarea.span-6 {width:218px!important;} -input.span-7, textarea.span-7 {width:258px!important;} -input.span-8, textarea.span-8 {width:298px!important;} -input.span-9, textarea.span-9 {width:338px!important;} -input.span-10, textarea.span-10 {width:378px!important;} -input.span-11, textarea.span-11 {width:418px!important;} -input.span-12, textarea.span-12 {width:458px!important;} -input.span-13, textarea.span-13 {width:498px!important;} -input.span-14, textarea.span-14 {width:538px!important;} -input.span-15, textarea.span-15 {width:578px!important;} -input.span-16, textarea.span-16 {width:618px!important;} -input.span-17, textarea.span-17 {width:658px!important;} -input.span-18, textarea.span-18 {width:698px!important;} -input.span-19, textarea.span-19 {width:738px!important;} -input.span-20, textarea.span-20 {width:778px!important;} -input.span-21, textarea.span-21 {width:818px!important;} -input.span-22, textarea.span-22 {width:858px!important;} -input.span-23, textarea.span-23 {width:898px!important;} -input.span-24, textarea.span-24 {width:938px!important;} -.append-1 {padding-right:40px;} -.append-2 {padding-right:80px;} -.append-3 {padding-right:120px;} -.append-4 {padding-right:160px;} -.append-5 {padding-right:200px;} -.append-6 {padding-right:240px;} -.append-7 {padding-right:280px;} -.append-8 {padding-right:320px;} -.append-9 {padding-right:360px;} -.append-10 {padding-right:400px;} -.append-11 {padding-right:440px;} -.append-12 {padding-right:480px;} -.append-13 {padding-right:520px;} -.append-14 {padding-right:560px;} -.append-15 {padding-right:600px;} -.append-16 {padding-right:640px;} -.append-17 {padding-right:680px;} -.append-18 {padding-right:720px;} -.append-19 {padding-right:760px;} -.append-20 {padding-right:800px;} -.append-21 {padding-right:840px;} -.append-22 {padding-right:880px;} -.append-23 {padding-right:920px;} -.prepend-1 {padding-left:40px;} -.prepend-2 {padding-left:80px;} -.prepend-3 {padding-left:120px;} -.prepend-4 {padding-left:160px;} -.prepend-5 {padding-left:200px;} -.prepend-6 {padding-left:240px;} -.prepend-7 {padding-left:280px;} -.prepend-8 {padding-left:320px;} -.prepend-9 {padding-left:360px;} -.prepend-10 {padding-left:400px;} -.prepend-11 {padding-left:440px;} -.prepend-12 {padding-left:480px;} -.prepend-13 {padding-left:520px;} -.prepend-14 {padding-left:560px;} -.prepend-15 {padding-left:600px;} -.prepend-16 {padding-left:640px;} -.prepend-17 {padding-left:680px;} -.prepend-18 {padding-left:720px;} -.prepend-19 {padding-left:760px;} -.prepend-20 {padding-left:800px;} -.prepend-21 {padding-left:840px;} -.prepend-22 {padding-left:880px;} -.prepend-23 {padding-left:920px;} -div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;} -div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;} -.pull-1 {margin-left:-40px;} -.pull-2 {margin-left:-80px;} -.pull-3 {margin-left:-120px;} -.pull-4 {margin-left:-160px;} -.pull-5 {margin-left:-200px;} -.pull-6 {margin-left:-240px;} -.pull-7 {margin-left:-280px;} -.pull-8 {margin-left:-320px;} -.pull-9 {margin-left:-360px;} -.pull-10 {margin-left:-400px;} -.pull-11 {margin-left:-440px;} -.pull-12 {margin-left:-480px;} -.pull-13 {margin-left:-520px;} -.pull-14 {margin-left:-560px;} -.pull-15 {margin-left:-600px;} -.pull-16 {margin-left:-640px;} -.pull-17 {margin-left:-680px;} -.pull-18 {margin-left:-720px;} -.pull-19 {margin-left:-760px;} -.pull-20 {margin-left:-800px;} -.pull-21 {margin-left:-840px;} -.pull-22 {margin-left:-880px;} -.pull-23 {margin-left:-920px;} -.pull-24 {margin-left:-960px;} -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;} -.push-1 {margin:0 -40px 1.5em 40px;} -.push-2 {margin:0 -80px 1.5em 80px;} -.push-3 {margin:0 -120px 1.5em 120px;} -.push-4 {margin:0 -160px 1.5em 160px;} -.push-5 {margin:0 -200px 1.5em 200px;} -.push-6 {margin:0 -240px 1.5em 240px;} -.push-7 {margin:0 -280px 1.5em 280px;} -.push-8 {margin:0 -320px 1.5em 320px;} -.push-9 {margin:0 -360px 1.5em 360px;} -.push-10 {margin:0 -400px 1.5em 400px;} -.push-11 {margin:0 -440px 1.5em 440px;} -.push-12 {margin:0 -480px 1.5em 480px;} -.push-13 {margin:0 -520px 1.5em 520px;} -.push-14 {margin:0 -560px 1.5em 560px;} -.push-15 {margin:0 -600px 1.5em 600px;} -.push-16 {margin:0 -640px 1.5em 640px;} -.push-17 {margin:0 -680px 1.5em 680px;} -.push-18 {margin:0 -720px 1.5em 720px;} -.push-19 {margin:0 -760px 1.5em 760px;} -.push-20 {margin:0 -800px 1.5em 800px;} -.push-21 {margin:0 -840px 1.5em 840px;} -.push-22 {margin:0 -880px 1.5em 880px;} -.push-23 {margin:0 -920px 1.5em 920px;} -.push-24 {margin:0 -960px 1.5em 960px;} -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;} -.prepend-top {margin-top:1.5em;} -.append-bottom {margin-bottom:1.5em;} -.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;} -hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;} -hr.space {background:#fff;color:#fff;} -.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} -.clearfix, .container {display:block;} -.clear {clear:both;} \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/css/theme.css --- a/media/css/theme.css Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,277 +0,0 @@ -body { - font-family: arial, helvetica, sans-serif; - color: #EF7D21; - background-color: #213442; - font-size: 1.0em; -} - -.centered { text-align: center; } - -a:link { - color: #6B969C; - text-decoration: none; -} - -a:visited { - color: #6B969C; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -h1, h3 { - color: #EF7D21; -} - -h1 { - font: italic 32px georgia, 'times new roman', sans-serif; - margin: 0px; - padding: 0 0 10px 0; -} - -.headline1 { - font: italic 32px georgia, 'times new roman', sans-serif; - margin: 0px; - padding: 0 0 10px 0; -} - -h2 { - font: italic 20px verdana, tahoma, arial, sans-serif; - padding-top: 5px; - color: #6B969C; - border-top: solid 1px #6B969C; -} - -div.madeira-photo-list { - margin: 2em; - text-align: center; -} - -div.madeira-photo-list img { - border: thin dotted #6B969C; - padding: 2px; - margin: 5px; -} - -a.img-link:link { text-decoration: none; background-color: transparent; } -a.img-link:visited { text-decoration: none; background-color: transparent; } -a.img-link:hover { text-decoration: none; background-color: transparent; } - -.header { - margin-top: 10px; - margin-left: 5px; -} - -.photobkgnd { - margin: 3em; - z-index: 3; - background-color: #888888; - padding: 5px; -} - -.newsflash { - margin: 20px 1em; - border: 3px solid #6B969C; - padding: 5px; - background-color: #2e414f; - color: #EF7D21; -} - -/* -** f'in IE doesn't seem to honor my padding and the float doesn't work. -** solution: make an invisible border...lame. -** It's fine in Firefox. -*/ -.floatLeftBox { - /* padding: 0 1em 1em 0; I wish I could just use this */ - float: left; - border-right: 0.5em solid #213442; - border-bottom: 0.5em solid #213442; -} - -.clearMe { - clear: left; -} - -.cdCoverFloatList { - margin-left: 260px; - text-align: left; -} - -/* For internal links (within the same page) */ -.intLink { - margin-top: 2em; - font-size: small; -} - -label.normal { - width: 9em; - float: left; - text-align: right; - margin: 0 1em 10px 0; - clear: both; - font-weight: bold; -} - -.form-box { - color: black; - background: #ccc; - border-top: black solid 2px; - border-left: black solid 2px; - border-bottom: #eee solid 2px; - border-right: #eee solid 2px; - margin-bottom: 5px; -} - -.form-radio { - margin-left: 10em; -} - -.form-comment { - font-style: italic; - font-size: x-small; - margin-left: 10em; - margin-bottom: 10px; -} - -.submit-button { - color: black; - background: #6B969C; - border: 2px outset; - padding: 3px; -} - -table.input-form th { - vertical-align: top; -} - -ul.errorlist { - margin: 0 0 0 1em; - padding: 2px; -} -.errorlist li { - color: red; -} - -fieldset { - border: 1px solid teal; - margin-top: 2em; -} - -legend { - background: #6B969C; - color: black; - border: 1px solid black; - padding: 2px 12px 2px 12px; -} - -#footer { - clear: both; - list-style-type: none; - margin-top: 30px; - padding-top: 1em; - border-top: solid 1px #6B969C; - font-size: small; - font-style: italic; - text-align: right; -} - -#navleft ul { - margin: 0 0 0 0; - padding: 0 0 0 0; - font: 12px verdana, tahoma, arial, sans-serif; - font: bold 15px georgia, 'times new roman', sans-serif; - list-style-type: none; - display: inline; -} - -#navleft li { - margin: 0px 0 0; - display: inline; -} - -#navleft a { - display: block; - padding: 2px 2px 2px 10px; - border: 1px solid #000000; - background: #6B969C; - color: #EF7D21; - text-decoration: none; -} - -#navleft a:link, #navleft a:active, #navleft a:visited { - color: #213442; -} - -#navleft a:hover { - border: 1px solid #000000; - background: #213442 url(../images/brick.gif); - color: #213442; -} - -div.article-source { - font-style: italic; - padding-bottom: 2px; - margin-bottom: 5px; -} - -div.center-block { - margin: 10px 30px 10px 30px; - border: 1px solid #6B969C; - padding: 3px; -} - -div.center-block h2 { - font: italic 20px verdana, tahoma, arial, sans-serif; - padding-top: 1px; - margin-top: 1px; - color: #6B969C; - border-top: none; - text-align: center; -} - -div.thumb-box { - margin: 20px 1em; - border: 3px solid #6B969C; - padding: 5px; - background-color: #2e414f; - color: #EF7D21; -} - -div.thumb-box img { - border: thin dotted #6B969C; - padding: 2px; - margin: 5px; -} - -div.thumb-box h2 { - font: italic 20px verdana, tahoma, arial, sans-serif; - padding-top: 1px; - margin-top: 1px; - color: #6B969C; - border-top: none; - text-align: center; -} - -table {width:auto;} - -table.flyers { width: 100% } - -table.image-table { - display: inline; - margin: 0 5px 20px 0; -} - -table.image-table caption { - font-size: x-small; - caption-side: top; - text-align: center; - background-color: #213442; -} - -#slideshow { - width: 600px; - height: 200px; -} diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/blank.gif Binary file media/js/fancybox/blank.gif has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_close.png Binary file media/js/fancybox/fancy_close.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_loading.png Binary file media/js/fancybox/fancy_loading.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_nav_left.png Binary file media/js/fancybox/fancy_nav_left.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_nav_right.png Binary file media/js/fancybox/fancy_nav_right.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_e.png Binary file media/js/fancybox/fancy_shadow_e.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_n.png Binary file media/js/fancybox/fancy_shadow_n.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_ne.png Binary file media/js/fancybox/fancy_shadow_ne.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_nw.png Binary file media/js/fancybox/fancy_shadow_nw.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_s.png Binary file media/js/fancybox/fancy_shadow_s.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_se.png Binary file media/js/fancybox/fancy_shadow_se.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_sw.png Binary file media/js/fancybox/fancy_shadow_sw.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_shadow_w.png Binary file media/js/fancybox/fancy_shadow_w.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_title_left.png Binary file media/js/fancybox/fancy_title_left.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_title_main.png Binary file media/js/fancybox/fancy_title_main.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_title_over.png Binary file media/js/fancybox/fancy_title_over.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancy_title_right.png Binary file media/js/fancybox/fancy_title_right.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancybox-x.png Binary file media/js/fancybox/fancybox-x.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancybox-y.png Binary file media/js/fancybox/fancybox-y.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/fancybox.png Binary file media/js/fancybox/fancybox.png has changed diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/jquery.easing-1.3.pack.js --- a/media/js/fancybox/jquery.easing-1.3.pack.js Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/* - * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ - * - * Uses the built in easing capabilities added In jQuery 1.1 - * to offer multiple easing options - * - * TERMS OF USE - jQuery Easing - * - * Open source under the BSD License. - * - * Copyright © 2008 George McGinley Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * -*/ - -// t: current time, b: begInnIng value, c: change In value, d: duration -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t')[0], { prop: 0 }), titleh = 0, - - isIE6 = !$.support.opacity && !window.XMLHttpRequest, - - /* - * Private methods - */ - - fancybox_abort = function() { - loading.hide(); - - imgPreloader.onerror = imgPreloader.onload = null; - - if (ajaxLoader) { - ajaxLoader.abort(); - } - - tmp.empty(); - }, - - fancybox_error = function() { - $.fancybox('

The requested content cannot be loaded.
Please try again later.

', { - 'scrolling' : 'no', - 'padding' : 20, - 'transitionIn' : 'none', - 'transitionOut' : 'none' - }); - }, - - fancybox_get_viewport = function() { - return [ $(window).width(), $(window).height(), $(document).scrollLeft(), $(document).scrollTop() ]; - }, - - fancybox_get_zoom_to = function () { - var view = fancybox_get_viewport(), - to = {}, - - margin = currentOpts.margin, - resize = currentOpts.autoScale, - - horizontal_space = (shadow + margin) * 2, - vertical_space = (shadow + margin) * 2, - double_padding = (currentOpts.padding * 2), - - ratio; - - if (currentOpts.width.toString().indexOf('%') > -1) { - to.width = ((view[0] * parseFloat(currentOpts.width)) / 100) - (shadow * 2) ; - resize = false; - - } else { - to.width = currentOpts.width + double_padding; - } - - if (currentOpts.height.toString().indexOf('%') > -1) { - to.height = ((view[1] * parseFloat(currentOpts.height)) / 100) - (shadow * 2); - resize = false; - - } else { - to.height = currentOpts.height + double_padding; - } - - if (resize && (to.width > (view[0] - horizontal_space) || to.height > (view[1] - vertical_space))) { - if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') { - horizontal_space += double_padding; - vertical_space += double_padding; - - ratio = Math.min(Math.min( view[0] - horizontal_space, currentOpts.width) / currentOpts.width, Math.min( view[1] - vertical_space, currentOpts.height) / currentOpts.height); - - to.width = Math.round(ratio * (to.width - double_padding)) + double_padding; - to.height = Math.round(ratio * (to.height - double_padding)) + double_padding; - - } else { - to.width = Math.min(to.width, (view[0] - horizontal_space)); - to.height = Math.min(to.height, (view[1] - vertical_space)); - } - } - - to.top = view[3] + ((view[1] - (to.height + (shadow * 2 ))) * 0.5); - to.left = view[2] + ((view[0] - (to.width + (shadow * 2 ))) * 0.5); - - if (currentOpts.autoScale === false) { - to.top = Math.max(view[3] + margin, to.top); - to.left = Math.max(view[2] + margin, to.left); - } - - return to; - }, - - fancybox_format_title = function(title) { - if (title && title.length) { - switch (currentOpts.titlePosition) { - case 'inside': - return title; - case 'over': - return '' + title + ''; - default: - return '' + title + ''; - } - } - - return false; - }, - - fancybox_process_title = function() { - var title = currentOpts.title, - width = final_pos.width - (currentOpts.padding * 2), - titlec = 'fancybox-title-' + currentOpts.titlePosition; - - $('#fancybox-title').remove(); - - titleh = 0; - - if (currentOpts.titleShow === false) { - return; - } - - title = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(title, currentArray, currentIndex, currentOpts) : fancybox_format_title(title); - - if (!title || title === '') { - return; - } - - $('
').css({ - 'width' : width, - 'paddingLeft' : currentOpts.padding, - 'paddingRight' : currentOpts.padding - }).html(title).appendTo('body'); - - switch (currentOpts.titlePosition) { - case 'inside': - titleh = $("#fancybox-title").outerHeight(true) - currentOpts.padding; - final_pos.height += titleh; - break; - - case 'over': - $('#fancybox-title').css('bottom', currentOpts.padding); - break; - - default: - $('#fancybox-title').css('bottom', $("#fancybox-title").outerHeight(true) * -1); - break; - } - - $('#fancybox-title').appendTo( outer ).hide(); - }, - - fancybox_set_navigation = function() { - $(document).unbind('keydown.fb').bind('keydown.fb', function(e) { - if (e.keyCode == 27 && currentOpts.enableEscapeButton) { - e.preventDefault(); - $.fancybox.close(); - - } else if (e.keyCode == 37) { - e.preventDefault(); - $.fancybox.prev(); - - } else if (e.keyCode == 39) { - e.preventDefault(); - $.fancybox.next(); - } - }); - - if ($.fn.mousewheel) { - wrap.unbind('mousewheel.fb'); - - if (currentArray.length > 1) { - wrap.bind('mousewheel.fb', function(e, delta) { - e.preventDefault(); - - if (busy || delta === 0) { - return; - } - - if (delta > 0) { - $.fancybox.prev(); - } else { - $.fancybox.next(); - } - }); - } - } - - if (!currentOpts.showNavArrows) { return; } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) { - nav_left.show(); - } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) { - nav_right.show(); - } - }, - - fancybox_preload_images = function() { - var href, - objNext; - - if ((currentArray.length -1) > currentIndex) { - href = currentArray[ currentIndex + 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - - if (currentIndex > 0) { - href = currentArray[ currentIndex - 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - }, - - _finish = function () { - inner.css('overflow', (currentOpts.scrolling == 'auto' ? (currentOpts.type == 'image' || currentOpts.type == 'iframe' || currentOpts.type == 'swf' ? 'hidden' : 'auto') : (currentOpts.scrolling == 'yes' ? 'auto' : 'visible'))); - - if (!$.support.opacity) { - inner.get(0).style.removeAttribute('filter'); - wrap.get(0).style.removeAttribute('filter'); - } - - $('#fancybox-title').show(); - - if (currentOpts.hideOnContentClick) { - inner.one('click', $.fancybox.close); - } - if (currentOpts.hideOnOverlayClick) { - overlay.one('click', $.fancybox.close); - } - - if (currentOpts.showCloseButton) { - close.show(); - } - - fancybox_set_navigation(); - - $(window).bind("resize.fb", $.fancybox.center); - - if (currentOpts.centerOnScroll) { - $(window).bind("scroll.fb", $.fancybox.center); - } else { - $(window).unbind("scroll.fb"); - } - - if ($.isFunction(currentOpts.onComplete)) { - currentOpts.onComplete(currentArray, currentIndex, currentOpts); - } - - busy = false; - - fancybox_preload_images(); - }, - - fancybox_draw = function(pos) { - var width = Math.round(start_pos.width + (final_pos.width - start_pos.width) * pos), - height = Math.round(start_pos.height + (final_pos.height - start_pos.height) * pos), - - top = Math.round(start_pos.top + (final_pos.top - start_pos.top) * pos), - left = Math.round(start_pos.left + (final_pos.left - start_pos.left) * pos); - - wrap.css({ - 'width' : width + 'px', - 'height' : height + 'px', - 'top' : top + 'px', - 'left' : left + 'px' - }); - - width = Math.max(width - currentOpts.padding * 2, 0); - height = Math.max(height - (currentOpts.padding * 2 + (titleh * pos)), 0); - - inner.css({ - 'width' : width + 'px', - 'height' : height + 'px' - }); - - if (typeof final_pos.opacity !== 'undefined') { - wrap.css('opacity', (pos < 0.5 ? 0.5 : pos)); - } - }, - - fancybox_get_obj_pos = function(obj) { - var pos = obj.offset(); - - pos.top += parseFloat( obj.css('paddingTop') ) || 0; - pos.left += parseFloat( obj.css('paddingLeft') ) || 0; - - pos.top += parseFloat( obj.css('border-top-width') ) || 0; - pos.left += parseFloat( obj.css('border-left-width') ) || 0; - - pos.width = obj.width(); - pos.height = obj.height(); - - return pos; - }, - - fancybox_get_zoom_from = function() { - var orig = selectedOpts.orig ? $(selectedOpts.orig) : false, - from = {}, - pos, - view; - - if (orig && orig.length) { - pos = fancybox_get_obj_pos(orig); - - from = { - width : (pos.width + (currentOpts.padding * 2)), - height : (pos.height + (currentOpts.padding * 2)), - top : (pos.top - currentOpts.padding - shadow), - left : (pos.left - currentOpts.padding - shadow) - }; - - } else { - view = fancybox_get_viewport(); - - from = { - width : 1, - height : 1, - top : view[3] + view[1] * 0.5, - left : view[2] + view[0] * 0.5 - }; - } - - return from; - }, - - fancybox_show = function() { - loading.hide(); - - if (wrap.is(":visible") && $.isFunction(currentOpts.onCleanup)) { - if (currentOpts.onCleanup(currentArray, currentIndex, currentOpts) === false) { - $.event.trigger('fancybox-cancel'); - - busy = false; - return; - } - } - - currentArray = selectedArray; - currentIndex = selectedIndex; - currentOpts = selectedOpts; - - inner.get(0).scrollTop = 0; - inner.get(0).scrollLeft = 0; - - if (currentOpts.overlayShow) { - if (isIE6) { - $('select:not(#fancybox-tmp select)').filter(function() { - return this.style.visibility !== 'hidden'; - }).css({'visibility':'hidden'}).one('fancybox-cleanup', function() { - this.style.visibility = 'inherit'; - }); - } - - overlay.css({ - 'background-color' : currentOpts.overlayColor, - 'opacity' : currentOpts.overlayOpacity - }).unbind().show(); - } - - final_pos = fancybox_get_zoom_to(); - - fancybox_process_title(); - - if (wrap.is(":visible")) { - $( close.add( nav_left ).add( nav_right ) ).hide(); - - var pos = wrap.position(), - equal; - - start_pos = { - top : pos.top , - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height); - - inner.fadeOut(currentOpts.changeFade, function() { - var finish_resizing = function() { - inner.html( tmp.contents() ).fadeIn(currentOpts.changeFade, _finish); - }; - - $.event.trigger('fancybox-change'); - - inner.empty().css('overflow', 'hidden'); - - if (equal) { - inner.css({ - top : currentOpts.padding, - left : currentOpts.padding, - width : Math.max(final_pos.width - (currentOpts.padding * 2), 1), - height : Math.max(final_pos.height - (currentOpts.padding * 2) - titleh, 1) - }); - - finish_resizing(); - - } else { - inner.css({ - top : currentOpts.padding, - left : currentOpts.padding, - width : Math.max(start_pos.width - (currentOpts.padding * 2), 1), - height : Math.max(start_pos.height - (currentOpts.padding * 2), 1) - }); - - fx.prop = 0; - - $(fx).animate({ prop: 1 }, { - duration : currentOpts.changeSpeed, - easing : currentOpts.easingChange, - step : fancybox_draw, - complete : finish_resizing - }); - } - }); - - return; - } - - wrap.css('opacity', 1); - - if (currentOpts.transitionIn == 'elastic') { - start_pos = fancybox_get_zoom_from(); - - inner.css({ - top : currentOpts.padding, - left : currentOpts.padding, - width : Math.max(start_pos.width - (currentOpts.padding * 2), 1), - height : Math.max(start_pos.height - (currentOpts.padding * 2), 1) - }) - .html( tmp.contents() ); - - wrap.css(start_pos).show(); - - if (currentOpts.opacity) { - final_pos.opacity = 0; - } - - fx.prop = 0; - - $(fx).animate({ prop: 1 }, { - duration : currentOpts.speedIn, - easing : currentOpts.easingIn, - step : fancybox_draw, - complete : _finish - }); - - } else { - inner.css({ - top : currentOpts.padding, - left : currentOpts.padding, - width : Math.max(final_pos.width - (currentOpts.padding * 2), 1), - height : Math.max(final_pos.height - (currentOpts.padding * 2) - titleh, 1) - }) - .html( tmp.contents() ); - - wrap.css( final_pos ).fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish ); - } - }, - - fancybox_process_inline = function() { - tmp.width( selectedOpts.width ); - tmp.height( selectedOpts.height ); - - if (selectedOpts.width == 'auto') { - selectedOpts.width = tmp.width(); - } - if (selectedOpts.height == 'auto') { - selectedOpts.height = tmp.height(); - } - - fancybox_show(); - }, - - fancybox_process_image = function() { - busy = true; - - selectedOpts.width = imgPreloader.width; - selectedOpts.height = imgPreloader.height; - - $("").attr({ - 'id' : 'fancybox-img', - 'src' : imgPreloader.src, - 'alt' : selectedOpts.title - }).appendTo( tmp ); - - fancybox_show(); - }, - - fancybox_start = function() { - fancybox_abort(); - - var obj = selectedArray[ selectedIndex ], - href, - type, - title, - str, - emb, - selector, - data; - - selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox'))); - title = obj.title || $(obj).title || selectedOpts.title || ''; - - if (obj.nodeName && !selectedOpts.orig) { - selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj); - } - - if (title === '' && selectedOpts.orig) { - title = selectedOpts.orig.attr('alt'); - } - - if (obj.nodeName && (/^(?:javascript|#)/i).test(obj.href)) { - href = selectedOpts.href || null; - } else { - href = selectedOpts.href || obj.href || null; - } - - if (selectedOpts.type) { - type = selectedOpts.type; - - if (!href) { - href = selectedOpts.content; - } - - } else if (selectedOpts.content) { - type = 'html'; - - } else if (href) { - if (href.match(imgRegExp)) { - type = 'image'; - - } else if (href.match(swfRegExp)) { - type = 'swf'; - - } else if ($(obj).hasClass("iframe")) { - type = 'iframe'; - - } else if (href.match(/#/)) { - obj = href.substr(href.indexOf("#")); - - type = $(obj).length > 0 ? 'inline' : 'ajax'; - } else { - type = 'ajax'; - } - } else { - type = 'inline'; - } - - selectedOpts.type = type; - selectedOpts.href = href; - selectedOpts.title = title; - - if (selectedOpts.autoDimensions && selectedOpts.type !== 'iframe' && selectedOpts.type !== 'swf') { - selectedOpts.width = 'auto'; - selectedOpts.height = 'auto'; - } - - if (selectedOpts.modal) { - selectedOpts.overlayShow = true; - selectedOpts.hideOnOverlayClick = false; - selectedOpts.hideOnContentClick = false; - selectedOpts.enableEscapeButton = false; - selectedOpts.showCloseButton = false; - } - - if ($.isFunction(selectedOpts.onStart)) { - if (selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts) === false) { - busy = false; - return; - } - } - - tmp.css('padding', (shadow + selectedOpts.padding + selectedOpts.margin)); - - $('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() { - $(this).replaceWith(inner.children()); - }); - - switch (type) { - case 'html' : - tmp.html( selectedOpts.content ); - fancybox_process_inline(); - break; - - case 'inline' : - $('
').hide().insertBefore( $(obj) ).bind('fancybox-cleanup', function() { - $(this).replaceWith(inner.children()); - }).bind('fancybox-cancel', function() { - $(this).replaceWith(tmp.children()); - }); - - $(obj).appendTo(tmp); - - fancybox_process_inline(); - break; - - case 'image': - busy = false; - - $.fancybox.showActivity(); - - imgPreloader = new Image(); - - imgPreloader.onerror = function() { - fancybox_error(); - }; - - imgPreloader.onload = function() { - imgPreloader.onerror = null; - imgPreloader.onload = null; - fancybox_process_image(); - }; - - imgPreloader.src = href; - - break; - - case 'swf': - str = ''; - emb = ''; - - $.each(selectedOpts.swf, function(name, val) { - str += ''; - emb += ' ' + name + '="' + val + '"'; - }); - - str += ''; - - tmp.html(str); - - fancybox_process_inline(); - break; - - case 'ajax': - selector = href.split('#', 2); - data = selectedOpts.ajax.data || {}; - - if (selector.length > 1) { - href = selector[0]; - - if (typeof data == "string") { - data += '&selector=' + selector[1]; - } else { - data.selector = selector[1]; - } - } - - busy = false; - $.fancybox.showActivity(); - - ajaxLoader = $.ajax($.extend(selectedOpts.ajax, { - url : href, - data : data, - error : fancybox_error, - success : function(data, textStatus, XMLHttpRequest) { - if (ajaxLoader.status == 200) { - tmp.html( data ); - fancybox_process_inline(); - } - } - })); - - break; - - case 'iframe' : - $('').appendTo(tmp); - fancybox_show(); - break; - } - }, - - fancybox_animate_loading = function() { - if (!loading.is(':visible')){ - clearInterval(loadingTimer); - return; - } - - $('div', loading).css('top', (loadingFrame * -40) + 'px'); - - loadingFrame = (loadingFrame + 1) % 12; - }, - - fancybox_init = function() { - if ($("#fancybox-wrap").length) { - return; - } - - $('body').append( - tmp = $('
'), - loading = $('
'), - overlay = $('
'), - wrap = $('
') - ); - - if (!$.support.opacity) { - wrap.addClass('fancybox-ie'); - loading.addClass('fancybox-ie'); - } - - outer = $('
') - .append('
') - .appendTo( wrap ); - - outer.append( - inner = $('
'), - close = $(''), - - nav_left = $(''), - nav_right = $('') - ); - - close.click($.fancybox.close); - loading.click($.fancybox.cancel); - - nav_left.click(function(e) { - e.preventDefault(); - $.fancybox.prev(); - }); - - nav_right.click(function(e) { - e.preventDefault(); - $.fancybox.next(); - }); - - if (isIE6) { - overlay.get(0).style.setExpression('height', "document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'"); - loading.get(0).style.setExpression('top', "(-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'"); - - outer.prepend(''); - } - }; - - /* - * Public methods - */ - - $.fn.fancybox = function(options) { - $(this) - .data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {}))) - .unbind('click.fb').bind('click.fb', function(e) { - e.preventDefault(); - - if (busy) { - return; - } - - busy = true; - - $(this).blur(); - - selectedArray = []; - selectedIndex = 0; - - var rel = $(this).attr('rel') || ''; - - if (!rel || rel == '' || rel === 'nofollow') { - selectedArray.push(this); - - } else { - selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]"); - selectedIndex = selectedArray.index( this ); - } - - fancybox_start(); - - return false; - }); - - return this; - }; - - $.fancybox = function(obj) { - if (busy) { - return; - } - - busy = true; - - var opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {}; - - selectedArray = []; - selectedIndex = opts.index || 0; - - if ($.isArray(obj)) { - for (var i = 0, j = obj.length; i < j; i++) { - if (typeof obj[i] == 'object') { - $(obj[i]).data('fancybox', $.extend({}, opts, obj[i])); - } else { - obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts)); - } - } - - selectedArray = jQuery.merge(selectedArray, obj); - - } else { - if (typeof obj == 'object') { - $(obj).data('fancybox', $.extend({}, opts, obj)); - } else { - obj = $({}).data('fancybox', $.extend({content : obj}, opts)); - } - - selectedArray.push(obj); - } - - if (selectedIndex > selectedArray.length || selectedIndex < 0) { - selectedIndex = 0; - } - - fancybox_start(); - }; - - $.fancybox.showActivity = function() { - clearInterval(loadingTimer); - - loading.show(); - loadingTimer = setInterval(fancybox_animate_loading, 66); - }; - - $.fancybox.hideActivity = function() { - loading.hide(); - }; - - $.fancybox.next = function() { - return $.fancybox.pos( currentIndex + 1); - }; - - $.fancybox.prev = function() { - return $.fancybox.pos( currentIndex - 1); - }; - - $.fancybox.pos = function(pos) { - if (busy) { - return; - } - - pos = parseInt(pos, 10); - - if (pos > -1 && currentArray.length > pos) { - selectedIndex = pos; - fancybox_start(); - } - - if (currentOpts.cyclic && currentArray.length > 1 && pos < 0) { - selectedIndex = currentArray.length - 1; - fancybox_start(); - } - - if (currentOpts.cyclic && currentArray.length > 1 && pos >= currentArray.length) { - selectedIndex = 0; - fancybox_start(); - } - - return; - }; - - $.fancybox.cancel = function() { - if (busy) { - return; - } - - busy = true; - - $.event.trigger('fancybox-cancel'); - - fancybox_abort(); - - if (selectedOpts && $.isFunction(selectedOpts.onCancel)) { - selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts); - } - - busy = false; - }; - - // Note: within an iframe use - parent.$.fancybox.close(); - $.fancybox.close = function() { - if (busy || wrap.is(':hidden')) { - return; - } - - busy = true; - - if (currentOpts && $.isFunction(currentOpts.onCleanup)) { - if (currentOpts.onCleanup(currentArray, currentIndex, currentOpts) === false) { - busy = false; - return; - } - } - - fancybox_abort(); - - $(close.add( nav_left ).add( nav_right )).hide(); - - $('#fancybox-title').remove(); - - wrap.add(inner).add(overlay).unbind(); - - $(window).unbind("resize.fb scroll.fb"); - $(document).unbind('keydown.fb'); - - function _cleanup() { - overlay.fadeOut('fast'); - - wrap.hide(); - - $.event.trigger('fancybox-cleanup'); - - inner.empty(); - - if ($.isFunction(currentOpts.onClosed)) { - currentOpts.onClosed(currentArray, currentIndex, currentOpts); - } - - currentArray = selectedOpts = []; - currentIndex = selectedIndex = 0; - currentOpts = selectedOpts = {}; - - busy = false; - } - - inner.css('overflow', 'hidden'); - - if (currentOpts.transitionOut == 'elastic') { - start_pos = fancybox_get_zoom_from(); - - var pos = wrap.position(); - - final_pos = { - top : pos.top , - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - if (currentOpts.opacity) { - final_pos.opacity = 1; - } - - fx.prop = 1; - - $(fx).animate({ prop: 0 }, { - duration : currentOpts.speedOut, - easing : currentOpts.easingOut, - step : fancybox_draw, - complete : _cleanup - }); - - } else { - wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup); - } - }; - - $.fancybox.resize = function() { - var c, h; - - if (busy || wrap.is(':hidden')) { - return; - } - - busy = true; - - c = inner.wrapInner("
").children(); - h = c.height(); - - wrap.css({height: h + (currentOpts.padding * 2) + titleh}); - inner.css({height: h}); - - c.replaceWith(c.children()); - - $.fancybox.center(); - }; - - $.fancybox.center = function() { - busy = true; - - var view = fancybox_get_viewport(), - margin = currentOpts.margin, - to = {}; - - to.top = view[3] + ((view[1] - ((wrap.height() - titleh) + (shadow * 2 ))) * 0.5); - to.left = view[2] + ((view[0] - (wrap.width() + (shadow * 2 ))) * 0.5); - - to.top = Math.max(view[3] + margin, to.top); - to.left = Math.max(view[2] + margin, to.left); - - wrap.css(to); - - busy = false; - }; - - $.fn.fancybox.defaults = { - padding : 10, - margin : 20, - opacity : false, - modal : false, - cyclic : false, - scrolling : 'auto', // 'auto', 'yes' or 'no' - - width : 560, - height : 340, - - autoScale : true, - autoDimensions : true, - centerOnScroll : false, - - ajax : {}, - swf : { wmode: 'transparent' }, - - hideOnOverlayClick : true, - hideOnContentClick : false, - - overlayShow : true, - overlayOpacity : 0.3, - overlayColor : '#666', - - titleShow : true, - titlePosition : 'outside', // 'outside', 'inside' or 'over' - titleFormat : null, - - transitionIn : 'fade', // 'elastic', 'fade' or 'none' - transitionOut : 'fade', // 'elastic', 'fade' or 'none' - - speedIn : 300, - speedOut : 300, - - changeSpeed : 300, - changeFade : 'fast', - - easingIn : 'swing', - easingOut : 'swing', - - showCloseButton : true, - showNavArrows : true, - enableEscapeButton : true, - - onStart : null, - onCancel : null, - onComplete : null, - onCleanup : null, - onClosed : null - }; - - $(document).ready(function() { - fancybox_init(); - }); - -})(jQuery); \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/jquery.fancybox-1.3.1.pack.js --- a/media/js/fancybox/jquery.fancybox-1.3.1.pack.js Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * - * Version: 1.3.1 (05/03/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -(function(b){var m,u,x,g,D,i,z,A,B,p=0,e={},q=[],n=0,c={},j=[],E=null,s=new Image,G=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,S=/[^\.]\.(swf)\s*$/i,H,I=1,k,l,h=false,y=b.extend(b("
")[0],{prop:0}),v=0,O=!b.support.opacity&&!window.XMLHttpRequest,J=function(){u.hide();s.onerror=s.onload=null;E&&E.abort();m.empty()},P=function(){b.fancybox('

The requested content cannot be loaded.
Please try again later.

',{scrolling:"no",padding:20,transitionIn:"none",transitionOut:"none"})}, -K=function(){return[b(window).width(),b(window).height(),b(document).scrollLeft(),b(document).scrollTop()]},T=function(){var a=K(),d={},f=c.margin,o=c.autoScale,t=(20+f)*2,w=(20+f)*2,r=c.padding*2;if(c.width.toString().indexOf("%")>-1){d.width=a[0]*parseFloat(c.width)/100-40;o=false}else d.width=c.width+r;if(c.height.toString().indexOf("%")>-1){d.height=a[1]*parseFloat(c.height)/100-40;o=false}else d.height=c.height+r;if(o&&(d.width>a[0]-t||d.height>a[1]-w))if(e.type=="image"||e.type=="swf"){t+=r; -w+=r;o=Math.min(Math.min(a[0]-t,c.width)/c.width,Math.min(a[1]-w,c.height)/c.height);d.width=Math.round(o*(d.width-r))+r;d.height=Math.round(o*(d.height-r))+r}else{d.width=Math.min(d.width,a[0]-t);d.height=Math.min(d.height,a[1]-w)}d.top=a[3]+(a[1]-(d.height+40))*0.5;d.left=a[2]+(a[0]-(d.width+40))*0.5;if(c.autoScale===false){d.top=Math.max(a[3]+f,d.top);d.left=Math.max(a[2]+f,d.left)}return d},U=function(a){if(a&&a.length)switch(c.titlePosition){case "inside":return a;case "over":return''+ -a+"";default:return''+a+''}return false},V=function(){var a=c.title,d=l.width-c.padding*2,f="fancybox-title-"+c.titlePosition;b("#fancybox-title").remove();v=0;if(c.titleShow!==false){a=b.isFunction(c.titleFormat)?c.titleFormat(a,j,n,c):U(a);if(!(!a||a==="")){b('
').css({width:d,paddingLeft:c.padding, -paddingRight:c.padding}).html(a).appendTo("body");switch(c.titlePosition){case "inside":v=b("#fancybox-title").outerHeight(true)-c.padding;l.height+=v;break;case "over":b("#fancybox-title").css("bottom",c.padding);break;default:b("#fancybox-title").css("bottom",b("#fancybox-title").outerHeight(true)*-1);break}b("#fancybox-title").appendTo(D).hide()}}},W=function(){b(document).unbind("keydown.fb").bind("keydown.fb",function(a){if(a.keyCode==27&&c.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if(a.keyCode== -37){a.preventDefault();b.fancybox.prev()}else if(a.keyCode==39){a.preventDefault();b.fancybox.next()}});if(b.fn.mousewheel){g.unbind("mousewheel.fb");j.length>1&&g.bind("mousewheel.fb",function(a,d){a.preventDefault();h||d===0||(d>0?b.fancybox.prev():b.fancybox.next())})}if(c.showNavArrows){if(c.cyclic&&j.length>1||n!==0)A.show();if(c.cyclic&&j.length>1||n!=j.length-1)B.show()}},X=function(){var a,d;if(j.length-1>n){a=j[n+1].href;if(typeof a!=="undefined"&&a.match(G)){d=new Image;d.src=a}}if(n>0){a= -j[n-1].href;if(typeof a!=="undefined"&&a.match(G)){d=new Image;d.src=a}}},L=function(){i.css("overflow",c.scrolling=="auto"?c.type=="image"||c.type=="iframe"||c.type=="swf"?"hidden":"auto":c.scrolling=="yes"?"auto":"visible");if(!b.support.opacity){i.get(0).style.removeAttribute("filter");g.get(0).style.removeAttribute("filter")}b("#fancybox-title").show();c.hideOnContentClick&&i.one("click",b.fancybox.close);c.hideOnOverlayClick&&x.one("click",b.fancybox.close);c.showCloseButton&&z.show();W();b(window).bind("resize.fb", -b.fancybox.center);c.centerOnScroll?b(window).bind("scroll.fb",b.fancybox.center):b(window).unbind("scroll.fb");b.isFunction(c.onComplete)&&c.onComplete(j,n,c);h=false;X()},M=function(a){var d=Math.round(k.width+(l.width-k.width)*a),f=Math.round(k.height+(l.height-k.height)*a),o=Math.round(k.top+(l.top-k.top)*a),t=Math.round(k.left+(l.left-k.left)*a);g.css({width:d+"px",height:f+"px",top:o+"px",left:t+"px"});d=Math.max(d-c.padding*2,0);f=Math.max(f-(c.padding*2+v*a),0);i.css({width:d+"px",height:f+ -"px"});if(typeof l.opacity!=="undefined")g.css("opacity",a<0.5?0.5:a)},Y=function(a){var d=a.offset();d.top+=parseFloat(a.css("paddingTop"))||0;d.left+=parseFloat(a.css("paddingLeft"))||0;d.top+=parseFloat(a.css("border-top-width"))||0;d.left+=parseFloat(a.css("border-left-width"))||0;d.width=a.width();d.height=a.height();return d},Q=function(){var a=e.orig?b(e.orig):false,d={};if(a&&a.length){a=Y(a);d={width:a.width+c.padding*2,height:a.height+c.padding*2,top:a.top-c.padding-20,left:a.left-c.padding- -20}}else{a=K();d={width:1,height:1,top:a[3]+a[1]*0.5,left:a[2]+a[0]*0.5}}return d},N=function(){u.hide();if(g.is(":visible")&&b.isFunction(c.onCleanup))if(c.onCleanup(j,n,c)===false){b.event.trigger("fancybox-cancel");h=false;return}j=q;n=p;c=e;i.get(0).scrollTop=0;i.get(0).scrollLeft=0;if(c.overlayShow){O&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"}); -x.css({"background-color":c.overlayColor,opacity:c.overlayOpacity}).unbind().show()}l=T();V();if(g.is(":visible")){b(z.add(A).add(B)).hide();var a=g.position(),d;k={top:a.top,left:a.left,width:g.width(),height:g.height()};d=k.width==l.width&&k.height==l.height;i.fadeOut(c.changeFade,function(){var f=function(){i.html(m.contents()).fadeIn(c.changeFade,L)};b.event.trigger("fancybox-change");i.empty().css("overflow","hidden");if(d){i.css({top:c.padding,left:c.padding,width:Math.max(l.width-c.padding* -2,1),height:Math.max(l.height-c.padding*2-v,1)});f()}else{i.css({top:c.padding,left:c.padding,width:Math.max(k.width-c.padding*2,1),height:Math.max(k.height-c.padding*2,1)});y.prop=0;b(y).animate({prop:1},{duration:c.changeSpeed,easing:c.easingChange,step:M,complete:f})}})}else{g.css("opacity",1);if(c.transitionIn=="elastic"){k=Q();i.css({top:c.padding,left:c.padding,width:Math.max(k.width-c.padding*2,1),height:Math.max(k.height-c.padding*2,1)}).html(m.contents());g.css(k).show();if(c.opacity)l.opacity= -0;y.prop=0;b(y).animate({prop:1},{duration:c.speedIn,easing:c.easingIn,step:M,complete:L})}else{i.css({top:c.padding,left:c.padding,width:Math.max(l.width-c.padding*2,1),height:Math.max(l.height-c.padding*2-v,1)}).html(m.contents());g.css(l).fadeIn(c.transitionIn=="none"?0:c.speedIn,L)}}},F=function(){m.width(e.width);m.height(e.height);if(e.width=="auto")e.width=m.width();if(e.height=="auto")e.height=m.height();N()},Z=function(){h=true;e.width=s.width;e.height=s.height;b("").attr({id:"fancybox-img", -src:s.src,alt:e.title}).appendTo(m);N()},C=function(){J();var a=q[p],d,f,o,t,w;e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));o=a.title||b(a).title||e.title||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(o===""&&e.orig)o=e.orig.attr("alt");d=a.nodeName&&/^(?:javascript|#)/i.test(a.href)?e.href||null:e.href||a.href||null;if(e.type){f=e.type;if(!d)d=e.content}else if(e.content)f="html";else if(d)if(d.match(G))f= -"image";else if(d.match(S))f="swf";else if(b(a).hasClass("iframe"))f="iframe";else if(d.match(/#/)){a=d.substr(d.indexOf("#"));f=b(a).length>0?"inline":"ajax"}else f="ajax";else f="inline";e.type=f;e.href=d;e.title=o;if(e.autoDimensions&&e.type!=="iframe"&&e.type!=="swf"){e.width="auto";e.height="auto"}if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick=false;e.enableEscapeButton=false;e.showCloseButton=false}if(b.isFunction(e.onStart))if(e.onStart(q,p,e)===false){h=false; -return}m.css("padding",20+e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(i.children())});switch(f){case "html":m.html(e.content);F();break;case "inline":b('
').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(i.children())}).bind("fancybox-cancel",function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity(); -s=new Image;s.onerror=function(){P()};s.onload=function(){s.onerror=null;s.onload=null;Z()};s.src=d;break;case "swf":t='';w="";b.each(e.swf,function(r,R){t+='';w+=" "+r+'="'+R+'"'});t+='";m.html(t); -F();break;case "ajax":a=d.split("#",2);f=e.ajax.data||{};if(a.length>1){d=a[0];if(typeof f=="string")f+="&selector="+a[1];else f.selector=a[1]}h=false;b.fancybox.showActivity();E=b.ajax(b.extend(e.ajax,{url:d,data:f,error:P,success:function(r){if(E.status==200){m.html(r);F()}}}));break;case "iframe":b('').appendTo(m);N();break}},$=function(){if(u.is(":visible")){b("div", -u).css("top",I*-40+"px");I=(I+1)%12}else clearInterval(H)},aa=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('
'),u=b('
'),x=b('
'),g=b('
'));if(!b.support.opacity){g.addClass("fancybox-ie");u.addClass("fancybox-ie")}D=b('
').append('
').appendTo(g); -D.append(i=b('
'),z=b(''),A=b(''),B=b(''));z.click(b.fancybox.close);u.click(b.fancybox.cancel);A.click(function(a){a.preventDefault();b.fancybox.prev()});B.click(function(a){a.preventDefault();b.fancybox.next()});if(O){x.get(0).style.setExpression("height", -"document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'");u.get(0).style.setExpression("top","(-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'");D.prepend('')}}}; -b.fn.fancybox=function(a){b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(d){d.preventDefault();if(!h){h=true;b(this).blur();q=[];p=0;d=b(this).attr("rel")||"";if(!d||d==""||d==="nofollow")q.push(this);else{q=b("a[rel="+d+"], area[rel="+d+"]");p=q.index(this)}C();return false}});return this};b.fancybox=function(a,d){if(!h){h=true;d=typeof d!=="undefined"?d:{};q=[];p=d.index||0;if(b.isArray(a)){for(var f=0,o=a.length;fq.length||p<0)p=0;C()}};b.fancybox.showActivity=function(){clearInterval(H);u.show();H=setInterval($,66)};b.fancybox.hideActivity=function(){u.hide()};b.fancybox.next=function(){return b.fancybox.pos(n+1)};b.fancybox.prev=function(){return b.fancybox.pos(n- -1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a,10);if(a>-1&&j.length>a){p=a;C()}if(c.cyclic&&j.length>1&&a<0){p=j.length-1;C()}if(c.cyclic&&j.length>1&&a>=j.length){p=0;C()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");J();e&&b.isFunction(e.onCancel)&&e.onCancel(q,p,e);h=false}};b.fancybox.close=function(){function a(){x.fadeOut("fast");g.hide();b.event.trigger("fancybox-cleanup");i.empty();b.isFunction(c.onClosed)&&c.onClosed(j,n,c);j=e=[];n=p=0;c=e={};h=false} -if(!(h||g.is(":hidden"))){h=true;if(c&&b.isFunction(c.onCleanup))if(c.onCleanup(j,n,c)===false){h=false;return}J();b(z.add(A).add(B)).hide();b("#fancybox-title").remove();g.add(i).add(x).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");i.css("overflow","hidden");if(c.transitionOut=="elastic"){k=Q();var d=g.position();l={top:d.top,left:d.left,width:g.width(),height:g.height()};if(c.opacity)l.opacity=1;y.prop=1;b(y).animate({prop:0},{duration:c.speedOut,easing:c.easingOut, -step:M,complete:a})}else g.fadeOut(c.transitionOut=="none"?0:c.speedOut,a)}};b.fancybox.resize=function(){var a,d;if(!(h||g.is(":hidden"))){h=true;a=i.wrapInner("
").children();d=a.height();g.css({height:d+c.padding*2+v});i.css({height:d});a.replaceWith(a.children());b.fancybox.center()}};b.fancybox.center=function(){h=true;var a=K(),d=c.margin,f={};f.top=a[3]+(a[1]-(g.height()-v+40))*0.5;f.left=a[2]+(a[0]-(g.width()+40))*0.5;f.top=Math.max(a[3]+d,f.top);f.left=Math.max(a[2]+ -d,f.left);g.css(f);h=false};b.fn.fancybox.defaults={padding:10,margin:20,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.3,overlayColor:"#666",titleShow:true,titlePosition:"outside",titleFormat:null,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast", -easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,onStart:null,onCancel:null,onComplete:null,onCleanup:null,onClosed:null};b(document).ready(function(){aa()})})(jQuery); \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/js/fancybox/jquery.mousewheel-3.0.2.pack.js --- a/media/js/fancybox/jquery.mousewheel-3.0.2.pack.js Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -/*! Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. - * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. - * - * Version: 3.0.2 - * - * Requires: 1.2.2+ - */ - -(function(b){function d(a){var f=[].slice.call(arguments,1),e=0;a=b.event.fix(a||window.event);a.type="mousewheel";if(a.wheelDelta)e=a.wheelDelta/120;if(a.detail)e=-a.detail/3;f.unshift(a,e);return b.event.handle.apply(this,f)}var c=["DOMMouseScroll","mousewheel"];b.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=c.length;a;)this.addEventListener(c[--a],d,false);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=c.length;a;)this.removeEventListener(c[--a], -d,false);else this.onmousewheel=null}};b.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery); \ No newline at end of file diff -r f3052378ab47 -r efb2da0b5d10 media/js/jquery.cross-slide.min.js --- a/media/js/jquery.cross-slide.min.js Sun Mar 20 19:53:35 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* - * CrossSlide jQuery plugin v0.6 - * - * Copyright 2007-2010 by Tobia Conforto - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -(function(){var d=jQuery,a=(d.fn.startAnimation?"startAnimation":"animate"),c="pause plugin missing.";function e(h){for(var g=1;g3){throw new Error()}if(h[0]=="center"){if(h.length==1){h=["center","center"]}else{if(h.length==2&&h[1].match(/^[\d.]+x$/i)){h=["center","center",h[1]]}}}if(h.length==3){g=parseFloat(h[2].match(/^([\d.]+)x$/i)[1])}var j=h[0]+" "+h[1];if(j=="left top"||j=="top left"){return{xrel:0,yrel:0,zoom:g}}if(j=="left center"||j=="center left"){return{xrel:0,yrel:0.5,zoom:g}}if(j=="left bottom"||j=="bottom left"){return{xrel:0,yrel:1,zoom:g}}if(j=="center top"||j=="top center"){return{xrel:0.5,yrel:0,zoom:g}}if(j=="center center"){return{xrel:0.5,yrel:0.5,zoom:g}}if(j=="center bottom"||j=="bottom center"){return{xrel:0.5,yrel:1,zoom:g}}if(j=="right top"||j=="top right"){return{xrel:1,yrel:0,zoom:g}}if(j=="right center"||j=="center right"){return{xrel:1,yrel:0.5,zoom:g}}if(j=="right bottom"||j=="bottom right"){return{xrel:1,yrel:1,zoom:g}}return{xrel:parseInt(h[0].match(/^(\d+)%$/)[1])/100,yrel:parseInt(h[1].match(/^(\d+)%$/)[1])/100,zoom:g}}d.fn.crossSlide=function(i,k,l){var g=this,j=this.width(),h=this.height();if(g.length!=1){f("crossSlide() must be called on exactly 1 element")}g.get(0).crossSlideArgs=[i,k,l];k=d.map(k,function(m){return d.extend({},m)});if(!i.easing){i.easing=i.variant?"swing":"linear"}if(!l){l=function(){}}(function(o){var m=0;function n(q,p){p.onload=function(r){m++;k[q].width=p.width;k[q].height=p.height;if(m==k.length){o()}};p.src=k[q].src;if(q+1',m.src));if(m.href){y=d(e('',m.href)).append(s)}if(m.onclick){y.click(m.onclick)}if(m.alt){s.attr("alt",m.alt)}if(m.href&&m.target){y.attr("target",m.target)}y.appendTo(g)}delete o;function n(D,C){var E=[0,A/(D.time_ms+2*A),1-A/(D.time_ms+2*A),1][C];return{left:Math.round(D.from.left+E*(D.to.left-D.from.left)),top:Math.round(D.from.top+E*(D.to.top-D.from.top)),width:Math.round(D.from.width+E*(D.to.width-D.from.width)),height:Math.round(D.from.height+E*(D.to.height-D.from.height))}}var u=g.find("img").css({position:"absolute",visibility:"hidden",top:0,left:0,border:0});u.eq(0).css({visibility:"visible"});if(!z){u.eq(0).css(n(k[0],i.variant?0:1))}var B=i.loop;function q(O,p){if(O%2==0){if(z){var E=O/2,S=(E-1+k.length)%k.length,P=u.eq(E),M=u.eq(S);var L=function(){l(E,P.get(0));M.css("visibility","hidden");setTimeout(p,z)}}else{var H=O/2,S=(H-1+k.length)%k.length,R=u.eq(H),M=u.eq(S),F=k[H].time_ms,N=n(k[H],i.variant?3:2);var L=function(){l(H,R.get(0));M.css("visibility","hidden");R[a](N,F,i.easing,p)}}}else{var D=Math.floor(O/2),G=Math.ceil(O/2)%k.length,Q=u.eq(D),C=u.eq(G),T={},K={visibility:"visible"},J={};if(G>D){K.opacity=0;J.opacity=1;if(i.doubleFade){T.opacity=0}}else{T.opacity=0;if(i.doubleFade){K.opacity=0;J.opacity=1}}if(!z){d.extend(K,n(k[G],0));if(!i.variant){d.extend(T,n(k[D],3));d.extend(J,n(k[G],1))}}if(d.isEmptyObject(J)){var L=function(){l(G,C.get(0),D,Q.get(0));C.css(K);Q[a](T,A,"linear",p)}}else{if(d.isEmptyObject(T)){var L=function(){l(G,C.get(0),D,Q.get(0));C.css(K);C[a](J,A,"linear",p)}}else{var L=function(){l(G,C.get(0),D,Q.get(0));C.css(K);C[a](J,A,"linear");Q[a](T,A,"linear",p)}}}}if(i.loop&&O==k.length*2-2){var I=L;L=function(){if(--B){I()}}}if(O>0){return q(O-1,L)}else{return L}}var r=q(k.length*2-1,function(){return r()});r()});return g};d.fn.crossSlideFreeze=function(){this.find("img").stop()};d.fn.crossSlideStop=function(){this.find("img").stop().remove()};d.fn.crossSlideRestart=function(){this.find("img").stop().remove();d.fn.crossSlide.apply(this,this.get(0).crossSlideArgs)};d.fn.crossSlidePause=function(){if(!d.fn.pause){f(c)}this.find("img").pause()};d.fn.crossSlideResume=function(){if(!d.fn.pause){f(c)}this.find("img").resume()}})(); diff -r f3052378ab47 -r efb2da0b5d10 mysite/apache/madeira.wsgi --- a/mysite/apache/madeira.wsgi Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/apache/madeira.wsgi Wed Mar 30 00:16:32 2011 +0000 @@ -1,11 +1,37 @@ import os import sys +OFFLINE = False + sys.path.append('/home/var/django-sites/madeira/django-trunk') sys.path.append('/home/var/django-sites/madeira/madeira-trunk') +sys.path.append('/home/var/django-sites/madeira/madeira-trunk/mysite') os.environ['PYTHON_EGG_CACHE'] = '/home/var/django-sites/madeira/eggs/' -os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings' -import django.core.handlers.wsgi -application = django.core.handlers.wsgi.WSGIHandler() +def offline_handler(environ, start_response): + wsgi_dir = os.path.dirname(__file__) + sys.path.append(wsgi_dir) + + offline_file = os.path.join(wsgi_dir, '..', 'templates', 'offline.html') + if os.path.exists(offline_file): + response_headers = [('Content-type','text/html')] + response = open(offline_file).read() + else: + response_headers = [('Content-type','text/plain')] + response = 'themadeira.net website maintenance in progress; please check back soon.' + + if environ['REQUEST_METHOD'] == 'GET': + status = '503 Service Unavailable' + else: + status = '405 Method Not Allowed' + start_response(status, response_headers) + return [response] + + +if not OFFLINE: + os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings' + import django.core.handlers.wsgi + application = django.core.handlers.wsgi.WSGIHandler() +else: + application = offline_handler diff -r f3052378ab47 -r efb2da0b5d10 mysite/settings.py --- a/mysite/settings.py Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/settings.py Wed Mar 30 00:16:32 2011 +0000 @@ -14,12 +14,7 @@ MANAGERS = ADMINS -DATABASE_ENGINE = local_settings.DATABASE_ENGINE -DATABASE_NAME = local_settings.DATABASE_NAME -DATABASE_USER = local_settings.DATABASE_USER -DATABASE_PASSWORD = local_settings.DATABASE_PASSWORD -DATABASE_HOST = local_settings.DATABASE_HOST -DATABASE_PORT = local_settings.DATABASE_PORT +DATABASES = local_settings.DATABASES INTERNAL_IPS = local_settings.INTERNAL_IPS @@ -54,22 +49,57 @@ # Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = local_settings.ADMIN_MEDIA_PREFIX +# Staticfiles settings: +STATICFILES_DIRS = local_settings.STATICFILES_DIRS +STATIC_ROOT = local_settings.STATIC_ROOT +STATIC_URL = local_settings.STATIC_URL + # Make this unique, and don't share it with anybody. SECRET_KEY = local_settings.SECRET_KEY -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -) +if DEBUG: + TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ) +else: + TEMPLATE_LOADERS = ( + ('django.template.loaders.cached.Loader', ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + )), + ) -if not DEBUG: - CACHE_BACKEND = local_settings.CACHE_BACKEND - CACHE_MIDDLEWARE_SECONDS = local_settings.CACHE_MIDDLEWARE_SECONDS - CACHE_MIDDLEWARE_KEY_PREFIX = local_settings.CACHE_MIDDLEWARE_KEY_PREFIX - CACHE_MIDDLEWARE_ANONYMOUS_ONLY = local_settings.CACHE_MIDDLEWARE_ANONYMOUS_ONLY +if DEBUG: + MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', + 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', + ) +else: + MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', + 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', + ) -MIDDLEWARE_CLASSES = local_settings.MIDDLEWARE_CLASSES +####################################################################### +# Caching +####################################################################### +if local_settings.USE_CACHE: + CACHES = local_settings.CACHES + CACHE_MIDDLEWARE_ANONYMOUS_ONLY = local_settings.CACHE_MIDDLEWARE_ANONYMOUS_ONLY + CACHE_MIDDLEWARE_SECONDS = local_settings.CACHE_MIDDLEWARE_SECONDS + CACHE_MIDDLEWARE_KEY_PREFIX = local_settings.CACHE_MIDDLEWARE_KEY_PREFIX ROOT_URLCONF = 'mysite.urls' @@ -83,20 +113,64 @@ ) TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.media', - 'django.core.context_processors.request' + "django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.request", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.contrib.messages.context_processors.messages", ) -INSTALLED_APPS = ( +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.admindocs', 'django.contrib.auth', 'django.contrib.contenttypes', + 'django.contrib.flatpages', + 'django.contrib.markup', + 'django.contrib.messages', 'django.contrib.sessions', - 'django.contrib.admin', - 'django.contrib.markup', 'django.contrib.sites', - 'django.contrib.flatpages', + 'django.contrib.staticfiles', 'mysite.band', 'mysite.photologue', -) +] +if DEBUG: + INSTALLED_APPS.append('debug_toolbar') + +####################################################################### +# Messages +####################################################################### +MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage' + +####################################################################### +# Email +####################################################################### +EMAIL_HOST = local_settings.EMAIL_HOST +EMAIL_PORT = local_settings.EMAIL_PORT + +####################################################################### +# Sessions +####################################################################### +SESSION_ENGINE = "django.contrib.sessions.backends.cached_db" +SESSION_COOKIE_AGE = 2 * 7 * 24 * 60 * 60 # 2 weeks in seconds +SESSION_COOKIE_DOMAIN = None +SESSION_COOKIE_NAME = 'madeira_sessionid' +SESSION_COOKIE_PATH = '/' +SESSION_COOKIE_SECURE = False +SESSION_EXPIRE_AT_BROWSER_CLOSE = False +SESSION_SAVE_EVERY_REQUEST = False + +####################################################################### +# Configure Logging +####################################################################### + +LOGGING = local_settings.LOGGING + +####################################################################### +# Django Debug Toolbar +####################################################################### + +if DEBUG: + DEBUG_TOOLBAR_CONFIG = local_settings.DEBUG_TOOLBAR_CONFIG + diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/404.html --- a/mysite/templates/404.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/404.html Wed Mar 30 00:16:32 2011 +0000 @@ -3,8 +3,8 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> Page Not Found - - + + diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/admin/band/email.html --- a/mysite/templates/admin/band/email.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/admin/band/email.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,7 +1,8 @@ {% extends 'admin/base_site.html' %} +{% load adminmedia %} {% block title %}The Madeira | Mailing List Email Form{% endblock %} {% block extrastyle %} - + {% endblock %} {% block bodyclass %}change-form{% endblock %} {% block breadcrumbs %} @@ -13,7 +14,7 @@

Madeira Mailing List Email Form

Use this form to send an email to all subscribers of the The Madeira mailing list.

-
+{% csrf_token %}
{% for field in form %} diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/admin/band/email_sent.html --- a/mysite/templates/admin/band/email_sent.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/admin/band/email_sent.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,7 +1,8 @@ {% extends 'admin/base_site.html' %} +{% load adminmedia %} {% block title %}The Madeira | Mailing List Email Sent{% endblock %} {% block extrastyle %} - + {% endblock %} {% block breadcrumbs %}
diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/band/base.html --- a/mysite/templates/band/base.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/band/base.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,6 +1,7 @@ +{% load url from future %} {% block title %}{% endblock %} @@ -10,37 +11,37 @@ - - + + - + {% block custom_css %}{% endblock %} {% block custom_js %}{% endblock %} - +
{% endif %} diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/band/mail.html --- a/mysite/templates/band/mail.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/band/mail.html Wed Mar 30 00:16:32 2011 +0000 @@ -5,7 +5,7 @@

Get on the Madeira mailing list to receive updates about upcoming shows, releases, and website updates. This is a low volume list. We do not share your email address with anyone.

Mailing List - + {% csrf_token %} {% for field in form %} diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/band/mail_not_found.html --- a/mysite/templates/band/mail_not_found.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/band/mail_not_found.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,7 +1,8 @@ {% extends 'band/base.html' %} +{% load url from future %} {% block title %}The Madeira | Mailing List Confirmation{% endblock %} {% block content %}

Madeira Mailing List

Sorry, we did not find that email address in our database.

-

Back to contact page.

+

Back to contact page.

{% endblock %} diff -r f3052378ab47 -r efb2da0b5d10 mysite/templates/band/photo_detail.html --- a/mysite/templates/band/photo_detail.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/band/photo_detail.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,12 +1,13 @@ {% extends 'band/base.html' %} +{% load url from future %} {% load markup %} {% block title %}The Madeira | Photos: {{ gallery.title }}{% endblock %} {% block custom_css %} - + {% endblock %} {% block custom_js %} - + - +