Changeset 14664

Timestamp:

04/26/12 15:44:44 (13 months ago)

Author:

MichaelDaum

Message:

Item11435:Item9916:

• fixed proper calculation of attachment size limit
• fixed properly encoding url parameters
• fixed adding the js to the head using the right ids
• hiding image gallery settings when ImageGalleryPlugin isn't there

Location:

trunk/TopicInteractionPlugin

Files:

• lib/Foswiki/Plugins/TopicInteractionPlugin/Core.pm (modified) (4 diffs)
• pub/System/TopicInteractionPlugin/jquery.uploader.uncompressed.js (modified) (1 diff)
• pub/System/TopicInteractionPlugin/metadata.pattern.uncompressed.css (modified) (3 diffs)
• pub/System/TopicInteractionPlugin/metadata.uncompressed.js (modified) (4 diffs)
• templates/attach.topicinteraction.tmpl (modified) (2 diffs)
• templates/metadata.tmpl (modified) (3 diffs)
• templates/view.topicinteraction.tmpl (modified) (1 diff)

trunk/TopicInteractionPlugin/lib/Foswiki/Plugins/TopicInteractionPlugin/Core.pm

@@ -20 +20 @@
 use Foswiki::Sandbox ();
 use JSON ();
+use Encode ();
 
 use constant DEBUG => 0; # toggle me
@@ -198 +199 @@
 
   ($web, $topic) = Foswiki::Func::normalizeWebTopicName($web, $topic);
+  #print STDERR "topic='$topic'\n";
   unless (Foswiki::Func::topicExists($web, $topic)) {
     printJSONRPC($response, 101, "Topic $web.$topic does not exist", $id);
@@ -240 +242 @@
   }
 
