Added top menu, tabbed browsing. The beginnings of the context page and the user...

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@39 06cd67b6-e706-0410-b29e-9de616bca6e9

diff --git a/contexts.php b/contexts.php
index 42d6099..d9c7299 100644 (file)
--- a/contexts.php
+++ b/contexts.php
@@ -3,12 +3,8 @@ if (!defined(SHOUT_BASE)) {
     define(SHOUT_BASE, dirname(__FILE__));
 }
 
-require_once SHOUT_BASE . "/lib/base.php";
-require_once SHOUT_BASE . "/lib/Shout.php";
-
-# Get list of available contexts from the driver
-$contexts = $shout->getContexts();
-if (is_a($contexts, 'PEAR_Error')) {
+# Check that we are properly initialized
+if (!isset($contexts) || is_a($contexts, 'PEAR_Error')) {
     $notification->push(_("Internal error viewing requested page"),
                         'horde.error');
 }
@@ -19,11 +15,15 @@ system.", 'horde.error'));
     exit();
 } elseif (count($contexts) == 1) {
     header("Location: " .
-        Horde::applicationUrl("users.php?context=$contexts[0]"));
+        Horde::applicationUrl("index.php?context=$contexts[0]&section=users"));
     exit();
 }
 
+$notification->notify();
+
 # Print the contexts
+$toggle = false;
 foreach($contexts as $context) {
-    print "$context<br>\n";
+    include SHOUT_TEMPLATES . "/context/contextline.inc";
+    $toggle = !$toggle;
 }
\ No newline at end of file

diff --git a/index.php b/index.php
index 02724d7..9b90c09 100644 (file)
--- a/index.php
+++ b/index.php
@@ -23,42 +23,65 @@ require_once SHOUT_BASE . '/lib/Shout.php';
 require_once 'Horde/Variables.php';
 require_once 'Horde/Text/Filter.php';
 
+$context = Util::getFormData("context");
+$section = Util::getFormData("section");
+
 $contexts = $shout->getContexts();
 $vars = &Variables::getDefaultVariables();
 #$ticket->setDetails($vars);
 
-$title = '[#' . $ticket->getId() . '] ' . $ticket->get('summary');
-require WHUPS_TEMPLATES . '/common-header.inc';
-require WHUPS_TEMPLATES . '/menu.inc';
-require WHUPS_TEMPLATES . '/prevnext.inc';
+#$title = '[#' . $ticket->getId() . '] ' . $ticket->get('summary');
+require SHOUT_TEMPLATES . '/common-header.inc';
+require SHOUT_TEMPLATES . '/menu.inc';
 
-$tabs = &Whups::getTicketTabs($vars);
-$tabs->preserve('id', $ticket->getId());
+$tabs = &Shout::getTabs($vars);
+$tabs->preserve('context', $context);
 echo $tabs->render();
 
