[Jifty-commit] jifty branch, setupwizard-refactor, created. 96908537b3b568492dd60a8bd4095dc873048da3
Jifty commits
jifty-commit at lists.jifty.org
Mon Jun 14 16:11:26 EDT 2010
The branch, setupwizard-refactor has been created
at 96908537b3b568492dd60a8bd4095dc873048da3 (commit)
- Log -----------------------------------------------------------------
commit f81f1a0f8fbd23edcef4ffe33faba370d7eafca7
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Fri Jun 4 07:45:15 2010 -0400
Doc typo fix
diff --git a/lib/Jifty/View/Declare/Helpers.pm b/lib/Jifty/View/Declare/Helpers.pm
index 6004b1a..51ee8bf 100644
--- a/lib/Jifty/View/Declare/Helpers.pm
+++ b/lib/Jifty/View/Declare/Helpers.pm
@@ -310,7 +310,7 @@ sub form_next_page(@) {
Jifty->web->form->next_page(@_);
}
-=head2 Other functions and shortcutxs
+=head2 Other functions and shortcuts
=head3 hyperlink
commit 40164ed92e1e059e2889816f9550d8485d817b12
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Jun 10 17:36:34 2010 -0400
console.log the error message jQuery.ajax provides
diff --git a/share/web/static/js/jifty.js b/share/web/static/js/jifty.js
index afb442b..7ea39e8 100644
--- a/share/web/static/js/jifty.js
+++ b/share/web/static/js/jifty.js
@@ -1489,7 +1489,8 @@ Jifty.update = function () {
};
// When an HTTP communication failure happens, we need to clean up
- var onFailure = function(transport, object) {
+ var onFailure = function(transport, message) {
+ console.log(message);
// We failed, but we at least know we're done waiting
if (!hide_wait) {
commit 289bb14f1a8639b359e33d2def137b04d8984a73
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Jun 10 18:50:36 2010 -0400
Don't console.log
diff --git a/share/web/static/js/jifty.js b/share/web/static/js/jifty.js
index 7ea39e8..cd96066 100644
--- a/share/web/static/js/jifty.js
+++ b/share/web/static/js/jifty.js
@@ -1490,8 +1490,6 @@ Jifty.update = function () {
// When an HTTP communication failure happens, we need to clean up
var onFailure = function(transport, message) {
- console.log(message);
-
// We failed, but we at least know we're done waiting
if (!hide_wait) {
hide_wait_message_now();
commit a72b885900196715ac72705f8312f15f508715cc
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Jun 14 12:05:54 2010 -0400
Remove thickbox css; it's unused and causes issues
In particular, the global selector (*) rule that removes all padding and
margins from all elements is not useful. Jifty doesn't seem to use
thickbox anymore anyway and it's no longer maintained.
diff --git a/share/web/static/css/thickbox.css b/share/web/static/css/thickbox.css
deleted file mode 100644
index d24b9be..0000000
--- a/share/web/static/css/thickbox.css
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
- font: 12px Arial, Helvetica, sans-serif;
- color: #333333;
-}
-
-#TB_secondLine {
- font: 10px Arial, Helvetica, sans-serif;
- color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
- position: fixed;
- z-index:100;
- top: 0px;
- left: 0px;
- height:100%;
- width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
- background-color:#000;
- filter:alpha(opacity=75);
- -moz-opacity: 0.75;
- opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
- position: absolute;
- height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
- position: fixed;
- background: #ffffff;
- z-index: 102;
- color:#000000;
- display:none;
- border: 4px solid #525252;
- text-align:left;
- top:50%;
- left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
- display:block;
- margin: 15px 0 0 15px;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- border-top: 1px solid #666;
- border-left: 1px solid #666;
-}
-
-#TB_caption{
- height:25px;
- padding:7px 30px 10px 25px;
- float:left;
-}
-
-#TB_closeWindow{
- height:25px;
- padding:11px 25px 10px 0;
- float:right;
-}
-
-#TB_closeAjaxWindow{
- padding:7px 10px 5px 0;
- margin-bottom:1px;
- text-align:right;
- float:right;
-}
-
-#TB_ajaxWindowTitle{
- float:left;
- padding:7px 0 5px 10px;
- margin-bottom:1px;
-}
-
-#TB_title{
- background-color:#e8e8e8;
- height:27px;
-}
-
-#TB_ajaxContent{
- clear:both;
- padding:2px 15px 15px 15px;
- overflow:auto;
- text-align:left;
- line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
- padding:15px;
-}
-
-#TB_ajaxContent p{
- padding:5px 0px 5px 0px;
-}
-
-#TB_load{
- position: fixed;
- display:none;
- height:13px;
- width:208px;
- z-index:103;
- top: 50%;
- left: 50%;
- margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
- z-index:99;
- position:fixed;
- top: 0;
- left: 0;
- background-color:#fff;
- border:none;
- filter:alpha(opacity=0);
- -moz-opacity: 0;
- opacity: 0;
- height:100%;
- width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
- position: absolute;
- height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
- clear:both;
- border:none;
- margin-bottom:-1px;
- margin-top:1px;
- _margin-bottom:1px;
-}
commit 960a352a723886329d27ef5880fa7c2c96765053
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Jun 14 13:05:45 2010 -0400
Inspect callers to default to http urls for emails
This is a decently reasonable way to magically DWIW with generated urls,
but replacing it with a better solution would be good.
diff --git a/lib/Jifty/Web.pm b/lib/Jifty/Web.pm
index 344ac4d..d254225 100644
--- a/lib/Jifty/Web.pm
+++ b/lib/Jifty/Web.pm
@@ -149,6 +149,16 @@ sub url {
# https is sticky
$uri->scheme('https') if $uri->scheme eq 'http' && Jifty->web->is_ssl;
+ # If we're generating a URL from an email (really a Jifty::Notification
+ # subclass), default to http
+ my $level = 0;
+ while ( my $class = caller($level++) ) {
+ if ( $class->isa("Jifty::Notification") ) {
+ $uri->scheme('http');
+ last;
+ }
+ }
+
$uri->scheme( $args{'scheme'} ) if defined $args{'scheme'};
return $uri->canonical->as_string;
commit 59c233bdb4391b84082d948f3db41714fc4ad8fc
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Jun 14 15:15:03 2010 -0400
Also remove the thickbox reference from main.css
diff --git a/share/web/static/css/main.css b/share/web/static/css/main.css
index 44f3c88..3ad1e2d 100644
--- a/share/web/static/css/main.css
+++ b/share/web/static/css/main.css
@@ -18,7 +18,6 @@
@import "jquery.autocomplete.css";
@import "jquery.jgrowl.css";
@import "jquery.timepickr.css";
- at import "thickbox.css";
@import "facebox.css";
@import "datetime.css";
@import "ordered-list.css";
commit 96908537b3b568492dd60a8bd4095dc873048da3
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Jun 14 15:39:15 2010 -0400
Changing JSON encoders in Jifty broke this hack
This fixes it, but the hack itself should be fixed in the near future.
diff --git a/lib/Jifty/Plugin/SetupWizard/View.pm b/lib/Jifty/Plugin/SetupWizard/View.pm
index a988171..08105f6 100644
--- a/lib/Jifty/Plugin/SetupWizard/View.pm
+++ b/lib/Jifty/Plugin/SetupWizard/View.pm
@@ -190,7 +190,7 @@ template '/__jifty/admin/setupwizard/database' => sub {
})
. ', this)';
- $onchange =~ s/PLACEHOLDER/'+this.value+'/;
+ $onchange =~ s/PLACEHOLDER/"+this.value+"/;
# Only show them drivers they have available
my (@available_drivers, @unavailable_drivers);
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list