[pLog-svn] r553 - in plog/trunk: class/action/admin
class/view/admin templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Mon Dec 20 05:42:12 GMT 2004
Author: oscar
Date: 2004-12-20 05:42:11 +0000 (Mon, 20 Dec 2004)
New Revision: 553
Added:
plog/trunk/class/view/admin/admineditresourceview.class.php
Modified:
plog/trunk/class/action/admin/adminresourceinfoaction.class.php
plog/trunk/templates/admin/resourceinfo.template
Log:
beginning of the integration work for this page, not complete yet... data cannot be updated yet!!
Modified: plog/trunk/class/action/admin/adminresourceinfoaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminresourceinfoaction.class.php 2004-12-19 17:58:30 UTC (rev 552)
+++ plog/trunk/class/action/admin/adminresourceinfoaction.class.php 2004-12-20 05:42:11 UTC (rev 553)
@@ -6,8 +6,8 @@
include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/view/admin/admineditresourceview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
@@ -27,49 +27,35 @@
function AdminNewResourceAlbumAction( $actionInfo, $request )
{
$this->AdminAction( $actionInfo, $request );
+
+ // data validation
+ $this->registerFieldValidator( "resourceId", new IntegerValidator());
+ $view = new AdminResourcesListView( $this->_blogInfo );
+ $view->setErrorMessage( $this->_locale->tr( "error_loading_resource" ));
+ $this->setValidationErrorView( $view );
}
- function validate()
- {
- $this->_resourceId = $this->_request->getValue( "resourceId" );
-
- $val = new IntegerValidator();
- if( !$val->validate( $this->_resourceId )){
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setMessage( $this->_locale->tr("error_resource_id_parameter_missing"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
/**
* Carries out the specified action
*/
function perform()
{
- $this->_view = new AdminTemplatedView( $this->_blogInfo, "newresourcealbum" );
- $this->setCommonData();
-
- // fetch the albums for this blog
- $albums = new GalleryAlbums();
- $blogAlbums = $albums->getUserAlbums( $this->_blogInfo->getId());
- $this->notifyEvent( EVENT_ALBUMS_LOADED, Array( "albums" => &$blogAlbums ));
- // and the resource itself
+ // load the resource
+ $this->_resourceId = $this->_request->getValue( "resourceId" );
$resources = new GalleryResources();
$resource = $resources->getResource( $this->_resourceId, $this->_blogInfo->getId());
- if( $resource == false ) {
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setMessage( $this->_locale->tr("error_loading_resource"));
+ if( !$resource ) {
+ $this->_view = new AdminResourcesListView( $this->_blogInfo );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_loading_resource"));
}
else {
- $this->_view = new AdminTemplatedView( $this->_blogInfo, "resourceinfo" );
+ $this->_view = new AdminEditResourceView( $this->_blogInfo );
$this->notifyEvent( EVENT_RESOURCE_LOADED, Array( "resource" => &$resource ));
$this->_view->setValue( "resource", $resource );
- $this->_view->setValue( "albums", $blogAlbums );
+ // export some useful information
+ $this->_view->setValue( "resourceDescription", $resource->getDescription());
+ $this->_view->setValue( "albumId", $resource->getAlbumId());
}
$this->setCommonData();
Added: plog/trunk/class/view/admin/admineditresourceview.class.php
===================================================================
--- plog/trunk/class/view/admin/admineditresourceview.class.php 2004-12-19 17:58:30 UTC (rev 552)
+++ plog/trunk/class/view/admin/admineditresourceview.class.php 2004-12-20 05:42:11 UTC (rev 553)
@@ -0,0 +1,29 @@
+<?php
+
+ include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+ /**
+ * shows the view that allows to see more information of a resource
+ */
+ class AdminEditResourceView extends AdminTemplatedView
+ {
+
+ function AdminEditResourceView( $blogInfo )
+ {
+ $this->AdminTemplatedView( $blogInfo, "resourceinfo" );
+ }
+
+ function render()
+ {
+ // load the nested list of albums
+ // fetch the albums for this blog
+ $albums = new GalleryAlbums();
+ $blogAlbums = $albums->getNestedAlbumList( $this->_blogInfo->getId());
+ $this->notifyEvent( EVENT_ALBUMS_LOADED, Array( "albums" => &$blogAlbums ));
+ $this->setValue( "albums", $blogAlbums );
+
+ parent::render();
+ }
+ }
+?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/resourceinfo.template
===================================================================
--- plog/trunk/templates/admin/resourceinfo.template 2004-12-19 17:58:30 UTC (rev 552)
+++ plog/trunk/templates/admin/resourceinfo.template 2004-12-20 05:42:11 UTC (rev 553)
@@ -1,64 +1,88 @@
{include file="$admintemplatepath/header.template"}
{include file="$admintemplatepath/navigation.template" showOpt=resources title=$locale->tr("resource_info")}
-<form name="regeneratePreview" method="post">
-<b><a target="_blank" href="{$url->resourceLink($resource)}">{$resource->getFileName()}</a></b>
-{if $resource->isImage()}
- (<input type="submit" name="regenerate" value="{$locale->tr("regenerate_preview")}" />)
- <input type="hidden" name="op" value="regeneratePreview" />
+<form name="updateResourceInfo" method="post">
+ <fieldset class="inputField">
+ <legend>{$locale->tr("resource_info")}</legend>
+ <div style="float:left;width:70%;border-right:1px solid #BEBEBE;">
+ <div class="field">
+ <label>{$locale->tr("file")}</label>
+ <div class="formHelp"></div>
+ <a target="_blank" href="{$url->resourceLink($resource)}">{$resource->getFileName()}</a>
+ </div>
+ <div class="field">
+ <label>{$locale->tr("information")}</label>
+ <div class="formHelp">{$locale->tr("resource_information_help")}</div>
+ {assign var=metadata value=$resource->getMetadataReader()}
+ {if $resource->isImage()}
+ {assign var=imgPath value=$url->resourcePreviewLink($resource)}
+ {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+ {$locale->tr("dimensions")}: {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+ {$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
+ {assign var=thumbnailformat value=$resource->getThumbnailFormat()}
+ {$locale->tr("thumbnail_format")}: {$locale->tr($thumbnailformat)}<br/>
+ {elseif $resource->isSound()}
+ {assign var=imgPath value="imgs/sound.gif"}
+ {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+ {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz<br/>
+ {$locale->tr("number_of_channels")}: {$metadata->getChannels()|upper}<br/>
+ {elseif $resource->isVideo()}
+ {assign var=imgPath value="imgs/video.gif"}
+ {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+ {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+ {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+ {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}<br/>
+ {$locale->tr("dimensions")}: {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+ {$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
+ {elseif $resource->isZip()}
+ {assign var=imgPath value="imgs/compressed.gif"}
+ {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("number_of_files")}: {$metadata->getTotalFiles()}<br/>
+ {$locale->tr("uncompressed_size")}: {$metadata->getUncompressedSize()} {$locale->tr("bytes")}<br/>
+ {else}
+ {assign var=imgPath value="imgs/file.gif"}
+ {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {/if}
+ </div>
+ <div class="field">
+ <label for="albumId">{$locale->tr("album")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("resource_album_help")}</div>
+ <select name="albumId">
+ {foreach from=$albums item=albumItem}
+ <option value="{$albumItem->getId()}" {if $albumItem->getId()==$albumId}selected="selected"{/if}>
+ {assign var=indentLevel value=$albumItem->getValue("level")}
+ {textformat indent=$indentLevel indent_char=" "}{$albumItem->getName()}{/textformat}
+ </option>
+ {/foreach}
+ </select>
+ </div>
+ <div class="field">
+ <label for="resourceDescription">{$locale->tr("description")}</label>
+ <div class="formHelp">{$locale->tr("resource_description_help")}</div>
+ <span class="required"></span>
+ <textarea name="resourceDescription" rows="7" cols="60">{$resource->getDescription()}</textarea>
+ </div>
+ </div>
+ <div stlye="float:left;width=25%">
+ <img src="{$imgPath}" alt="Preview" style="display:block;margin-left:auto;margin-right:auto" /><br/>
+ </div>
+ </div>
+</fieldset>
+<div class="buttons">
+ {if $resource->isImage()}
+ {** this should only appear for images... **}
+ <input type="submit" name="regenerate" value="{$locale->tr("regenerate_preview")}" />
+ {/if}
+ <input type="reset" name="reset" value="{$locale->tr("reset")}" />
+ <input type="hidden" name="op" value="updateResource" />
<input type="hidden" name="resourceId" value="{$resource->getId()}" />
+ <input type="submit" name="Update" value="{$locale->tr("update")}" />
+</div>
</form>
-{/if}
-<br/>
-{assign var=metadata value=$resource->getMetadataReader()}
-<form name="updateResourceInfo" method="post">
-{if $resource->isImage()}
- <img src="{$url->resourcePreviewLink($resource)}" alt="Preview" /><br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
- {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("dimensions")}: {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
- {$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
- {assign var=thumbnailformat value=$resource->getThumbnailFormat()}
- {$locale->tr("thumbnail_format")}: {$locale->tr($thumbnailformat)}<br/>
-{elseif $resource->isSound()}
- <img alt="Sound" src="imgs/sound.gif" height="64" width="64" style="border:0px;" /><br/>
- {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
- {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
- {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz<br/>
- {$locale->tr("number_of_channels")}: {$metadata->getChannels()|upper}<br/>
-{elseif $resource->isVideo()}
- <img alt="Video" src="imgs/video.gif" height="64" width="64" style="border:0px;" /><br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
- {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
- {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
- {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}<br/>
- {$locale->tr("dimensions")}: {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
- {$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
-{elseif $resource->isZip()}
- <img alt="Zip" src="imgs/compressed.gif" height="64" width="64" style="border:0px;" /><br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
- {$locale->tr("number_of_files")}: {$metadata->getTotalFiles()}<br/>
- {$locale->tr("uncompressed_size")}: {$metadata->getUncompressedSize()} {$locale->tr("bytes")}<br/>
-{else}
- <img alt="File" src="imgs/file.gif" height="64" width="64" style="border:0px;" /><br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
-{/if}
-<br/>
-{$locale->tr("album")}: <select name="albumId">
-{foreach from=$albums item=album}
- <option value="{$album->getId()}" {if $resource->getAlbumId() == $album->getId()} selected="selected" {/if}>{$album->getName()}</option>
-{/foreach}
-</select><br/><br/>
-{$locale->tr("description")}:<br/>
-<textarea name="resourceDescription" rows="7" cols="60">{$resource->getDescription()}</textarea>
-<br/>
-<input type="hidden" name="op" value="updateResource" />
-<input type="hidden" name="resourceId" value="{$resource->getId()}" />
-<input type="submit" name="Update" value="{$locale->tr("update")}" /><br/>
-</form>
-<br/>
-<a href="admin.php?op=resources&albumId={$resource->getAlbumId()}">{$locale->tr("back")}</a>
{include file="admin/footernavigation.template"}
{include file="admin/footer.template"}
More information about the pLog-svn
mailing list