[pLog-svn] r3024 - in plog/trunk: class/action/admin
class/action/admin/chooser class/controller class/view/admin
locale templates/admin templates/admin/chooser
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sun Mar 5 17:58:36 GMT 2006
Author: oscar
Date: 2006-03-05 17:58:36 +0000 (Sun, 05 Mar 2006)
New Revision: 3024
Added:
plog/trunk/class/action/admin/chooser/
plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php
plog/trunk/class/action/admin/chooser/adminresourcelistaction.class.php
plog/trunk/class/action/admin/chooser/adminuserchooseraction.class
plog/trunk/class/action/admin/chooser/adminuserchooseraction.class.php
plog/trunk/class/action/admin/chooser/adminuserpictureselectaction.class.php
plog/trunk/templates/admin/chooser/
plog/trunk/templates/admin/chooser/footer.template
plog/trunk/templates/admin/chooser/header.template
plog/trunk/templates/admin/chooser/siteuserschooser.template
Removed:
plog/trunk/class/action/admin/adminblogtemplatechooseraction.class.php
plog/trunk/class/action/admin/adminresourcelistaction.class.php
plog/trunk/class/action/admin/adminuserpictureselectaction.class.php
Modified:
plog/trunk/class/action/admin/adminaddblogaction.class.php
plog/trunk/class/controller/admincontroller.class.php
plog/trunk/class/controller/admincontrollermap.properties.php
plog/trunk/class/view/admin/adminsiteuserslistview.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/blogtemplatechooser.template
plog/trunk/templates/admin/createblog.template
plog/trunk/templates/admin/resourcelist.template
plog/trunk/templates/admin/userpictureselect.template
Log:
organized all the little pop-up pages that allow users to 'choose' something out of a list and return the value back to the calling
form in folders class/action/admin/chooser/ and templates/admin/chooser so that they can share a common set of templates and infrastructure. The idea is to make these classes/forms generics so that they can be reused in different places. The first example is the 'user chooser' that allows to select one user from the list and return it back the opening window to fields 'userName' and 'userId'. A few more files need to be moved around, but svn wouldn't let me do it because some of the have local modifications.
Modified: plog/trunk/class/action/admin/adminaddblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddblogaction.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/adminaddblogaction.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -28,7 +28,8 @@
// data validation
$this->registerFieldValidator( "blogName", new StringValidator());
- $this->registerFieldValidator( "blogOwner", new IntegerValidator());
+ $this->registerFieldValidator( "userId", new IntegerValidator());
+ $this->registerField( "userName" );
$this->setValidationErrorView( new AdminCreateBlogView( $this->_blogInfo ));
}
@@ -36,7 +37,7 @@
{
// fetch the validated data
$this->_blogName = Textfilter::filterAllHTML($this->_request->getValue( "blogName" ));
- $this->_ownerId = $this->_request->getValue( "blogOwner" );
+ $this->_ownerId = $this->_request->getValue( "userId" );
$this->_blogProperties = $this->_request->getValue( "properties" );
// check that the user really exists
Deleted: plog/trunk/class/action/admin/adminblogtemplatechooseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogtemplatechooseraction.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/adminblogtemplatechooseraction.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,30 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatechooserview.class.php" );
-
- /**
- * \ingroup Action
- * @private
- *
- * shows a list of templates where to choose
- */
- class AdminBlogTemplateChooserAction extends BlogOwnerAdminAction
- {
-
- function AdminBlogTemplateChooserAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- // this class does nothing else than loading the view and returning control
- // to the user...
- $this->_view = new AdminBlogTemplateChooserView( $this->_blogInfo );
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Deleted: plog/trunk/class/action/admin/adminresourcelistaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminresourcelistaction.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/adminresourcelistaction.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,45 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminsimpleresourceslistview.class.php" );
-
- /**
- * \ingroup Action
- * @private
- *
- * shows a simple list with the resources so that users can choose one
- */
- class AdminResourceListAction extends AdminAction
- {
-
- var $_destination;
- var $_albumId;
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminResourceListAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
-
- $this->_destination = $this->_request->getValue( "mode" );
-
- $this->_albumId = $this->_request->getValue( "albumId" );
- if( $this->_albumId == "" )
- $this->_albumId = 0;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- $this->_view = new AdminSimpleResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_albumId));
- $this->_view->setValue( "destination", $this->_destination );
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Deleted: plog/trunk/class/action/admin/adminuserpictureselectaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminuserpictureselectaction.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/adminuserpictureselectaction.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,50 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminuserpictureselectview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-
- /**
- * \ingroup Action
- * @private
- *
- * Deletes a resource from the blog
- */
- class AdminUserPictureSelectAction extends AdminAction
- {
-
- var $_albumId;
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminUserPictureSelectAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- // if the album id is not vald, let's start from the top album again
- $this->_albumId = $this->_request->getValue( "albumId" );
- $val = new IntegerValidator();
- if( !$val->validate( $this->_albumId ))
- $this->_albumId = 0;
-
- return true;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
-
- $this->_view = new AdminUserPictureSelectView( $this->_blogInfo, Array( "albumId" => $this->_albumId ));
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php (from rev 3009, plog/trunk/class/action/admin/adminblogtemplatechooseraction.class.php)
Copied: plog/trunk/class/action/admin/chooser/adminresourcelistaction.class.php (from rev 3009, plog/trunk/class/action/admin/adminresourcelistaction.class.php)
Added: plog/trunk/class/action/admin/chooser/adminuserchooseraction.class
===================================================================
--- plog/trunk/class/action/admin/chooser/adminuserchooseraction.class 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/chooser/adminuserchooseraction.class 2006-03-05 17:58:36 UTC (rev 3024)
@@ -0,0 +1,20 @@
+<?php
+
+ include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
+
+ class AdminUserChooserAction extends SiteAdminAction
+ {
+
+ function AdminUserChooserAction( $actionInfo, $request )
+ {
+ $this->SiteAdminAction( $actionInfo, $request );
+ }
+
+ function perform()
+ {
+ // load the view in chooser mode
+ $this->_view = new AdminSiteUsersListView( $this->_blogInfo, true );
+ }
+ }
+?>
\ No newline at end of file
Added: plog/trunk/class/action/admin/chooser/adminuserchooseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/chooser/adminuserchooseraction.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/action/admin/chooser/adminuserchooseraction.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -0,0 +1,23 @@
+<?php
+
+ include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
+
+ class AdminUserChooserAction extends SiteAdminAction
+ {
+
+ function AdminUserChooserAction( $actionInfo, $request )
+ {
+ $this->SiteAdminAction( $actionInfo, $request );
+ }
+
+ function perform()
+ {
+ // load the view in chooser mode
+ $this->_view = new AdminSiteUsersListView( $this->_blogInfo, true );
+ $this->setCommonData();
+
+ return true;
+ }
+ }
+?>
\ No newline at end of file
Copied: plog/trunk/class/action/admin/chooser/adminuserpictureselectaction.class.php (from rev 3009, plog/trunk/class/action/admin/adminuserpictureselectaction.class.php)
Modified: plog/trunk/class/controller/admincontroller.class.php
===================================================================
--- plog/trunk/class/controller/admincontroller.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/controller/admincontroller.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -33,6 +33,7 @@
$this->Controller( $actionMap, $defaultActionParam );
$this->setActionFolderPath( PLOG_CLASS_PATH.'class/action/admin/' );
+ $this->setActionFolderPath( PLOG_CLASS_PATH.'class/action/admin/chooser/' );
}
/**
Modified: plog/trunk/class/controller/admincontrollermap.properties.php
===================================================================
--- plog/trunk/class/controller/admincontrollermap.properties.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/controller/admincontrollermap.properties.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -287,4 +287,6 @@
$actions["resendConfirmation"] = "AdminResendConfirmationAction";
// allow admins to control any blog
$actions["adminBlogSelect"] = "AdminAdminBlogSelectAction";
+ // generic user chooser
+ $actions["siteUsersChooser"] = "AdminUserChooserAction";
?>
Modified: plog/trunk/class/view/admin/adminsiteuserslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminsiteuserslistview.class.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/class/view/admin/adminsiteuserslistview.class.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -15,10 +15,22 @@
{
var $_status;
var $_page;
+ var $_chooserMode;
- function AdminSiteUsersListView( $blogInfo )
+ /**
+ * @param blogInfo
+ * @param chooserMode Whether this view should act in chooser mode or not. If in chooser mode,
+ * it will load a lighter template
+ */
+ function AdminSiteUsersListView( $blogInfo, $chooserMode = false )
{
- $this->AdminTemplatedView( $blogInfo, "siteusers" );
+ $this->_chooserMode = $chooserMode;
+
+ // load the normal template
+ if( !$chooserMode )
+ $this->AdminTemplatedView( $blogInfo, "siteusers" );
+ else
+ $this->AdminTemplatedView( $blogInfo, "chooser/siteuserschooser" );
}
/**
@@ -66,11 +78,17 @@
// notify the event
$this->notifyEvent( EVENT_USERS_LOADED, Array( "users" => &$blogUsers ));
- // calculate the links to the different pages
- $pager = new Pager( "?op=editSiteUsers&searchTerms=".$this->_searchTerms."&status=".$this->_status."&page=",
- $this->_page,
+ // calculate the links to the different pages based on whether we're working on chooser mode
+ // or not
+ if( !$this->_chooserMode )
+ $op = "editSiteUsers";
+ else
+ $op = "siteUsersChooser";
+
+ $pager = new Pager( "?op={$op}&searchTerms=".$this->_searchTerms."&status=".$this->_status."&page=",
+ $this->_page,
$numUsers,
- DEFAULT_ITEMS_PER_PAGE );
+ DEFAULT_ITEMS_PER_PAGE );
// and generate the view
$this->setValue( "siteusers", $siteUsers );
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/locale/locale_en_UK.php 2006-03-05 17:58:36 UTC (rev 3024)
@@ -993,4 +993,9 @@
$messages['error_comment_status'] = 'Please select comment status.';
$messages['admin_mode'] = 'Admin Mode';
$messages['administrate_user_blog'] = 'Administrate this blog';
+$messages['trackbacks_updated_ok'] = '%s trackbacks updated successfully';
+$messages['trackback_updated_ok'] = 'Trackback updated successfully';
+$messages['error_trackback_status'] = 'Please select a valid status';
+$messages['error_incorrect_user'] = 'User is not valid';
+$messages['select'] = 'Select';
?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/blogtemplatechooser.template
===================================================================
--- plog/trunk/templates/admin/blogtemplatechooser.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/blogtemplatechooser.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,41 +1,4 @@
-{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
- <link rel="stylesheet" href="styles/admin.css" type="text/css" />
- <title>{$locale->tr("admin_interface_title")}</title>
- <script type="text/javascript" src="js/ui/common.js"></script>
- <script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
- </script>
- <style>{literal}
- html,body {
- margin : 0px;
- padding : 5px;
- background : #FFFFFF;
- }
- #container
- {
- width : 450px;
- height : 450px;
- text-align : center;
- margin-left : auto;
- margin-right : auto;
- }
-.info
-{
- font : 12px verdana, tahoma, arial, sans-serif;
- margin-bottom : 5px;
- width : 420px;
-}
-#list_action_bar
-{
- width : 420px;
- padding : 4px;
-}
- {/literal}</style>
- </head>
-<body>
+{include file="$admintemplatepath/chooser/header.template"}
<div id="container">
<table class="info">
<thead>
@@ -62,5 +25,4 @@
<a href="javascript:window.close()">{$locale->tr("close")}</a>
</div>
</div>
-</body>
-</html>
\ No newline at end of file
+{include file="$admintemplatepath/chooser/footer.template"}
\ No newline at end of file
Added: plog/trunk/templates/admin/chooser/footer.template
===================================================================
--- plog/trunk/templates/admin/chooser/footer.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/chooser/footer.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -0,0 +1,2 @@
+ </form>
+</html>
\ No newline at end of file
Added: plog/trunk/templates/admin/chooser/header.template
===================================================================
--- plog/trunk/templates/admin/chooser/header.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/chooser/header.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -0,0 +1,38 @@
+{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
+ <link rel="stylesheet" href="styles/admin.css" type="text/css" />
+ <title>LifeType Admin</title>
+ <script type="text/javascript" src="js/ui/common.js"></script>
+ <script type="text/javascript">
+ var plogBaseUrl = '{$baseurl}';
+ </script>
+ <STYLE type="text/css">{literal}
+ html,body {
+ margin : 0px;
+ padding : 5px;
+ background : #FFFFFF;
+ }
+ #container
+ {
+ text-align : center;
+ margin-left : auto;
+ margin-right : auto;
+ }
+.info
+{
+ font : 12px verdana, tahoma, arial, sans-serif;
+ margin-bottom : 5px;
+ width : 560px;
+}
+#list_action_bar
+{
+ width : 560px;
+ padding : 4px;
+}
+ {/literal}</style>
+</head>
+<body>
\ No newline at end of file
Added: plog/trunk/templates/admin/chooser/siteuserschooser.template
===================================================================
--- plog/trunk/templates/admin/chooser/siteuserschooser.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/chooser/siteuserschooser.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -0,0 +1,90 @@
+{include file="$admintemplatepath/chooser/header.template"}
+ <div id="list_nav_bar">
+ <div id="list_nav_select">
+<form id="viewUsers" action="admin.php" method="post">
+ <fieldset>
+ <legend>{$locale->tr("show_by")}</legend>
+ <div class="list_nav_option">
+ <label for="status">{$locale->tr("status")}</label>
+ <br />
+ <select name="status" id="status">
+ {foreach from=$userstatus key=name item=status}
+ <option value="{$status}" {if $currentstatus == $status} selected="selected"{/if}>{$locale->tr($name)}</option>
+ {/foreach}
+ </select>
+ </div>
+
+ <div class="list_nav_option">
+ <label for="search">{$locale->tr("search_terms")}</label>
+ <br />
+ <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+ </div>
+
+ <div class="list_nav_option">
+ <br />
+ <input type="hidden" name="op" value="siteUsersChooser" />
+ <input type="submit" name="Show" value="{$locale->tr("show")}" />
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <br style="clear:both" />
+ </div>
+
+ <form id="siteUsers" action="admin.php" method="post">
+ <div id="list">
+ {include file="$admintemplatepath/successmessage.template"}
+ {include file="$admintemplatepath/errormessage.template"}
+ <table class="info" style="width:560px;">
+ <thead>
+ <tr>
+ <th style="width:25px;">UID</th>
+ <th style="width:135px;">{$locale->tr("username")}</th>
+ <th style="width:305px;">{$locale->tr("full_name")}</th>
+ <th style="width:175px;">{$locale->tr("email")}</th>
+ <th style="width:50px;">{$locale->tr("status")}</th>
+ <th style="width:90px;">{$locale->tr("actions")}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {foreach from=$siteusers item=siteuser}
+ <tr class="{cycle values="odd,even"}">
+ <td class="col_highlighted">
+ {$siteuser->getId()}
+ </td>
+ <td class="col_highlighted">
+ <a href="javascript:parent.opener.userName.value='{$siteuser->getUsername()}';parent.opener.userId.value='{$siteuser->getId()}';window.close()">
+ {$siteuser->getUsername()}
+ </a>
+ </td>
+ <td>
+ {$siteuser->getFullName()|truncate:70:"..."}
+ </td>
+ <td>
+ <a href="mailto:{$siteuser->getEmail()}">
+ {$siteuser->getEmail()}
+ </a>
+ </td>
+ <td>
+ {foreach from=$userstatus key=name item=status}
+ {if $siteuser->getStatus() == $status}
+ {if $status == 2}<span style="color:red">{$locale->tr($name)}</span>
+ {else}{$locale->tr($name)}{/if}
+ {/if}
+ {/foreach}
+ </td>
+ <td>
+ <div class="list_action_button">
+ <a href="javascript:parent.opener.userName.value='{$siteuser->getUsername()}';parent.opener.userId.value='{$siteuser->getId()}';window.close()"><img src="imgs/admin/icon_arrow-16.png" alt="{$locale->tr("select_user")}" /></a>
+ </div>
+ </td>
+ </tr>
+ {/foreach}
+ </tbody>
+ </table>
+ </div>
+ <div id="list_action_bar">
+ {include file="$admintemplatepath/adminpager.template" style=list}
+ <a href="javascript:window.close()">{$locale->tr("close")}</a>
+ </div>
+{include file="$admintemplatepath/chooser/footer.template"}
\ No newline at end of file
Modified: plog/trunk/templates/admin/createblog.template
===================================================================
--- plog/trunk/templates/admin/createblog.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/createblog.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -16,11 +16,12 @@
<label for="blogOwner">{$locale->tr("owner")}</label>
<span class="required">*</span>
<div class="formHelp">{$locale->tr("blog_owner_help")}</div>
- <select name="blogOwner" id="blogOwner">
- {foreach from=$siteusers item=user}
- <option value="{$user->getId()}">{$user->getUsername()}</option>
- {/foreach}
- </select>
+ <input type="text" name="userName" id="userName" style="width:40%" value="{$userName}" readonly="readonly" />
+ <input type="hidden" name="userId" id="userId" value="{$userId}" />
+ <a href="javascript:window.open('?op=siteUsersChooser','UserChooser','scrollbars=yes,resizable=yes,toolbar=no,height=450,width=600');">
+ {$locale->tr("select")}
+ </a>
+ {include file="$admintemplatepath/validate.template" field=userId message=$locale->tr("error_incorrect_user")}
</div>
</fieldset>
<div class="buttons">
Modified: plog/trunk/templates/admin/resourcelist.template
===================================================================
--- plog/trunk/templates/admin/resourcelist.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/resourcelist.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,54 +1,17 @@
-{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
- <link rel="stylesheet" href="styles/admin.css" type="text/css" />
- <title>LifeType Admin</title>
- {if $htmlarea}
- <script type="text/javascript" src="js/tinymce/tiny_mce_popup.js"></script>
- <script type="text/javascript">
- tinyMCE.setWindowArg('mce_windowresize', false);
- </script>
- {/if}
- <script type="text/javascript" src="js/tinymce/tiny_mce-plog-resourcelist.js"></script>
- <script type="text/javascript" src="js/ui/common.js"></script>
+{include file="$admintemplatepath/chooser/header.template"}
+{if $htmlarea}
+ <script type="text/javascript" src="js/tinymce/tiny_mce_popup.js"></script>
<script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
- var indexPage = '{$config->getValue("script_name")}';
+ tinyMCE.setWindowArg('mce_windowresize', false);
</script>
- <style>{literal}
- html,body {
- margin : 0px;
- padding-top : 5px;
- background : #FFFFFF;
- }
- #container
- {
- width : 450px;
- height : 450px;
- text-align : center;
- margin-left : auto;
- margin-right : auto;
- }
-.info
-{
- font : 12px verdana, tahoma, arial, sans-serif;
- margin-bottom : 5px;
- width : 420px;
-}
-#list_action_bar
-{
- width : 420px;
- padding : 4px;
-}
+{/if}
+<style>{literal}
#resource_list_upload
{
border-bottom : 4px solid #DEDEDE;
border-collapse: collapse;
}
- {/literal}</style>
- </head>
-<body>
+{/literal}</style>
<div id="list_nav_bar">
<div id="list_nav_select">
<form id="resourceListAlbum" action="admin.php" method="post">
@@ -187,5 +150,4 @@
</div>
<a name="upload"></a>
</div>
-</body>
-</html>
+{include file="$admintemplatepath/chooser/header.template"}
\ No newline at end of file
Modified: plog/trunk/templates/admin/userpictureselect.template
===================================================================
--- plog/trunk/templates/admin/userpictureselect.template 2006-03-05 17:51:33 UTC (rev 3023)
+++ plog/trunk/templates/admin/userpictureselect.template 2006-03-05 17:58:36 UTC (rev 3024)
@@ -1,43 +1,4 @@
-{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
- <link rel="stylesheet" href="styles/admin.css" type="text/css" />
- <title>{$locale->tr("admin_interface_title")}</title>
- <script type="text/javascript" src="js/ui/common.js"></script>
- <script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
- </script>
- <STYLE type="text/css">{literal}
- html,body {
- margin : 0px;
- padding : 5px;
- background : #FFFFFF;
- }
- #container
- {
- width : 450px;
- height : 450px;
- text-align : center;
- margin-left : auto;
- margin-right : auto;
- }
-.info
-{
- font : 12px verdana, tahoma, arial, sans-serif;
- margin-bottom : 5px;
- width : 420px;
-}
-#list_action_bar
-{
- width : 420px;
- padding : 4px;
-}
- {/literal}</style>
- </head>
-<body>
+{include file="$admintemplatepath/chooser/header.template"}
<div id="list_nav_bar">
<div id="list_nav_select">
<form id="resourceListAlbum" action="admin.php" method="post">
@@ -115,5 +76,4 @@
<a href="javascript:window.close()">{$locale->tr("close")}</a>
</div>
</div>
-</body>
-</html>
\ No newline at end of file
+{include file="$admintemplatepath/chooser/footer.template"}
\ No newline at end of file
More information about the pLog-svn
mailing list