From 1e794c475dd1d8f4c54df83e3c51deb30c393267 Mon Sep 17 00:00:00 2001
From: John Bintz
Date: Thu, 1 Oct 2009 21:51:09 -0400
Subject: [PATCH] prefix names w/ wdts
---
classes/WhatDidTheySayAdmin.inc | 14 +++++++-------
classes/partials/_queued-transcript-contents.inc | 2 +-
css/wdts-defaults.css | 16 ++++++++--------
js/edit-transcripts.js | 6 ++++--
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/classes/WhatDidTheySayAdmin.inc b/classes/WhatDidTheySayAdmin.inc
index 33fe4e5..9c27c9f 100644
--- a/classes/WhatDidTheySayAdmin.inc
+++ b/classes/WhatDidTheySayAdmin.inc
@@ -190,11 +190,11 @@ class WhatDidTheySayAdmin {
* Filter for dialog short code.
*/
function filter_shortcode_dialog($name, $direction, $speech, $content) {
- $content = '' . $name . '';
+ $content = '
' . $name . '';
if (!empty($direction)) {
- $content .= ' ' . $direction . '';
+ $content .= ' ' . $direction . '';
}
- $content .= ' ' . $speech . '
';
+ $content .= '
' . $speech . ' ';
return array($name, $direction, $speech, $content);
}
@@ -212,7 +212,7 @@ class WhatDidTheySayAdmin {
* Filter for scene action short code.
*/
function filter_shortcode_scene_action($description, $content) {
- return array($description, '' . $description . '
', );
+ return array($description, '' . $description . '
', );
}
/**
@@ -228,7 +228,7 @@ class WhatDidTheySayAdmin {
* Filter for scene heading short code.
*/
function filter_shortcode_scene_heading($description, $content) {
- return array($description, '' . $description . '
');
+ return array($description, '' . $description . '
');
}
/**
@@ -240,7 +240,7 @@ class WhatDidTheySayAdmin {
$content = do_shortcode($transcript);
$options = get_option('what-did-they-say-options');
if ($options['use_nl2br']) { $content = nl2br($content); }
- return array($transcript, '' . $content . '
');
+ return array($transcript, '' . $content . '
');
}
/**
@@ -249,7 +249,7 @@ class WhatDidTheySayAdmin {
* @return string The processed language name.
*/
function the_language_name($language, $content = "") {
- return array($language, '' . $language . '
');
+ return array($language, '' . $language . '
');
}
/**
diff --git a/classes/partials/_queued-transcript-contents.inc b/classes/partials/_queued-transcript-contents.inc
index c3a70ba..b4f3796 100644
--- a/classes/partials/_queued-transcript-contents.inc
+++ b/classes/partials/_queued-transcript-contents.inc
@@ -8,6 +8,6 @@
$language_options->get_language_name($transcript['language'])
)
?>
-
+
diff --git a/css/wdts-defaults.css b/css/wdts-defaults.css
index 8c1f6b7..5bd82a6 100644
--- a/css/wdts-defaults.css
+++ b/css/wdts-defaults.css
@@ -1,37 +1,37 @@
-div.transcript {
+div.wdts-transcript {
border: solid #333 1px;
padding: 0.5em;
margin: 0.5empx;
background-color: #e7e7e7
}
-div.transcript div, div.transcript span {
+div.wdts-transcript div, div.wdts-transcript span {
font-family: 'Courier New'
}
-div.transcript > div {
+div.wdts-transcript > div {
margin-bottom: 0.5em
}
-div.transcript div.scene-heading {
+div.wdts-transcript div.wdts-scene-heading {
text-transform: uppercase;
text-align: center;
font-weight: bold;
margin-bottom: 0.5em
}
-div.transcript div.dialog {
+div.wdts-transcript div.wdts-dialog {
text-align: center
}
-div.transcript div.dialog span {
+div.wdts-transcript div.wdts-dialog span {
display: block
}
-div.transcript div.dialog span.name {
+div.wdts-transcript div.wdts-dialog span.wdts-name {
text-transform: uppercase
}
-div.transcript div.dialog span.speech {
+div.wdts-transcript div.wdts-dialog span.wdts-speech {
margin: 0.5em 1em 0
}
\ No newline at end of file
diff --git a/js/edit-transcripts.js b/js/edit-transcripts.js
index d00631f..a6392e8 100644
--- a/js/edit-transcripts.js
+++ b/js/edit-transcripts.js
@@ -83,9 +83,11 @@ WhatDidTheySay.setup_transcript_editor = function(container) {
if (new_content) {
var speech = prompt(WhatDidTheySay.messages.dialog_speech);
- tag += speech + "[/dialog]\n";
+ if (speech) {
+ tag += speech + "[/dialog]\n";
- injector.inject(tag, start);
+ injector.inject(tag, start);
+ }
} else {
injector.inject("[/dialog]\n", end);
injector.inject(tag, start);