[MKDoc-commit] [1.6] Patch from Sam implementing file-size display for files

[chris at mkdoc.demon.co.uk]

Log Message:
-----------
[1.6] Patch from Sam implementing file-size display for files

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/flo/editor:
        File.pm
        Image.pm
        Photo.pm
    mkd/templates/component/file:
        en.html
    mkd/templates/component/image:
        en.html
    mkd/templates/component/photo:
        en.html
    mkd/templates/photo:
        en.html

-------------- next part --------------
Index: File.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/editor/File.pm,v
retrieving revision 1.9.2.23
retrieving revision 1.9.2.24
diff -Lflo/editor/File.pm -Lflo/editor/File.pm -u -r1.9.2.23 -r1.9.2.24
--- flo/editor/File.pm
+++ flo/editor/File.pm
@@ -34,7 +34,8 @@
 	     flo::editor::Mixin::compute_name
 	     flo::editor::Mixin::normalize_name
 	     flo::editor::Mixin::hr_name
-	     flo::editor::Mixin::upload_file/;
+	     flo::editor::Mixin::upload_file
+	     flo::editor::Mixin::file_size/;
 
 
 sub validate
@@ -92,7 +93,6 @@
     return $self->preferred_extension();
 }
 
-
 ##
 # $self->new;
 # -----------
Index: Photo.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/editor/Photo.pm,v
retrieving revision 1.11.2.45
retrieving revision 1.11.2.46
diff -Lflo/editor/Photo.pm -Lflo/editor/Photo.pm -u -r1.11.2.45 -r1.11.2.46
--- flo/editor/Photo.pm
+++ flo/editor/Photo.pm
@@ -35,6 +35,7 @@
 	     flo::editor::Mixin::normalize_name
 	     flo::editor::Mixin::upload_file
 	     flo::editor::Mixin::hr_name
+	     flo::editor::Mixin::file_size
 	     /;
 
 sub activate
Index: Image.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/editor/Image.pm,v
retrieving revision 1.7.2.28
retrieving revision 1.7.2.29
diff -Lflo/editor/Image.pm -Lflo/editor/Image.pm -u -r1.7.2.28 -r1.7.2.29
--- flo/editor/Image.pm
+++ flo/editor/Image.pm
@@ -33,6 +33,7 @@
 	     flo::editor::Mixin::normalize_name
 	     flo::editor::Mixin::upload_file
 	     flo::editor::Mixin::hr_name
+	     flo::editor::Mixin::file_size
 	     /;
 
 
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/component/file/Attic/en.html,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -Ltemplates/component/file/en.html -Ltemplates/component/file/en.html -u -r1.1.2.15 -r1.1.2.16
--- templates/component/file/en.html
+++ templates/component/file/en.html
@@ -180,5 +180,6 @@
       petal:content="self/title"
       petal:attributes="href self/uri"
     >wonderful-file.txt</a>
+    (<span petal:replace="self/formated_file_size"></span>)
   </p>
 </div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/component/image/Attic/en.html,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Ltemplates/component/image/en.html -Ltemplates/component/image/en.html -u -r1.1.2.9 -r1.1.2.10
--- templates/component/image/en.html
+++ templates/component/image/en.html
@@ -37,4 +37,5 @@
                        alt   self/title;
                        title self/description" 
   /></a>
+  (<span petal:replace="self/formated_file_size"></span>)
 </span>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/component/photo/Attic/en.html,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Ltemplates/component/photo/en.html -Ltemplates/component/photo/en.html -u -r1.1.2.7 -r1.1.2.8
--- templates/component/photo/en.html
+++ templates/component/photo/en.html
@@ -19,4 +19,5 @@
      longdesc="#"
      petal:attributes="src self/uri_small; alt self/title; longdesc self/uri_html" 
   /></a>
+    (<span petal:replace="self/formated_file_size"></span>)
 </span>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/photo/Attic/en.html,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -Ltemplates/photo/en.html -Ltemplates/photo/en.html -u -r1.1.2.27 -r1.1.2.28
--- templates/photo/en.html
+++ templates/photo/en.html
@@ -336,7 +336,16 @@
              petal:content="self/component/coverage"
            >Coverage</span>
          </li>
-
+         <li>
+           <strong
+             xml:lang="en"
+             lang="en"
+             dir="ltr"
+           >Size:</strong>
+           <span
+             petal:content="self/component/formated_file_size"
+           >Size</span>
+         </li>
        </ul>