commit 81790875f1ec773bcde3b15263ff2b97cef677f1
parent 9d6e63ac6965aae9938551f95aed7d00bb5a4e48
Author: Jan Dankert <devnull@localhost>
Date: Wed, 24 Oct 2012 00:05:02 +0200
Fix: Änderung der Reihenfolge in Ordnern.
Diffstat:
4 files changed, 35 insertions(+), 148 deletions(-)
diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php
@@ -1089,7 +1089,7 @@ class FolderAction extends ObjectAction
* Anzeige aller Objekte in diesem Ordner.
* @return unknown_type
*/
- function contentView()
+ public function contentView()
{
global $conf_php;
@@ -1241,7 +1241,9 @@ class FolderAction extends ObjectAction
-
+ /**
+ * Reihenfolge bearbeiten.
+ */
function orderView()
{
global $conf_php;
@@ -1307,13 +1309,19 @@ class FolderAction extends ObjectAction
}
-
- function propView()
+
+ /**
+ * Eigenschaften anzeigen.
+ */
+ public function propView()
{
$this->setTemplateVars( $this->folder->getProperties() );
}
- function infoView()
+ /**
+ * Infos anzeigen.
+ */
+ public function infoView()
{
$this->setTemplateVars( $this->folder->getProperties() );
$this->setTemplateVar( 'full_filename',$this->folder->full_filename() );
@@ -1382,16 +1390,9 @@ class FolderAction extends ObjectAction
$this->setTemplateVar('outline',$structure);
}
-
-
-
- function remove()
- {
- $this->setTemplateVars( $this->folder->getProperties() );
- }
- function pubView()
+ public function pubView()
{
// Schalter nur anzeigen, wenn sinnvoll
$this->setTemplateVar('files' ,count($this->folder->getFiles()) > 0 );
@@ -1405,7 +1406,7 @@ class FolderAction extends ObjectAction
}
- function pubPost()
+ public function pubPost()
{
if ( !$this->folder->hasRight( ACL_PUBLISH ) )
die('no rights for publish');
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -291,7 +291,7 @@ function registerViewEvents( viewEl )
{
var order = [];
$(ui.item).closest('table.sortable').find('tbody > tr.data').each( function() {
- var objectid = $(this).data('id').substring(2);
+ var objectid = $(this).data('id');
order.push( objectid );
});
var url = './dispatcher.php';
@@ -304,7 +304,7 @@ function registerViewEvents( viewEl )
$.ajax( { 'type':'POST',url:url, data:params, success:function(data, textStatus, jqXHR)
{
- doResponse(data,textStatus,form);
+ doResponse(data,textStatus,ui);
},
error:function(jqXHR, textStatus, errorThrown) {
alert( errorThrown );
diff --git a/themes/default/templates/folder/order.tpl.src.xml b/themes/default/templates/folder/order.tpl.src.xml
@@ -1,81 +1,44 @@
<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
<header back="true"></header>
- <text text="GLOBAL_FOLDER_DESC"></text>
<input type="hidden" name="token" default="function:token"></input>
<table class="sortable">
<row class="headline">
- <column class="help" colspan="4">
- <link type="url" url="var:flip_url" title="message:FOLDER_FLIP">
+ <column class="help clickable">
+ <link type="post" action="folder" subaction="reorder" var1="type"
+ value1="flip" title="message:FOLDER_FLIP">
<text key="FOLDER_ORDER"></text>
</link>
</column>
- <column class="help">
- <link type="url" url="var:orderbytype_url" title="message:FOLDER_ORDERBYTYPE">
+ <column class="help clickable">
+ <link type="post" action="folder" subaction="reorder" var1="type"
+ value1="type" title="message:FOLDER_ORDERBYTYPE">
<text key="GLOBAL_TYPE"></text>
</link>
- <text raw="_/_"></text>
- <link type="url" url="var:orderbyname_url" title="message:FOLDER_ORDERBYNAME">
+ </column>
+ <column class="help clickable">
+ <link type="post" action="folder" subaction="reorder" var1="type"
+ value1="name" title="message:FOLDER_ORDERBYNAME">
<text key="GLOBAL_NAME"></text>
</link>
</column>
- <column class="help">
- <link type="url" url="var:orderbylastchange_url" title="message:FOLDER_ORDERBYLASTCHANGE">
+ <column class="help clickable">
+ <link type="post" action="folder" subaction="reorder" var1="type"
+ value1="lastchange" title="message:FOLDER_ORDERBYLASTCHANGE">
<text key="GLOBAL_LASTCHANGE"></text>
</link>
</column>
</row>
<list list="object" extract="true">
- <row class="data" id="o_{id}">
- <column width="3%">
- <if present="upurl">
- <link type="url" url="var:upurl" title="GLOBAL_UP">
- <set var="bild" value="arrow_up"></set>
- <image file="var:bild"></image>
- </link>
- </if>
- <if empty="upurl">
- <text raw="_"></text>
- </if>
- </column>
- <column width="3%">
- <if present="topurl">
- <link type="url" url="var:topurl" title="GLOBAL_TOP">
- <set var="bild" value="arrow_top"></set>
- <image file="var:bild"></image>
- </link>
- </if>
- <if empty="topurl">
- <text raw="_"></text>
- </if>
- </column>
- <column width="3%">
- <if present="bottomurl">
- <link type="url" url="var:bottomurl" title="GLOBAL_BOTTOM">
- <set var="bild" value="arrow_bottom"></set>
- <image file="var:bild"></image>
- </link>
- </if>
- <if empty="bottomurl">
- <text raw="_"></text>
- </if>
- </column>
- <column width="3%">
- <if present="downurl">
- <link type="url" url="var:downurl" title="GLOBAL_DOWN">
- <set var="bild" value="arrow_down"></set>
- <image file="var:bild"></image>
- </link>
- </if>
- <if empty="downurl">
- <text raw="_"></text>
- </if>
+ <row class="data" id="var:id">
+ <column>
+ <text raw="_"></text>
</column>
- <column width="40%">
+ <column colspan="2">
<image type="var:icon"></image>
<text var="name"></text>
</column>
- <column width="18%">
+ <column>
<date date="var:date"></date>
</column>
</row>
diff --git a/themes/default/templates/folder/select.tpl.src.xml b/themes/default/templates/folder/select.tpl.src.xml
@@ -1,76 +0,0 @@
-<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
- <dummy>
- <form action="folder" subaction="multiple">
- <hidden name="ids"></hidden>
- <hidden name="type"></hidden>
- <window>
- <table>
- <row>
- <column class="help">
- <text raw="_"></text>
- </column>
- <column class="help">
- <text text="GLOBAL_NAME"></text>
- </column>
- </row>
- <list list="objectlist" extract="true">
- <row class="data">
- <column>
- <image icon="var:type"></image>
- </column>
- <column>
- <text var="name"></text>
- <text raw="_"></text>
- </column>
- </row>
- </list>
- <if present="folder">
- <row>
- <column colspan="2">
- <group title="message:folder_select_target_folder"></group>
- </column>
- </row>
- <list list="folder">
- <row class="data">
- <column>
- <radio name="targetobjectid" value="var:list_key"></radio>
- </column>
- <column>
- <label for="targetobjectid_{list_key}">
- <text var="list_value"></text>
- </label>
- </column>
- </row>
- </list>
- </if>
- <if present="ask_filename">
- <row>
- <column colspan="2">
- <input name="filename"></input>
- </column>
- </row>
- </if>
- <if present="ask_commit">
- <row>
- <column colspan="2">
- <group title="message:options">
- <checkbox name="commit"></checkbox>
- <label for="commit">
- <text key="FOLDER_SELECT_DELETE_COMMIT"></text>
- </label>
- </group>
- </column>
- </row>
- </if>
- <row>
- <column class="act" colspan="2">
- <button type="ok"></button>
- </column>
- </row>
- </table>
- </window>
- </form>
- <dummy></dummy>
- </dummy>
-</output>-
\ No newline at end of file
