commit 45664ce0ada37a3da5e117dd6a75abac471c2a36
parent 61e08c4cb61983090d0787a904f9fe9575ae48f8
Author: dankert <devnull@localhost>
Date: Sun, 22 Mar 2009 22:49:09 +0100
Subaction "showprop" entfernt, da in "prop" mit aufgegangen.
Diffstat:
7 files changed, 100 insertions(+), 88 deletions(-)
diff --git a/actionClasses/FolderAction.class.php b/actionClasses/FolderAction.class.php
@@ -20,6 +20,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ---------------------------------------------------------------------------
// $Log$
+// Revision 1.51 2009-03-22 21:49:08 dankert
+// Subaction "showprop" entfernt, da in "prop" mit aufgegangen.
+//
// Revision 1.50 2009-03-17 01:43:19 dankert
// Auch Bilder (wieder) im gleichen Frame anzeigen.
//
@@ -1237,17 +1240,11 @@ class FolderAction extends ObjectAction
}
- function showprop()
- {
- $this->setTemplateVars( $this->folder->getProperties() );
- $this->setTemplateVar( 'full_filename',$this->folder->full_filename() );
- }
-
-
function prop()
{
$this->setTemplateVars( $this->folder->getProperties() );
+ $this->setTemplateVar( 'full_filename',$this->folder->full_filename() );
}
diff --git a/actionClasses/FolderAction.ini.php b/actionClasses/FolderAction.ini.php
@@ -18,12 +18,10 @@ goto=show
[prop]
menu=prop
target=saveprop
+editable=true
[saveprop]
-goto=showprop
-
-[showprop]
-menu=prop
+goto=prop
[remove]
menu=prop
@@ -116,5 +114,5 @@ goto=order
pub=pub
show=show,select,order
new=create,createfolder,createfile,createpage,createlink
-prop=showprop,prop
+prop=prop
rights=rights,aclform
\ No newline at end of file
diff --git a/actionClasses/LinkAction.class.php b/actionClasses/LinkAction.class.php
@@ -20,7 +20,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ---------------------------------------------------------------------------
// $Log$
-// Revision 1.9 2006-06-02 19:49:06 dankert
+// Revision 1.10 2009-03-22 21:49:08 dankert
+// Subaction "showprop" entfernt, da in "prop" mit aufgegangen.
+//
+// Revision 1.9 2006/06/02 19:49:06 dankert
// Bearbeiten von Verkn?pfungen
//
// Revision 1.8 2006/01/29 17:18:58 dankert
@@ -144,20 +147,6 @@ class LinkAction extends ObjectAction
}
- function prop2()
- {
- $this->setTemplateVars( $this->link->getProperties() );
-
- // Typ der Verkn?pfung
- $this->setTemplateVar('type' ,$this->link->getType() );
- $this->setTemplateVar('act_linkobjectid',$this->link->linkedObjectId);
- $this->setTemplateVar('url' ,$this->link->url );
-
- $this->setTemplateVar('edittarget_url',Html::url('link','edittarget',$this->link->objectid));
- }
-
-
-
function showprop()
{
$this->setTemplateVars( $this->link->getProperties() );
@@ -204,8 +193,6 @@ class LinkAction extends ObjectAction
function prop()
{
$this->setTemplateVars( $this->link->getProperties() );
-// print_r($this->link->getProperties());
-
$this->setTemplateVar('act_linkobjectid',$this->link->linkedObjectId);
}
}
\ No newline at end of file
diff --git a/actionClasses/LinkAction.ini.php b/actionClasses/LinkAction.ini.php
@@ -1,19 +1,17 @@
[default]
-goto=showprop
-
-[showprop]
-menu=prop
+goto=prop
[saveprop]
-goto=showprop
+goto=prop
[save]
-goto=showprop
+goto=prop
[prop]
menu=prop
target=saveprop
+editable=true
[edit]
menu=edit
@@ -23,7 +21,7 @@ target=save
editable=true
[delete]
-goto=showprop
+goto=prop
[remove]
menu=prop
@@ -46,5 +44,5 @@ goto=rights
[menu]
edit=edit
-prop=showprop,prop
+prop=prop
rights=rights,aclform
\ No newline at end of file
diff --git a/themes/default/templates/folder/prop.tpl.src.php b/themes/default/templates/folder/prop.tpl.src.php
@@ -10,13 +10,57 @@ page
row
cell
text text:global_filename
- cell
+ cell class:filename
input name:filename class:filename
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 key:FULL_FILENAME
+ cell colspan:2 class:filename
+ text var:full_filename
+ row
+ cell
+ text key:id
+ cell
+ text var:objectid
+ row
+ cell colspan:3
+ 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/link/prop.tpl.src.php b/themes/default/templates/link/prop.tpl.src.php
@@ -5,14 +5,50 @@ page
row
cell
text text:GLOBAL_name
- cell
+ cell class:name
input name:name class:name
row
cell
text text:GLOBAL_description
cell
inputarea name:description class:description
-
+
+ row
+ cell colspan:2
+ fieldset title:message:additional_info
+ row
+ cell
+ text key:id
+ cell
+ text var:objectid
+ 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/link/showprop.tpl.src.php b/themes/default/templates/link/showprop.tpl.src.php
@@ -1,48 +0,0 @@
-page
- window icon:link width:70% widths:40%,60%
-
- row
- cell
- text text:GLOBAL_name
- cell class:name
- text var:name
- row
- cell
- text text:GLOBAL_description
- cell
- text var:description
- row
- cell colspan:2
- fieldset title:message:additional_info
- row
- cell
- text key:id
- cell
- text var:objectid
- 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
