commit a8b4356abf39d26482a34c039f5025081daeef05
parent cdab9bc70ae449d85a1cace531d69997943ad467
Author: dankert <devnull@localhost>
Date: Sun, 22 Mar 2009 22:36:32 +0100
Subaction "showprop" entfernt, da in "prop" mit aufgegangen.
Diffstat:
5 files changed, 95 insertions(+), 119 deletions(-)
diff --git a/actionClasses/FileAction.class.php b/actionClasses/FileAction.class.php
@@ -246,19 +246,8 @@ class FileAction extends ObjectAction
function prop()
{
- global $conf;
- if ( $this->file->filename == $this->file->objectid )
- $this->file->filename = '';
-
- // Eigenschaften der Datei uebertragen
- $this->setTemplateVars( $this->file->getProperties() );
- }
-
-
- function showprop()
- {
- global $conf;
+ global $conf;
if ( $this->file->filename == $this->file->objectid )
$this->file->filename = '';
@@ -267,13 +256,13 @@ class FileAction extends ObjectAction
$this->setTemplateVars( $this->file->getProperties() );
$this->setTemplateVar('size',number_format($this->file->size/1000,0,',','.').' kB' );
- $this->setTemplateVar('full_filename',$this->file->full_filename());
-
- if ( is_file($this->file->tmpfile()))
+ $this->setTemplateVar('full_filename',$this->file->full_filename());
+
+ if ( is_file($this->file->tmpfile()))
{
$this->setTemplateVar('cache_filename' ,$this->file->tmpfile());
- $this->setTemplateVar('cache_filemtime',@filemtime($this->file->tmpfile()));
- }
+ $this->setTemplateVar('cache_filemtime',@filemtime($this->file->tmpfile()));
+ }
// Alle Seiten mit dieser Datei ermitteln
$pages = $this->file->getDependentObjectIds();
diff --git a/actionClasses/FileAction.ini.php b/actionClasses/FileAction.ini.php
@@ -19,16 +19,13 @@ target=savevalue
[savevalue]
goto=show
-[showprop]
-menu=prop
-
[prop]
menu=prop
target=saveprop
editable=true
[saveprop]
-goto=showprop
+goto=prop
[size]
menu=prop
@@ -40,10 +37,10 @@ menu=prop
target=delete
[delete]
-goto=showprop
+goto=prop
[resize]
-goto=showprop
+goto=prop
[pub]
target=pubnow
@@ -87,6 +84,6 @@ goto=edit
[menu]
edit=edit,editvalue,compress,uncompress,extract
-prop=showprop,prop,size
+prop=prop,size
rights=rights,aclform
pub=pub
\ No newline at end of file
diff --git a/themes/default/templates/file/prop.tpl.src.php b/themes/default/templates/file/prop.tpl.src.php
@@ -4,23 +4,104 @@ page
row
cell
text text:global_name
- cell
+ cell class:name
input name:name size:50 class:name
row
cell
text text:global_filename
- cell
+ cell class:filename
input name:filename class:filename
row
cell
text text:file_extension
- cell
+ cell class:filename
input name:extension size:10 class:extension
+
row
cell
text text:global_description
cell
inputarea name:description class:description
+
+ row
+ cell colspan:2
+ fieldset title:message:additional_info
+ if false:mode:edit
+ row
+ cell
+ text text:global_full_filename
+ cell class:filename
+ text var:full_filename
+ row
+ cell
+ text text:FILE_SIZE
+ cell
+ text var:size
+ row
+ cell
+ text text:FILE_mimetype
+ cell class:filename
+ text var:mimetype
+
+ row
+ cell
+ text text:message:id
+ cell
+ text var:objectid
+ row
+ cell
+ text text:CACHE_FILENAME
+ cell class:filename
+ if present:cache_filename
+ text var:cache_filename
+ if present:cache_filename
+ row
+ cell
+ cell
+ image icon:el_date
+ date date:var:cache_filemtime
+ row
+ cell
+ text text:FILE_PAGES
+ cell
+ list list:pages extract:true
+ link url:url target:cms_main
+ image type:page
+ text var:name
+ newline
+ if empty:pages
+ text text:GLOBAL_NOT_FOUND
+ row
+ cell colspan:2
+ fieldset title:message:prop_userinfo
+ row
+ cell
+ text text:global_created
+ cell
+ table
+ row
+ cell
+ image icon:el_date
+ date date:var:create_date
+ cell
+ image icon:user
+ user user:var:create_user
+ row
+ cell
+ text text:global_lastchange
+ cell
+ table
+ row
+ cell
+ image icon:el_date
+ date date:var:lastchange_date
+ cell
+ image icon:user
+ user user:var:lastchange_user
+
+
+
+
row
cell colspan:2 class:act
button type:ok
diff --git a/themes/default/templates/file/showprop.tpl.src.php b/themes/default/templates/file/showprop.tpl.src.php
@@ -1,88 +0,0 @@
-page
-
- window icon:folder widths:40%,60% width:70%
- row
- cell
- text text:global_name
- cell class:name
- text var:name
- row
- cell
- text text:global_description
- cell
- text var:description
- row
- cell
- text text:global_full_filename
- cell class:filename
- text var:full_filename
- row
- cell colspan:2
- fieldset title:message:additional_info
- row
- cell
- text text:FILE_SIZE
- cell
- text var:size
- row
- cell
- text text:FILE_mimetype
- cell class:filename
- text var:mimetype
-
- row
- cell
- text text:message:id
- cell
- text text:var:objectid
- row
- cell
- text text:CACHE_FILENAME
- cell class:filename
- if present:cache_filename
- text var:cache_filename
- if present:cache_filename
- row
- cell
- cell
- image icon:el_date
- date date:var:cache_filemtime
- row
- cell
- text text:FILE_PAGES
- cell
- list list:pages extract:true
- link url:url target:cms_main
- image type:page
- text var:name
- newline
- if empty:pages
- text text:GLOBAL_NOT_FOUND
- row
- cell colspan:2
- fieldset title:message:prop_userinfo
- row
- cell
- text text:global_created
- cell
- table
- row
- cell
- image icon:el_date
- date date:var:create_date
- cell
- image icon:user
- user user:var:create_user
- row
- cell
- text text:global_lastchange
- cell
- table
- row
- cell
- image icon:el_date
- date date:var:lastchange_date
- cell
- image icon:user
- user user:var:lastchange_user
- -
\ No newline at end of file
diff --git a/themes/default/templates/file/size.tpl.src.php b/themes/default/templates/file/size.tpl.src.php
@@ -52,9 +52,7 @@ page
set var:jpeg_compression value:70
selectbox list:jpeglist name:jpeg_compression
row
- cell
- cell
- cell
+ cell colspan:3
checkbox name:copy
label for:copy
text key:copy
