[pLog-svn] r5578 - in plog/trunk: class/action/admin class/controller locale/admin templates/admin
mark at devel.lifetype.net
mark at devel.lifetype.net
Mon Jun 25 12:03:06 EDT 2007
Author: mark
Date: 2007-06-25 12:03:06 -0400 (Mon, 25 Jun 2007)
New Revision: 5578
Added:
plog/trunk/class/action/admin/adminfriendmanagementaction.class.php
plog/trunk/templates/admin/friendmanagement.template
Removed:
plog/trunk/class/action/admin/adminfriendnetworkaction.class.php
plog/trunk/templates/admin/friendnetwork.template
Modified:
plog/trunk/class/controller/admincontrollermap.properties.php
plog/trunk/locale/admin/locale_en_UK.php
plog/trunk/locale/admin/locale_zh_CN.php
plog/trunk/locale/admin/locale_zh_TW.php
plog/trunk/templates/admin/menus.xml
plog/trunk/templates/admin/navigation.template
Log:
More updates. Friend admin panel UI almost done.
Added: plog/trunk/class/action/admin/adminfriendmanagementaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminfriendmanagementaction.class.php (rev 0)
+++ plog/trunk/class/action/admin/adminfriendmanagementaction.class.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -0,0 +1,37 @@
+<?php
+
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+ /**
+ * \ingroup Action
+ * @private
+ *
+ * Shows the menu group for the "Friend Network" option
+ */
+ class AdminFriendManagementAction extends AdminAction
+ {
+
+ /**
+ * Constructor. If nothing else, it also has to call the constructor of the parent
+ * class, BlogAction with the same parameters
+ */
+ function AdminFriendManagementAction( $actionInfo, $request )
+ {
+ $this->AdminAction( $actionInfo, $request );
+ }
+
+ /**
+ * Carries out the specified action
+ */
+ function perform()
+ {
+ // create the view, which will take care of fetching the right data
+ $this->_view = new AdminTemplatedView( $this->_blogInfo, "friendmanagement" );
+ $this->setCommonData();
+
+ // better to return true if everything fine
+ return true;
+ }
+ }
+?>
\ No newline at end of file
Deleted: plog/trunk/class/action/admin/adminfriendnetworkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminfriendnetworkaction.class.php 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/class/action/admin/adminfriendnetworkaction.class.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -1,37 +0,0 @@
-<?php
-
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
-
- /**
- * \ingroup Action
- * @private
- *
- * Shows the menu group for the "Friend Network" option
- */
- class AdminFriendNetworkAction extends AdminAction
- {
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminFriendNetworkAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- // create the view, which will take care of fetching the right data
- $this->_view = new AdminTemplatedView( $this->_blogInfo, "friendnetwork" );
- $this->setCommonData();
-
- // better to return true if everything fine
- return true;
- }
- }
-?>
\ No newline at end of file
Modified: plog/trunk/class/controller/admincontrollermap.properties.php
===================================================================
--- plog/trunk/class/controller/admincontrollermap.properties.php 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/class/controller/admincontrollermap.properties.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -332,7 +332,7 @@
$actions['updateLocation'] = 'AdminUpdateLocationAjaxAction';
$actions['addLocation'] = 'AdminAddLocationAjaxAction';
// shows a window with all the friends action
- $actions["friendNetwork"] = "AdminFriendNetworkAction";
+ $actions["friendManagement"] = "AdminFriendManagementAction";
// add this for friend group
$actions["newFriendGroup"] = "AdminNewFriendGroupAction";
$actions["addFriendGroup"] = "AdminAddFriendGroupAction";
Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/locale/admin/locale_en_UK.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -1186,7 +1186,7 @@
/// new strings in LT 1.3 ///
// friend network
-$messages['friendNetwork'] = 'Friend Network';
+$messages['friendManagement'] = 'Friend Management';
$messages['friend'] = 'Friend';
$messages['friends'] = 'Friends';
$messages['manageFriends'] = 'Friend Management';
Modified: plog/trunk/locale/admin/locale_zh_CN.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_CN.php 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/locale/admin/locale_zh_CN.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -1187,10 +1187,10 @@
/// new strings in LT 1.3 ///
// friend network
-$messages['friendNetwork'] = '好友网络';
+$messages['friendManagement'] = '好友管理';
$messages['friend'] = '好友';
$messages['friends'] = '好友';
-$messages['manageFriends'] = '好友群组管理';
+$messages['manageFriends'] = '好友管理';
$messages['newFriendGroup'] = '新增好友群组';
$messages['editFriendGroups'] = '好友群组列表';
$messages['editFriendGroup'] = '编辑好友群组';
Modified: plog/trunk/locale/admin/locale_zh_TW.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_TW.php 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/locale/admin/locale_zh_TW.php 2007-06-25 16:03:06 UTC (rev 5578)
@@ -1187,10 +1187,10 @@
/// new strings in LT 1.3 ///
// friend network
-$messages['friendNetwork'] = '好友網絡';
+$messages['friendManagement'] = '好友管理';
$messages['friend'] = '好友';
$messages['friends'] = '好友';
-$messages['manageFriends'] = '好友群組管理';
+$messages['manageFriends'] = '好友管理';
$messages['newFriendGroup'] = '新增好友群組';
$messages['editFriendGroups'] = '好友群組列表';
$messages['editFriendGroup'] = '編輯好友群組';
Added: plog/trunk/templates/admin/friendmanagement.template
===================================================================
--- plog/trunk/templates/admin/friendmanagement.template (rev 0)
+++ plog/trunk/templates/admin/friendmanagement.template 2007-06-25 16:03:06 UTC (rev 5578)
@@ -0,0 +1,5 @@
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=friendNetwork title=$locale->tr("friendManagement")}
+{$menu->generateAt("friendManagement",2)}
+</div>
+{include file="$admintemplatepath/footer.template"}
Deleted: plog/trunk/templates/admin/friendnetwork.template
===================================================================
--- plog/trunk/templates/admin/friendnetwork.template 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/templates/admin/friendnetwork.template 2007-06-25 16:03:06 UTC (rev 5578)
@@ -1,5 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=friendNetwork title=$locale->tr("friendNetwork")}
-{$menu->generateAt("friendNetwork",2)}
-</div>
-{include file="$admintemplatepath/footer.template"}
Modified: plog/trunk/templates/admin/menus.xml
===================================================================
--- plog/trunk/templates/admin/menus.xml 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/templates/admin/menus.xml 2007-06-25 16:03:06 UTC (rev 5578)
@@ -26,14 +26,14 @@
<resources url="?op=resources" andPerms="view_resources" />
</resourceCenter>
</ResourcesGroup>
- <friendNetwork url="?op=friendNetwork">
+ <friendManagement url="?op=friendManagement">
<manageFriends ignoreBreadCrumbs="1">
<newFriend url="?op=newFriend"/>
<editFriends url="?op=editFriends"/>
<newFriendGroup url="?op=newFriendGroup"/>
<editFriendGroups url="?op=editFriendGroups"/>
</manageFriends>
- </friendNetwork>
+ </friendManagement>
<controlCenter url="?op=controlCenter">
<manageSettings ignoreBreadCrumbs="1">
<blogSettings url="?op=blogSettings" andPerms="update_blog" />
Modified: plog/trunk/templates/admin/navigation.template
===================================================================
--- plog/trunk/templates/admin/navigation.template 2007-06-25 15:53:31 UTC (rev 5577)
+++ plog/trunk/templates/admin/navigation.template 2007-06-25 16:03:06 UTC (rev 5578)
@@ -13,6 +13,6 @@
{/if}
<br style="clear:both;" />
</div>
- {if $templatename != "main" && $templatename != "controlcenter" && $templatename != "adminsettings" && $templatename != "resourcesgroup" && $templatename != "friendnetwork" && $templatename != "error" && $templatename != "message" }
+ {if $templatename != "main" && $templatename != "controlcenter" && $templatename != "adminsettings" && $templatename != "resourcesgroup" && $templatename != "friendmanagement" && $templatename != "error" && $templatename != "message" }
{include file="$admintemplatepath/menutabs.template"}
{/if}
\ No newline at end of file
More information about the pLog-svn
mailing list