From f992c56c2041617f4d6fdcb12ee0bfedd3110ac3 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Fri, 16 Mar 2012 20:11:00 +0000
Subject: [PATCH] Made updates as requested by Patrick.
---
.../controllers/LongTermStorageController.php | 2 +-
.../controllers/UserContactController.php | 6 +-
application/models/DbTable/MigrateJobs.php | 3 +-
application/views/scripts/details.phtml | 66 +++++++------------
public/css/default.css | 11 ++++
5 files changed, 40 insertions(+), 48 deletions(-)
diff --git a/application/controllers/LongTermStorageController.php b/application/controllers/LongTermStorageController.php
index d243f94..aa97f7a 100644
--- a/application/controllers/LongTermStorageController.php
+++ b/application/controllers/LongTermStorageController.php
@@ -20,7 +20,7 @@ class LongTermStorageController extends Emw_Controller_Action
$this->view->statusOptions = array(
Application_Model_DbTable_MigrateJobs::STATUS_MIGRATED => 'Unassigned',
Application_Model_DbTable_MigrateJobs::STATUS_N10_WIP => 'Active',
- Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Step Finished',
+ Application_Model_DbTable_MigrateJobs::STATUS_STORED => 'Step Finished',
);
}
diff --git a/application/controllers/UserContactController.php b/application/controllers/UserContactController.php
index 1e405a7..ef874a5 100644
--- a/application/controllers/UserContactController.php
+++ b/application/controllers/UserContactController.php
@@ -11,16 +11,16 @@ class UserContactController extends Emw_Controller_Action
->join(array('m' => 'migratejobs'), 'o.nuid = m.nuid')
->joinLeft(array('n' => 'notes_migration'), 'o.nuid = n.nuid')
->where('m.migrate_status IN(?)', array(
- Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE,
+ Application_Model_DbTable_MigrateJobs::STATUS_STORED,
Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED,
))
->order('m.stored_time');
$this->view->records = $db->query($select)->fetchAll();
$this->view->statusOptions = array(
- Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Unassigned',
+ Application_Model_DbTable_MigrateJobs::STATUS_STORED => 'Unassigned',
Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED => 'Active',
- //Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED => 'Step Finished',
+ Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Step Finished',
);
}
diff --git a/application/models/DbTable/MigrateJobs.php b/application/models/DbTable/MigrateJobs.php
index fc27c1e..a16c79d 100644
--- a/application/models/DbTable/MigrateJobs.php
+++ b/application/models/DbTable/MigrateJobs.php
@@ -10,8 +10,9 @@ class Application_Model_DbTable_MigrateJobs extends Unl_Db_Table_Abstract
const STATUS_QST_WIP = '60_QST_WIP';
const STATUS_MIGRATED = '70_MIGRATED';
const STATUS_N10_WIP = '80_N10_WIP';
- const STATUS_COMPLETE = '90_COMPLETE';
+ const STATUS_STORED = '90_STORED';
const STATUS_NOTIFIED = '95_NOTIFIED';
+ const STATUS_COMPLETE = '99_COMPLETE';
protected $_name = 'migratejobs';
protected $_primary = 'nuid';
diff --git a/application/views/scripts/details.phtml b/application/views/scripts/details.phtml
index 601a186..62349f3 100644
--- a/application/views/scripts/details.phtml
+++ b/application/views/scripts/details.phtml
@@ -1,33 +1,33 @@
<div>
-<div class="grid4">
+<div class="grid5">
<dl>
- <dt>Request Time</dt>
- <dd><?php echo $this->escape($this->request_time); ?></dd>
-
- <dt>Last Change</dt>
- <dd><?php echo $this->escape($this->lastchange); ?></dd>
-
- <dt>Status</dt>
- <dd><?php echo $this->escape($this->status); ?></dd>
-
- <dt>Details</dt>
- <dd><?php echo $this->escape($this->details); ?></dd>
+ <dt>Proxy Address</dt>
+ <dd><?php echo $this->escape($this->proxyaddr); ?></dd>
<dt>Migration</dt>
<dd><?php echo $this->escape($this->migration); ?></dd>
- <dt>NUID</dt>
- <dd><?php echo $this->escape($this->nuid); ?></dd>
+ <dt>Notes DN</dt>
+ <dd><?php echo $this->escape($this->notes_dn); ?></dd>
+
+ <dt>Notes Host</dt>
+ <dd><?php echo $this->escape($this->notes_host); ?></dd>
+
+ <dt>Notes Mailfile</dt>
+ <dd><?php echo $this->escape($this->notes_mailfile); ?></dd>
- <dt>Vmail Choice</dt>
- <dd><?php echo $this->escape($this->vmail_choice); ?></dd>
+ <dt>Archive Mailfile</dt>
+ <dd><?php echo $this->escape($this->archive_mailfile); ?></dd>
</dl>
</div>
-<div class="grid4">
- <dl>
- <dt>Migrate Status</dt>
- <dd><?php echo $this->escape($this->migrate_status); ?></dd>
+<div class="grid6">
+ <dl class="one-line">
+ <dt>Request Time</dt>
+ <dd><?php echo $this->escape($this->request_time); ?></dd>
+
+ <dt>Last Change</dt>
+ <dd><?php echo $this->escape($this->lastchange); ?></dd>
<dt>Unarchive Time</dt>
<dd><?php echo $this->escape($this->unarchive_time); ?></dd>
@@ -40,35 +40,15 @@
<dt>Stored Time</dt>
<dd><?php echo $this->escape($this->stored_time); ?></dd>
-
- <dt>Mail File Size</dt>
- <dd><?php echo $this->escape($this->mailfilesize); ?></dd>
- </dl>
-</div>
-
-<div class="grid3">
- <dl>
- <dt>Notes DN</dt>
- <dd><?php echo $this->escape($this->notes_dn); ?></dd>
-
- <dt>Notes Host</dt>
- <dd><?php echo $this->escape($this->notes_host); ?></dd>
-
- <dt>Notes Mailfile</dt>
- <dd><?php echo $this->escape($this->notes_mailfile); ?></dd>
-
- <dt>Archive Mailfile</dt>
- <dd><?php echo $this->escape($this->archive_mailfile); ?></dd>
-
- <dt>Next Step</dt>
- <dd><?php echo $this->escape($this->next_step); ?></dd>
</dl>
</div>
-</div>
<div class="clear">
<div class="grid11">
<dl>
+ <dt>Mail File Size</dt>
+ <dd><?php echo $this->formTextarea('read[' . $this->nuid . '][mailfilesize]', $this->mailfilesize, array('disabled' => 'disabled')); ?></dd>
+
<dt>Notes</dt>
<?php if (Application_Model_DbTable_MigrateRoles::currentUserCanEdit()) { ?>
<dd><?php echo $this->formTextarea('edit[' . $this->nuid . '][notes]', $this->notes); ?>
diff --git a/public/css/default.css b/public/css/default.css
index 2b04253..6e82f8f 100644
--- a/public/css/default.css
+++ b/public/css/default.css
@@ -4,3 +4,14 @@ textarea {
height: 4em;
width: 95%;
}
+
+
+dl.one-line dt {
+ float: left;
+ clear: both;
+ width: 40%;
+ white-space: nowrap;
+}
+dl.one-line dt:after {
+ content: ': ';
+}
--
GitLab