Skip to content

Commit

Permalink
Merge beta branch into master.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Sisk committed Aug 22, 2012
2 parents 5ef54b6 + 433f7f2 commit b2e7583
Show file tree
Hide file tree
Showing 61 changed files with 17,347 additions and 13,508 deletions.
174 changes: 174 additions & 0 deletions -/css/admin-special.css
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,174 @@
@-moz-keyframes thanks {
0% { color: #00acdc; }
25% { color: #cadb2a; }
50% { color: #f68a1f; }
75% { color: #b72367; }
100% { color: #00acdc; }
}

@-ms-keyframes thanks {
0% { color: #00acdc; }
25% { color: #cadb2a; }
50% { color: #f68a1f; }
75% { color: #b72367; }
100% { color: #00acdc; }
}

@-o-keyframes thanks {
0% { color: #00acdc; }
25% { color: #cadb2a; }
50% { color: #f68a1f; }
75% { color: #b72367; }
100% { color: #00acdc; }
}

@-webkit-keyframes thanks {
0% { color: #00acdc; }
25% { color: #cadb2a; }
50% { color: #f68a1f; }
75% { color: #b72367; }
100% { color: #00acdc; }
}

@keyframes thanks {
0% { color: #00acdc; }
25% { color: #cadb2a; }
50% { color: #f68a1f; }
75% { color: #b72367; }
100% { color: #00acdc; }
}

@-moz-keyframes fadein {
0% { opacity: 0; }
100% { opacity: 1; }
}

@-ms-keyframes fadein {
0% { opacity: 0; }
100% { opacity: 1; }
}

@-o-keyframes fadein {
0% { opacity: 0; }
100% { opacity: 1; }
}

@-webkit-keyframes fadein {
0% { opacity: 0; }
100% { opacity: 1; }
}

@keyframes fadein {
0% { opacity: 0; }
100% { opacity: 1; }
}

.updated.webcomic {
-moz-animation: fadein 1.5s;
-ms-animation: fadein 1.5s;
-o-animation: fadein 1.5s;
-webkit-animation: fadein 1.5s;
animation: fadein 1.5s;
background: none;
border: 0;
border-radius: 0;
}

.updated.webcomic a {
background: -moz-linear-gradient( #fff, #eee );
background: -ms-linear-gradient( #fff, #eee );
background: -o-linear-gradient( #fff, #eee );
background: -webkit-linear-gradient( #fff, #eee );
background: linear-gradient( #fff, #eee );
border-radius: .5em;
border-style: solid;
border-width: 0 thin thick;
box-shadow: 0 .12em .25em rgba( 0, 0, 0, .25 );
color: #00acdc;
display: inline-block;
font: 200%/2.5 'Maven Pro', sans-serif;
padding: 0 1em;
position: relative;
text-shadow: 0 .1em .1em #fff;
-moz-transition: all .25s ease-in-out;
-ms-transition: all .25s ease-in-out;
-o-transition: all .25s ease-in-out;
-webkit-transition: all .25s ease-in-out;
transition: all .25s ease-in-out;
}

.updated.webcomic a:focus,
.updated.webcomic a:hover {
-moz-animation: thanks 4s infinite;
-ms-animation: thanks 4s infinite;
-o-animation: thanks 4s infinite;
-webkit-animation: thanks 4s infinite;
animation: thanks 4s infinite;
}

.updated.webcomic a:active {
-moz-transform: scale( .95 );
-ms-transform: scale( .95 );
-o-transform: scale( .95 );
-webkit-transform: scale( .95 );
transform: scale( .95 );
}


.updated.webcomic b,
.updated.webcomic b:after,
.updated.webcomic b:before {
bottom: .25em;
content: '\2764';
color: #b72367;
display: block;
font-size: larger;
font-style: normal;
left: -.5em;
position: absolute;
text-shadow: none;
-moz-transform: rotate( 10deg );
-ms-transform: rotate( 10deg );
-o-transform: rotate( 10deg );
-webkit-transform: rotate( 10deg );
transform: rotate( 10deg );
}

.updated.webcomic b:before {
color: #cadb2a;
font-size: 65%;
bottom: -.75em;
left: .25em;
}

.updated.webcomic b:after {
color: #f68a1f;
font-size: 75%;
bottom: -.25em;
left: .9em;
-moz-transform: rotate( -20deg );
-ms-transform: rotate( -20deg );
-o-transform: rotate( -20deg );
-webkit-transform: rotate( -20deg );
transform: rotate( -20deg );
}

.updated.webcomic a:hover b,
.updated.webcomic a:hover b:after,
.updated.webcomic a:hover b:before {
color: inherit;
}

.updated.webcomic.legacy b:after,
.updated.webcomic.legacy b:before {
content: '\2605';
}

.updated.webcomic.legacy b:after {
bottom: -.5em;
}

.updated.webcomic.legacy b:before {
bottom: -1.15em;
left: .5em;
}
Binary file added -/img/transcript-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added -/img/transcript.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added -/img/twitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added -/img/webcomic-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added -/img/webcomic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions -/js/admin-config.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,69 @@
/** Update collection slug previews. */
function webcomic_slug_preview( url ) {
jQuery( function( $ ) {
$( '#webcomic_slugs_archive,#webcomic_slugs_webcomic,#webcomic_slugs_storyline,#webcomic_slugs_character' ).on( 'change', function() {
$.getJSON( url, {
slug: $( this ).val(),
preview: '#' + $( this ).attr( 'id' ),
collection: $( '[name=webcomic_collection]' ).val(),
webcomic_admin_ajax: 'WebcomicConfig::ajax_slug_preview'
}, function( data ) {
$( data.container ).val( data.slug ).siblings( '.description' ).children( 'b' ).html( data.slug )
} );
} );
} );
}

/** Enable or disable print defaults. */
function webcomic_commerce_defaults( url ) {
jQuery( function( $ ) {
$( '#webcomic_commerce_business' ).on( 'change', function() {
$.getJSON( url, {
business: $( this ).val(),
webcomic_admin_ajax: 'WebcomicConfig::ajax_commerce_defaults'
}, function ( data ) {
if ( data.clear ) {
$( '#webcomic_commerce_prints,#webcomic_commerce_originals' ).removeAttr( 'disabled' ).siblings( 'span' ).removeClass( 'description' );
} else {
$( '#webcomic_commerce_prints,#webcomic_commerce_originals' ).removeAttr( 'checked' ).attr( 'disabled', true ).siblings( 'span' ).addClass( 'description' );
}
} );
} ).trigger( 'change' );
} );
}

/** Update Twitter authorized account. */
function webcomic_twitter_account( url ) {
jQuery( function( $ ) {
$( '#webcomic_twitter_consumer_key,#webcomic_twitter_consumer_secret' ).on( 'change', function() {
$.get( url, {
consumer_key: $( '#webcomic_twitter_consumer_key' ).val(),
consumer_secret: $( '#webcomic_twitter_consumer_secret' ).val(),
collection: $( '[name=webcomic_collection]' ).val(),
webcomic_admin_ajax: 'WebcomicConfig::ajax_twitter_account'
}, function ( data ) {
$( '#webcomic_twitter_account' ).html( data );
} );
} );
} );
}

/** Toggle collection setting sections. */
jQuery( function( $ ) {
$( '.wrap h3' ).css( {
'border-top': 'thin solid #dfdfdf',
color: '#21759b',
cursor: 'pointer',
padding: '.5em 0 0'
} ).next().hide();

$( '.wrap h3:first' ).next().show();


$( '.wrap h3' ).on( 'mouseenter', function() { $( this ).css( 'color', '#d54e21' ); } );
$( '.wrap h3' ).on( 'mouseleave', function() { $( this ).css( 'color', '#21759b' ); } );

$( '.wrap h3' ).on( 'click', function() {
$( this ).next().toggle();
} );
} );
14 changes: 14 additions & 0 deletions -/js/admin-legacy.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,14 @@
/** Automatically continue legacy upgrades. */
function webcomic_auto_upgrade( c ) {
jQuery( function( $ ) {
setTimeout( function() {
$( '.webcomic-auto #upgrade_legacy' ).trigger( 'click' );
}, 5000 );

$( '.webcomic-auto #upgrade_legacy' ).on( 'click', function() {
$( this ).hide();

$( '.webcomic-auto-message' ).html( c );
} );
} );
}
26 changes: 26 additions & 0 deletions -/js/admin-media.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,26 @@
/** Warn if no selected days match the start date. */
function webcomic_generator( warning ) {
jQuery( function( $ ) {
$( 'form' ).on( 'submit', function() {
var v = $( 'input[name="webcomic_generate_start"]' ).val().split( '-' ),
d = new Date( v[ 0 ], parseInt( v[ 1 ] ) - 1, v[ 2 ] ),
x = false,
d1 = d2 = 0;

$.each( $( 'input[name="webcomic_generate_days[]"]:checked' ), function( i, e ) {
d1 = parseInt( $( e ).val() );
d2 = parseInt( d.getDay() );

if ( d1 === d2 || ( 7 === d1 && 0 === d2 ) ) {
x = true;

return false;
}
} );

if ( !x ) {
return window.confirm( warning );
}
} );
} );
}
49 changes: 49 additions & 0 deletions -/js/admin-meta.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,49 @@
/** Refresh the webcomic media meta box. */
function webcomic_media_meta( url ) {
jQuery( function( $ ) {
$( document ).on( 'mousedown', '#TB_overlay,#TB_closeWindowButton', function() {

setTimeout( function() {
$.get( url, {
post: $( '#post_ID' ).val(),
webcomic_admin_ajax: 'WebcomicPosts::ajax_media_preview'
}, function( data ) {
$( '#webcomic_media_preview' ).html( data );
} );
}, 500 );
} );
} );
}

/** Dynamically update the price preview for prints. */
function webcomic_prints_meta( currency, sold ) {
jQuery( function( $ ) {
$( '#webcomic_commerce_adjust_prices_domestic,#webcomic_commerce_adjust_shipping_domestic' ).on( 'change', function() {
calculate_total( 'domestic' );
} );

$( '#webcomic_commerce_adjust_prices_international,#webcomic_commerce_adjust_shipping_international' ).on( 'change', function() {
calculate_total( 'international' );
} );

$( '#webcomic_commerce_adjust_prices_original,#webcomic_commerce_adjust_shipping_original' ).on( 'change', function() {
calculate_total( 'original' );
} );

$( '#webcomic_commerce_original_available' ).on( 'click', function() {
calculate_total( 'original' );
} );

function calculate_total( id ) {
var total;

if ( 'original' === id && !$( '#webcomic_commerce_original_available' ).attr( 'checked' ) ) {
$( '#webcomic_original_total' ).html( sold );
} else {
total = ( parseFloat( $( '#webcomic_commerce_' + id + '_price' ).html() ) * ( 1 + ( parseFloat( $( '#webcomic_commerce_adjust_prices_' + id ).val() ) * .01 ) ) ) + ( parseFloat( $( '#webcomic_commerce_' + id + '_shipping' ).html() ) * ( 1 + ( parseFloat( $( '#webcomic_commerce_adjust_shipping_' + id ).val() ) * .01 ) ) );

$( '#webcomic_' + id + '_total' ).html( total.toFixed( 2 ) + ' ' + currency );
}
}
} );
}
27 changes: 27 additions & 0 deletions -/js/admin-pages.js
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,27 @@
/** Update meta data values in the quick edit box for pages. */
function webcomic_page_quick_edit( url ) {
jQuery( function( $ ) {
$( document ).on( 'click', 'a.editinline', function() {
$.getJSON( url, {
post: $( this ).parents( 'tr' ).attr( 'id' ).substr( 5, $( this ).parents( 'tr' ).attr( 'id' ).length ),
webcomic_admin_ajax: 'WebcomicPages::ajax_quick_edit'
}, function ( data ) {
$( '#webcomic_page_collection' ).val( data.collection );
} );
} );
} );
}

/** Save meta data values from the quick edit box for pages. */
function webcomic_page_quick_save( url ) {
jQuery( function( $ ) {
$( '.save' ).on( 'click', function() {
$.get( url, {
post: $( this ).parents( 'tr' ).attr( 'id' ).substr( 5, $( this ).parents( 'tr' ).attr( 'id' ).length ),
collection: $( '#webcomic_page_collection' ).val(),
webcomic_page_inline_save: $( '#webcomic_page_inline_save' ).val(),
webcomic_admin_ajax: 'WebcomicPages::ajax_quick_save'
} );
} );
} );
}
Loading

0 comments on commit b2e7583

Please sign in to comment.