-  my $queryString = $ENV{QUERY_STRING};
+  my $queryString = $ENV{QUERY_STRING} || '';
 
   foreach my $item (split(/[&;]/, $queryString)) {
@@ -258 +260 @@
 
   $value =~ s/%([\da-f]{2})/chr(hex($1))/gei;
-
   my $session = $Foswiki::Plugins::SESSION;
   my $downgradedValue = $session->UTF82SiteCharSet($value);
   $value = $downgradedValue if defined $downgradedValue;
-
+ 
   $value =~ s/^\s+//g;
   $value =~ s/\s+$//g;

trunk/TopicInteractionPlugin/pub/System/TopicInteractionPlugin/jquery.uploader.uncompressed.js

@@ -519 +519 @@
 
   /************************************************************************/
-  $(document).ready(function() {
+  $(function() {
 
     var attachFileSizeLimit = foswiki.getPreference("TopicInteractionPlugin.attachFileSizeLimit") || 0;
+    attachFileSizeLimit *= 1024;
 
     defaults = {

trunk/TopicInteractionPlugin/pub/System/TopicInteractionPlugin/metadata.pattern.uncompressed.css

@@ -1 +1 @@
 /* pattern skin adjustments */
+.foswikiAttachments table,
 .foswikiLayoutTable, 
 .foswikiNullTable {
@@ -28 +29 @@
 }
 
+.foswikiAttachments, .foswikiFormStep,
 .foswikiMetaData .foswikiFormStep {
   padding:0px;
   border:0px;
 }
+
+.foswikiAttachments .foswikiFormSteps {
+  padding:20px;
+}
+
 #patternScreen .foswikiFormSteps h2 {
   padding-left:0px;
@@ -37 +44 @@
 }
 
-.foswikiAttachments table {
-  width:auto;
-}
 
 th {
   line-height:inherit; 
 }
+
+.foswikiMetaDataHelp {
+  display:none;
+}
+.patternTopicActions {
+  padding:12px 20px;
+  border-width:1px;
+}

trunk/TopicInteractionPlugin/pub/System/TopicInteractionPlugin/metadata.uncompressed.js

@@ -448 +448 @@
       loadDialog("#foswikiAttachmentPreviewer", "attachments::previewer");
       $previewer = $("#foswikiAttachmentPreviewer"),
-      $previewer.find(".foswikiAttachmentName").text(decodeURI(attachmentOpts.filename));
+      $previewer.find(".foswikiAttachmentName").text(decodeURIComponent(attachmentOpts.filename));
       $previewer.find(".foswikiPreviewContainer").load(previewUrl, function() {
         setTimeout(function() {
@@ -484 +484 @@
 
           $.log("METADATA: show attachment editor");
-          $container.find("input[name=origfilename]").val(decodeURI(attachmentOpts.filename));
-          $container.find("input[name=filename]").val(decodeURI(attachmentOpts.filename));
-          $container.find("input[name=filecomment]").val(decodeURI(attachmentOpts.filecomment));
+          $container.find("input[name=origfilename]").val(decodeURIComponent(attachmentOpts.filename));
+          $container.find("input[name=filename]").val(decodeURIComponent(attachmentOpts.filename));
+          $container.find("input[name=filecomment]").val(decodeURIComponent(attachmentOpts.filecomment));
           $container.find(".foswikiThumbnailContainer").empty();
 
@@ -567 +567 @@
         },
         onShow: function(dialog) { 
-          dialog.container.find("#deleteAttachment").text(decodeURI(attachmentOpts.filename));
+          dialog.container.find("#deleteAttachment").text(decodeURIComponent(attachmentOpts.filename));
           dialog.container.find(".foswikiThumbnailContainer").append(thumbnail);
         },
         onSubmit: function(dialog) {
           $.blockUI({
-            message:"<h1>Deleting "+decodeURI(attachmentOpts.filename)+" ...</h1>",
+            message:"<h1>Deleting "+decodeURIComponent(attachmentOpts.filename)+" ...</h1>",
             fadeIn: 0,
             fadeOut: 0
@@ -616 +616 @@
           $container.find(".foswikiMoveOne").show();
           $container.find(".foswikiMoveMultiple").hide();
-          $container.find("input[name=filename]").val(decodeURI(attachmentOpts.filename));
+          $container.find("input[name=filename]").val(decodeURIComponent(attachmentOpts.filename));
           $container.find(".foswikiThumbnailContainer").append(thumbnail);
         },

trunk/TopicInteractionPlugin/templates/attach.topicinteraction.tmpl

@@ -1 +1 @@
 %TMPL:INCLUDE{"attach"}%
 %TMPL:INCLUDE{"metadata"}%
+
+%TMPL:DEF{"attachments::hidden"}%%URLPARAM{"attachments_hidden" default="on"}%%TMPL:END%
+%TMPL:DEF{"attachments::showuploader"}%%URLPARAM{"attachments_showuploader" default="on"}%%TMPL:END%
 
 %TMPL:DEF{"content"}%<!-- content -->
@@ -10 +13 @@
   icon="cross"
 }%
-<h1>
-  <noautolink>%MAKETEXT{"Attachments at [_1]" args="%TMPL:P{"topictitle"}%"}%</noautolink>
-  <span class='foswikiAttachmentsCount foswikiSmall foswikiGrayText'>()</span>
-</h1>
-%CLEAR%
 <div>%TMPL:P{"attachments"}%</div>
 %TMPL:P{"metadata::css"}%

trunk/TopicInteractionPlugin/templates/metadata.tmpl

@@ -60 +60 @@
 %IF{"context FlexPaperPluginEnabled" then="$percntFLEXPAPERINIT$percnt"}%<!-- -->
 %ADDTOZONE{"script" 
-  id="NATSKIN::METADATA::JS" 
+  id="METADATA::JS" 
   requires="JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::UI, JQUERYPLUGIN::UPLOAD" 
   text="<script src='%PUBURLPATH%/%SYSTEMWEB%/TopicInteractionPlugin/metadata.js'></script>"
@@ -68 +68 @@
 %TMPL:DEF{"metadata::css"}%<!-- -->
 %ADDTOZONE{"head" 
-  tag="NATSKIN::METADATA::CSS" 
+  id="METADATA::CSS" 
   requires="NATSKIN::CSS" 
   text="<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/TopicInteractionPlugin/metadata.css' media='all' />"
 }%<!-- -->
+%TMPL:P{context="ImagePluginEnabled" then="metadata::css::imageplugin"}%<!-- -->
+<!-- -->%TMPL:END%
+
+%{ ################################################################################ }%
+%TMPL:DEF{"metadata::css::imageplugin"}%<!-- -->
 %ADDTOZONE{"head"
-  tag="IMAGEPLUGIN"
-  text="<link rel='stylesheet' href='%PUBURL%/%SYSTEMWEB%/ImagePlugin/style.css' media='all' />"
+  id="IMAGEPLUGIN"
+  text="<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/ImagePlugin/style.css' media='all' />"
 }%<!-- -->%TMPL:END%
 
@@ -307 +312 @@
         <option class="foswikiOption" value="">%MAKETEXT{"Bulk action"}%</option>
         <option class="foswikiOption" value="createlink">%MAKETEXT{"Insert links"}%</option>
-        <option class="foswikiOption" value="createimagegallery">%MAKETEXT{"Create image gallery"}%</option>
+%IF{"context ImageGalleryPluginEnabled" 
+  then="        <option class='foswikiOption' value='createimagegallery'>%MAKETEXT{"Create image gallery"}%</option>"
+  else="<!-- -->"
+}%
         <option class="foswikiOption" value="download">%MAKETEXT{"Download"}%</option>
         <option class="foswikiOption" value="hide">%MAKETEXT{"Hide"}%</option>

trunk/TopicInteractionPlugin/templates/view.topicinteraction.tmpl

@@ -11 +11 @@
 <a name="topic-actions"></a>
 <div class="patternTopicActions">
-  <div class="patternTopicAction">
-    <span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span>
-  </div>
+  <span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span>
 </div>%TMPL:END%