Menu
▾
▴
[Krang-CVS] [6017] Added Krang.Messages slider to preview editor.
|
From: <bo...@kr...> - 2009-03-24 17:31:17
|
Revision: 6017
Author: bodo
Date: 2009-03-24 13:30:13 -0400 (Tue, 24 Mar 2009)
Log Message:
-----------
Added Krang.Messages slider to preview editor. Also made the "Close" button reload the previewed story without the preview editor.
Modified Paths:
--------------
branches/preview_editor/htdocs/preview_finder/bin/krang_combine_preview_finder_js
branches/preview_editor/htdocs/preview_finder/css/preview_editor.css
branches/preview_editor/htdocs/preview_finder/js/preview_finder.js
branches/preview_editor/lib/Krang/CGI/Publisher.pm
branches/preview_editor/lib/Krang/ElementClass.pm
branches/preview_editor/templates/Publisher/preview_editor.base.tmpl
Modified: branches/preview_editor/htdocs/preview_finder/bin/krang_combine_preview_finder_js
===================================================================
--- branches/preview_editor/htdocs/preview_finder/bin/krang_combine_preview_finder_js 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/htdocs/preview_finder/bin/krang_combine_preview_finder_js 2009-03-24 17:30:13 UTC (rev 6017)
@@ -100,6 +100,7 @@
htdocs/js/scriptaculous.js
htdocs/proto_popup/src/proto_popup_base.js
htdocs/preview_finder/js/xorigin.js
+ htdocs/preview_finder/js/krang_messages.js
htdocs/preview_finder/js/preview_finder.js
);
@files = map { catfile(KrangRoot, $_) } @files;
Modified: branches/preview_editor/htdocs/preview_finder/css/preview_editor.css
===================================================================
--- branches/preview_editor/htdocs/preview_finder/css/preview_editor.css 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/htdocs/preview_finder/css/preview_editor.css 2009-03-24 17:30:13 UTC (rev 6017)
@@ -21,7 +21,7 @@
outline: 1px solid #6a5acd;
}
-#krang_preview_editor_top_spacer {
+#krang_preview_editor_top_spacer {
height: 50px;
}
@@ -46,3 +46,32 @@
a#krang_preview_editor_help:visited, a#krang_preview_editor_close:visited {
color: #336699;
}
+
+/******************
+ * Krang.Messages *
+ ******************/
+.krang_preview_editor_slider { z-index: 200; width: 974px; position: fixed;}
+.krang_preview_editor_slider .wrapper { background-color: #E0F0FF; filter: alpha(opacity=90); opacity: .9; width: 440px; margin: 0 auto; border: 1px solid #BBB;}
+.krang_preview_editor_slider .content { color: #333; min-height: 60px; max-height: 28.5em; overflow: auto; }
+.krang_preview_editor_slider form { background-color: #CEE7FF; border-top: 1px solid #E0F0FF; padding: 10px; text-align: right; }
+.krang_preview_editor_slider p {
+ font: 11px/1 "Helvetica Neue",arial,helvetica,sans-serif;
+ margin: 1.5em 80px;
+ line-height: 1.5;
+ font-weight: bold;
+}
+.krang_preview_editor_button {
+ color: #690 !important; width: auto !important;
+ overflow: visible;
+ margin: 0;
+ border: 1px solid #BBB;
+ border-color: #EEE #BBB #BBB #EEE;
+ padding: .1em .5em;
+ font-size: 11px;
+ line-height: 1;
+}
+.krang_preview_editor_button:hover {
+ background-color: <tmpl_var HilightColor> !important;
+ background-image: none !important;
+}
+
Modified: branches/preview_editor/htdocs/preview_finder/js/preview_finder.js
===================================================================
--- branches/preview_editor/htdocs/preview_finder/js/preview_finder.js 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/htdocs/preview_finder/js/preview_finder.js 2009-03-24 17:30:13 UTC (rev 6017)
@@ -8,7 +8,14 @@
var cmsWin = top.opener;
var cmsData = window.name.split(/\uE000/);
var cmsURL = cmsData[0];
- var cmsWinID = cmsData[1];
+ try {
+ var conf = cmsData[1] ? cmsData[1].evalJSON() : {}
+ }
+ catch(er) {
+ alert(er.name + ": Critical error in preview_finder.js. Please inform the Krang developer team.");
+ }
+ var cmsWinID = conf.winID;
+ var msgTimeout = conf.messageTimeout;
// get story ID
var fLabel = $$('.krang_preview_editor_element_label').first();
@@ -274,7 +281,7 @@
runMode = 'edit';
doActivateEdit();
activateEdit();
- console.info(json.msg);
+ Krang.Messages.add(json.msg).show(msgTimeout);
} else {
console.error("Steal Story "+storyID+" failed (preview_finder.js)");
}
@@ -289,7 +296,7 @@
// Close button
$('krang_preview_editor_close').observe('click', function(e) {
- $('krang_preview_editor_top_overlay').hide();
+ top.location.href = window.location.href;
});
// Help button
Modified: branches/preview_editor/lib/Krang/CGI/Publisher.pm
===================================================================
--- branches/preview_editor/lib/Krang/CGI/Publisher.pm 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/lib/Krang/CGI/Publisher.pm 2009-03-24 17:30:13 UTC (rev 6017)
@@ -28,6 +28,7 @@
use Krang::ClassLoader 'Story';
use Krang::ClassLoader 'User';
use Krang::ClassLoader 'Cache';
+use Krang::ClassLoader 'MyPref';
use Krang::ClassLoader Conf => qw(PreviewSSL Charset EnablePreviewEditor);
use Krang::ClassLoader Log => qw(debug info critical assert ASSERT);
use Krang::ClassLoader Widget => qw(format_url datetime_chooser decode_datetime);
@@ -371,7 +372,6 @@
);
};
if (my $error = $@) {
-
# if there is an error, figure out what it is, create the
# appropriate message and return an error page.
if (ref $error && $error->isa('Krang::ElementClass::TemplateNotFound')) {
@@ -452,7 +452,7 @@
my $scheme = PreviewSSL ? 'https' : 'http';
# w/o preview editor
- if (pkg('MyPref')->get('use_preview_editor')) {
+ if (pkg('MyPref')->get('use_preview_editor') && !$query->param('exit_preview_editor')) {
# display the previewed story in a frame within the main window
my $qstring = "rm=preview_editor&story_preview_url="
.uri_escape("$scheme://$url")
@@ -492,6 +492,7 @@
story_preview_url => ($query->param('story_preview_url') || ''),
window_id => ($query->param('window_id') || ''),
cms_root => pkg('Conf')->cms_root(),
+ message_timeout => pkg('MyPref')->get('message_timeout'),
);
return $t->output;
}
Modified: branches/preview_editor/lib/Krang/ElementClass.pm
===================================================================
--- branches/preview_editor/lib/Krang/ElementClass.pm 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/lib/Krang/ElementClass.pm 2009-03-24 17:30:13 UTC (rev 6017)
@@ -1702,12 +1702,30 @@
<td width="10%" style="text-align: right; padding-right: 20px"><a href="" id="krang_preview_editor_help" name="$help_url">$help</a><a href="" id="krang_preview_editor_close">$close</a></td>
</tr></tbody></table>
</div>
+
<div id="krang_preview_editor_load_indicator" style="$indicator_css">
<img alt="Load Indicator" src="$arg{cms_root}/images/indicator_small_bluebg.gif" style="padding 0 1em 0 0; vertical-align:middle">
$loading…
</div>
END
- my $top_spacer = qq{<div id="krang_preview_editor_top_spacer"></div>};
+ my $top_spacer = <<END;
+<div id="krang_preview_editor_top_spacer"></div>
+<div id="krang_preview_editor_messages" class="krang_preview_editor_slider" style="display:none;">
+<div class="wrapper">
+<div class="content" style="background: url('$arg{cms_root}/images/slider-info.gif') 20px 10px no-repeat;"></div>
+<form>
+<input value="$close" type="button" class="krang_preview_editor_button" style="background: #EEE url('$arg{cms_root}/images/bkg-button-mini.gif') 0 50% repeat-x !important;"/>
+</form>
+</div></div>
+
+<div id="krang_preview_editor_alerts" class="krang_preview_editor_slider" style="display:none;"><div class="wrapper">
+<div class="content" style="background: url('$arg{cms_root}/images/slider-alert.gif') 20px 10px no-repeat;"></div>
+<form>
+<input value="$close" type="button" class="krang_preview_editor_button" style="background: #EEE url('$arg{cms_root}/images/bkg-button-mini.gif') 0 50% repeat-x !important;">
+</form>
+</div></div>
+END
+
push @{$arg{filters}}, sub { ${$_[0]} =~ s/(<body[^>]*>)/$1$top_spacer/msi };
push @{$arg{filters}}, sub { ${$_[0]} =~ s/(<\/body[^>]*>)/$overlay$1/msi };
}
Modified: branches/preview_editor/templates/Publisher/preview_editor.base.tmpl
===================================================================
--- branches/preview_editor/templates/Publisher/preview_editor.base.tmpl 2009-03-24 10:55:42 UTC (rev 6016)
+++ branches/preview_editor/templates/Publisher/preview_editor.base.tmpl 2009-03-24 17:30:13 UTC (rev 6017)
@@ -4,7 +4,7 @@
<head>
<title>Krang Preview Editor</title>
<frameset cols="100%">
-<frame id="preview_frame" name="<tmpl_var cms_root><tmpl_var window_id>" src="<tmpl_var story_preview_url>"/></head>
+<frame id="preview_frame" name="<tmpl_var cms_root>{winID: '<tmpl_var window_id>', messageTimeout: '<tmpl_var message_timeout>'}" src="<tmpl_var story_preview_url>"/></head>
</frame>
</frameset><body>
</body>
|