Skip to content

Commit

Permalink
Item12180: Feedback headers must override post data. Switch to nyroMo…
Browse files Browse the repository at this point in the history
…dal V2.

git-svn-id: http://svn.foswiki.org/trunk@15968 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
TimotheLitt authored and TimotheLitt committed Nov 9, 2012
1 parent a8f15c3 commit 835827d
Show file tree
Hide file tree
Showing 9 changed files with 1,892 additions and 133 deletions.
22 changes: 14 additions & 8 deletions core/bin/configure
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,20 @@ our $session;
my $TRUE = 1;
my $FALSE = 0;

my $action = $query->param('action');
my @feedbackHeaders = (
-type => 'application/octet-stream',
'X-Foswiki-FeedbackResponse' => 'V1.0',
)
if ( $query->http('X-Foswiki-FeedbackRequest')
|| $action && $action eq 'feedbackUI' );
my $action;
my @feedbackHeaders;
if ( $query->http('X-Foswiki-FeedbackRequest') ) {
@feedbackHeaders = (
-type => 'application/octet-stream',
'X-Foswiki-FeedbackResponse' => 'V1.0',
);
$action = 'feedbackUI';
}
else {
$action = $query->param('action');
die "Invalid protocol\n" if ( defined $action && $action eq 'feedbackUI' );
}
$query->delete('action');

our $badLSC;
our $insane;
Expand All @@ -229,7 +236,6 @@ our $method = $query->request_method();
our $pathinfo = $query->path_info();
our @pathinfo;

$query->delete('action');
{
my $pinfo = $pathinfo;
$pinfo =~ s,^/,,;
Expand Down
105 changes: 0 additions & 105 deletions core/lib/Foswiki/Configure/resources/jquery.nyroModal-1.6.2.css

This file was deleted.

11 changes: 0 additions & 11 deletions core/lib/Foswiki/Configure/resources/jquery.nyroModal-1.6.2.min.js

This file was deleted.

105 changes: 105 additions & 0 deletions core/lib/Foswiki/Configure/resources/jquery.nyroModal-2.custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
.nyroModalBg {
position: fixed;
overflow: hidden;
top: 0;
left: 0;
height: 100%;
width: 100%;
background: #000;
opacity: 0.7;
}
.nmReposition {
position: absolute;
}
.nyroModalCloseButton {
top: -13px;
right: -13px;
width: 12px;
height: 12px;
text-indent: -9999em;
background: url(%RESOURCEURI%close.gif);
}
.nyroModalTitle {
top: -26px;
left: 0;
margin: 0;
font-size: 1.1em;
color: #ddd;
}
.nyroModalCont {
position: absolute;
border: 4px solid #777;
margin: 25px;
background: #fff;
}
.nyroModalCont iframe {
width: 600px;
height: 400px;
}
.nyroModalError {
border: 4px solid red;
color: red;
width: 250px;
height: 250px;
}
.nyroModalError div {
min-width: 0;
min-height: 0;
padding: 10px;
}
.nyroModalLink, .nyroModalDom, .nyroModalForm, .nyroModalFormFile {
position: relative;
padding: 10px;
min-height: 250px;
min-width: 250px;
max-width: 1000px;
}
.nyroModalImage, .nyroModalSwf, .nyroModalIframe, .nyroModalIframeForm {
position: relative;
overflow: hidden;
}
.nyroModalImage img {
vertical-align: top;
}
.nyroModalHidden {
left: -9999em;
top: -9999em;
}
.nyroModalLoad {
position: absolute;
width: 100px;
height: 100px;
background: #fff url(%RESOURCEURI%ajaxLoader.gif) no-repeat center;
padding: 0;
}
.nyroModalPrev, .nyroModalNext {
outline: none;
position: absolute;
top: 0;
height: 60%;
width: 150px;
min-height: 50px;
max-height: 300px;
cursor: pointer;
text-indent: -9999em;
background: transparent url('data:image/gif;base64,AAAA') left 20% no-repeat;
}
.nyroModalImage .nyroModalPrev, .nyroModalImage .nyroModalNext {
height: 100%;
width: 40%;
max-height: none;
}
.nyroModalPrev {
left: 0;
}
.nyroModalPrev:hover {
background-image: url(%RESOURCEURI%prev.gif);
}
.nyroModalNext {
right: 0;
background-position: right 20%;
}
.nyroModalNext:hover {
background-position: right 20%;
background-image: url(%RESOURCEURI%next.gif);
}
Loading

0 comments on commit 835827d

Please sign in to comment.