-$form = &new TicketDetailsForm($vars);
-$form->addAttributes($whups->getAllTicketAttributesWithNames($ticket->getId()));
+switch ($section) {
+    case "contexts":
+        require "contexts.php";
+        break;
 
-$RENDERER = &new Horde_Form_Renderer();
-$RENDERER->beginInactive($title);
-$RENDERER->renderFormInactive($form, $vars);
-$RENDERER->end();
+    case "users":
+        require "users.php";
+        break;
 
-echo '<br />';
+    case "moh":
+        require "moh.php";
+        break;
 
-$COMMENT = &new Comment();
-$COMMENT->begin(_("History"));
-$history = Whups::permissionsFilter($whups->getHistory($ticket->getId()),
-                                    'comment', PERMS_READ);
-$chtml = array();
-foreach ($history as $comment_values) {
-    $chtml[] = $COMMENT->render(new Variables($comment_values));
-}
-if ($prefs->getValue('comment_sort_dir')) {
-    $chtml = array_reverse($chtml);
+    case "global":
+        require "global.php";
+        break;
+
+    default:
+        break;
 }
-echo implode('', $chtml);
-$COMMENT->end();
+// $form = &new TicketDetailsForm($vars);
+// $form->addAttributes($whups->getAllTicketAttributesWithNames(
+//    $ticket->getId()));
+//
+// $RENDERER = &new Horde_Form_Renderer();
+// $RENDERER->beginInactive($title);
+// $RENDERER->renderFormInactive($form, $vars);
+// $RENDERER->end();
+//
+// echo '<br />';
+//
+// $COMMENT = &new Comment();
+// $COMMENT->begin(_("History"));
+// $history = Whups::permissionsFilter($whups->getHistory($ticket->getId()),
+//                                     'comment', PERMS_READ);
+// $chtml = array();
+// foreach ($history as $comment_values) {
+//     $chtml[] = $COMMENT->render(new Variables($comment_values));
+// }
+// if ($prefs->getValue('comment_sort_dir')) {
+//     $chtml = array_reverse($chtml);
+// }
+// echo implode('', $chtml);
+// $COMMENT->end();
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
 

diff --git a/shout.webprj b/shout.webprj
index 82bd623..b291d09 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -9,31 +9,36 @@
     <item url="templates/" uploadstatus="2" />
     <item url="lib/" uploadstatus="2" />
     <item url="lib/Driver/" uploadstatus="2" />
-    <item modified_time="1120084658" url="lib/Driver/ldap.php" uploadstatus="2" />
-    <item modified_time="1120073766" url="lib/base.php" uploadstatus="2" />
-    <item modified_time="1120083975" url="lib/Driver.php" uploadstatus="2" />
-    <item modified_time="1120084132" url="contexts.php" uploadstatus="2" />
-    <item modified_time="1120077061" url="index.php" uploadstatus="2" />
+    <item modified_time="1120174215" url="lib/Driver/ldap.php" uploadstatus="2" />
+    <item modified_time="1120171344" url="lib/base.php" uploadstatus="2" />
+    <item modified_time="1120174564" url="lib/Driver.php" uploadstatus="2" />
+    <item modified_time="1120169139" url="contexts.php" uploadstatus="2" />
+    <item modified_time="1120163478" url="index.php" uploadstatus="2" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="picasso.v-office.biz" remote_port="" remote_path="/srv/vhost/users/aklang/sites/intranet.v-office.biz/shout" remote_protocol="sftp" user="aklang" name="Shout" >
         <uploadeditem upload_time="0" url="config/" />
         <uploadeditem upload_time="1120073766" url="config/conf.xml" />
-        <uploadeditem upload_time="1120084132" url="contexts.php" />
-        <uploadeditem upload_time="1120077061" url="index.php" />
+        <uploadeditem upload_time="1120169139" url="contexts.php" />
+        <uploadeditem upload_time="1120163478" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1120083975" url="lib/Driver.php" />
+        <uploadeditem upload_time="1120174564" url="lib/Driver.php" />
         <uploadeditem upload_time="1120022560" url="lib/Driver.php~" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1120084658" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1120174215" url="lib/Driver/ldap.php" />
         <uploadeditem upload_time="1120026921" url="lib/Driver/ldap.php~" />
-        <uploadeditem upload_time="1120084197" url="lib/Shout.php" />
-        <uploadeditem upload_time="1120073766" url="lib/base.php" />
+        <uploadeditem upload_time="1120171890" url="lib/Shout.php" />
+        <uploadeditem upload_time="1120174424" url="lib/Users.php" />
+        <uploadeditem upload_time="1120171344" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
         <uploadeditem upload_time="0" url="templates/" />
+        <uploadeditem upload_time="1120158044" url="templates/common-header.inc" />
         <uploadeditem upload_time="1120073766" url="templates/content_page" />
-        <uploadeditem upload_time="1120084144" url="users.php" />
+        <uploadeditem upload_time="0" url="templates/context/" />
+        <uploadeditem upload_time="1120169761" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="1120165707" url="templates/menu.inc" />
+        <uploadeditem upload_time="1120174608" url="users.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -55,7 +60,7 @@
     <item modified_time="1120073766" url="lib/defines.php" uploadstatus="1" />
     <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
     <item url="config/" uploadstatus="1" />
-    <item modified_time="1120084197" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1120171890" url="lib/Shout.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>Gubed</debuggerclient>
@@ -66,11 +71,17 @@
       <mailinglist address="" />
     </teamdata>
     <events/>
-    <item url="users.php" />
+    <item modified_time="1120158044" url="templates/common-header.inc" />
+    <item modified_time="1120165707" url="templates/menu.inc" />
+    <item modified_time="1120174608" url="users.php" />
+    <item url="templates/context/" />
+    <item modified_time="1120169761" url="templates/context/contextline.inc" />
+    <item modified_time="1120174424" url="lib/Users.php" />
     <treestatus>
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
       <openfolder url="templates" />
+      <openfolder url="templates/context" />
     </treestatus>
   </project>
 </webproject>

diff --git a/users.php b/users.php
index 20fbf3f..d5a60b6 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,16 +3,40 @@ if (!defined(SHOUT_BASE)) {
     define(SHOUT_BASE, dirname(__FILE__));
 }
 
-require_once SHOUT_BASE . "/lib/base.php";
-require_once SHOUT_BASE . "/lib/Shout.php";
-
-# Verify the current user has access to this context
-$context = Util::getFormData("context");
+# Check that we are properly initialized
+if (!isset($contexts) || is_a($contexts, 'PEAR_Error')) {
+    $notification->push(_("Internal error viewing requested page"),
+                        'horde.error');
+}
 
-if (!in_array($context, $shout->getContexts())) {
-    $notification->push(_("You do not have permission to access this system.",
-        'horde.error'));
-    exit();
+if (!in_array($context, $contexts)) {
+    $notification->push("You do not have permission to access this system.",
+        'horde.error');
 }
+$notification->notify();
+require_once SHOUT_BASE . "/lib/Users.php";
+
+$RENDERER = &new Horde_Form_Renderer();
+$empty = '';
+$vars = &Variables::getDefaultVariables($empty);
+$formname = $vars->get('formname');
+
+$title = "Users";
+
+$form = &Horde_Form::singleton('SelectContextForm', $vars);
+$valid = $form->validate($vars, true);
+/*
+if ($valid) {
+} else {*/
+    if ($formname != 'selectcontext') {
+        $form->clearValidation();
+    }
+    $form->open($RENDERER, $vars, 'users.php', 'post');
+    $RENDERER->beginActive($form->getTitle());
+    $RENDERER->renderFormActive($form, $vars);
+    $RENDERER->submit();
+    $RENDERER->end();
+    $form->close($RENDERER);
+// }
 
 print_r($shout->getUsers($context));
\ No newline at end of file