Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: web2project/web2project
base: 958d13df30
...
head fork: web2project/web2project
compare: 7319698407
  • 19 commits
  • 21 files changed
  • 0 commit comments
  • 1 contributor
18 classes/w2p/Theme/TitleBlock.class.php
View
@@ -114,15 +114,17 @@ public function show() {
}
$s .= '<div class="crumb"><ul>' . implode('', $crumbs) . '</ul></div>';
- $s .= '<ul class="crumb-right">';
- foreach ($this->cells2 as $c) {
- $s .= $c[2] ? $c[2] : '';
- $s .= '<li ' . ($c[0] ? " $c[0]" : '') . '>';
- $s .= $c[1] ? $c[1] : '&nbsp;';
- $s .= '</li>';
- $s .= $c[3] ? $c[3] : '';
+ if (count($this->cells2)) {
+ $s .= '<ul class="crumb-right">';
+ foreach ($this->cells2 as $c) {
+ $s .= $c[2] ? $c[2] : '';
+ $s .= '<li ' . ($c[0] ? " $c[0]" : '') . '>';
+ $s .= $c[1] ? $c[1] : '&nbsp;';
+ $s .= '</li>';
+ $s .= $c[3] ? $c[3] : '';
+ }
+ $s .= '</ul>';
}
- $s .= '</ul>';
$s .= '</div>';
}
8 includes/cleanup_functions.php
View
@@ -479,13 +479,13 @@ function showtask(&$arr, $level = 0, $notUsed = true, $today_view = false) {
$assigned_users = $arr['task_assigned_users'];
$a_u_tmp_array = array();
if ($show_all_assignees) {
- $s .= '<td>';
+ $s .= '<td class="data">';
foreach ($assigned_users as $val) {
$a_u_tmp_array[] = ('<a href="?m=admin&amp;a=viewuser&amp;user_id=' . $val['user_id'] . '"' . 'title="' . (w2PgetConfig('check_overallocation') ? $AppUI->_('Extent of Assignment') . ':' . $userAlloc[$val['user_id']]['charge'] . '%; ' . $AppUI->_('Free Capacity') . ':' . $userAlloc[$val['user_id']]['freeCapacity'] . '%' : '') . '">' . $val['assignee'] . ' (' . $val['perc_assignment'] . '%)</a>');
}
$s .= join(', <br />', $a_u_tmp_array) . '</td>';
} else {
- $s .= ('<td>' . '<a href="?m=admin&amp;a=viewuser&amp;user_id=' . $assigned_users[0]['user_id'] . '" title="' . (w2PgetConfig('check_overallocation') ? $AppUI->_('Extent of Assignment') . ':' . $userAlloc[$assigned_users[0]['user_id']]['charge'] . '%; ' . $AppUI->_('Free Capacity') . ':' . $userAlloc[$assigned_users[0]['user_id']]['freeCapacity'] . '%' : '') . '">' . $assigned_users[0]['assignee'] . ' (' . $assigned_users[0]['perc_assignment'] . '%)</a>');
+ $s .= ('<td class="data">' . '<a href="?m=admin&amp;a=viewuser&amp;user_id=' . $assigned_users[0]['user_id'] . '" title="' . (w2PgetConfig('check_overallocation') ? $AppUI->_('Extent of Assignment') . ':' . $userAlloc[$assigned_users[0]['user_id']]['charge'] . '%; ' . $AppUI->_('Free Capacity') . ':' . $userAlloc[$assigned_users[0]['user_id']]['freeCapacity'] . '%' : '') . '">' . $assigned_users[0]['assignee'] . ' (' . $assigned_users[0]['perc_assignment'] . '%)</a>');
if ($arr['assignee_count'] > 1) {
$s .= (' <a href="javascript: void(0);" onclick="toggle_users(' . "'users_" . $arr['task_id'] . "'" . ');" title="' . join(', ', $a_u_tmp_array) . '">(+' . ($arr['assignee_count'] - 1) . ')</a>' . '<span style="display: none" id="users_' . $arr['task_id'] . '">');
$a_u_tmp_array[] = $assigned_users[0]['assignee'];
@@ -2113,12 +2113,12 @@ function displayFiles($AppUI, $folder_id, $task_id, $project_id, $company_id) {
$htmlHelper->stageRowData($row);
$s .= '<tr>';
- $s .= '<td nowrap="nowrap" width="20">';
+ $s .= '<td class="data">';
if ($canEdit && (empty($latest_file['file_checkout']) || ($latest_file['file_checkout'] == 'final' && ($canEdit || $latest_file['project_owner'] == $AppUI->user_id)))) {
$s .= '<a href="./index.php?m=files&a=addedit&file_id=' . $latest_file['file_id'] . '">' . w2PshowImage('kedit.png', '16', '16', 'edit file', 'edit file', 'files') . '</a>';
}
$s .= '</td>';
- $s .= '<td nowrap="nowrap">';
+ $s .= '<td class="data">';
if ($canEdit && empty($latest_file['file_checkout'])) {
$s .= '<a href="?m=files&a=co&file_id=' . $latest_file['file_id'] . '">' . w2PshowImage('up.png', '16', '16', 'checkout', 'checkout file', 'files') . '</a>';
} else {
92 modules/admin/vw_usr_perms.php
View
@@ -215,8 +215,6 @@ function setPermItem( key, val ) {
</td><td width="50%" valign="top">
<?php if ($canEdit) { ?>
-
-<table cellspacing="1" cellpadding="2" border="0" class="std" width="100%">
<form name="frmPerms" method="post" action="?m=admin" accept-charset="utf-8">
<input type="hidden" name="del" value="0" />
<input type="hidden" name="dosql" value="do_perms_aed" />
@@ -226,51 +224,53 @@ function setPermItem( key, val ) {
<input type="hidden" name="permission_item" value="0" />
<input type="hidden" name="permission_table" value="" />
<input type="hidden" name="permission_name" value="" />
-<tr>
- <th colspan="2"><?php echo $AppUI->_('Add Permissions'); ?></th>
-</tr>
-<tr>
- <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Module'); ?>:</td>
- <td width="100%"><?php echo arraySelect($modules, 'permission_module', 'size="1" class="text"', 'grp,all', true); ?></td>
-</tr>
-<tr>
- <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Item'); ?>:</td>
- <td>
- <input type="text" name="permission_item_name" class="text" size="30" value="all" disabled="disabled" />
- <input type="button" name="" class="text" value="..." onclick="popPermItem();" />
- </td>
-</tr>
-<tr>
- <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Access'); ?>:</td>
- <td>
- <select name="permission_access" class="text">
- <option value='1'><?php echo $AppUI->_('allow'); ?></option>
- <option value='0'><?php echo $AppUI->_('deny'); ?></option>
- </select>
- </td>
-</tr>
-<?php
- foreach ($perm_list as $perm_id => $perm_name) {
-?>
-<tr>
- <td nowrap="nowrap" align='right'><?php echo $AppUI->_($perm_name); ?>:</td>
- <td>
- <input type="checkbox" name="permission_type[]" value="<?php echo $perm_id; ?>" />
- </td>
-</tr>
-<?php
- }
-?>
-<tr>
- <td>
- <input type="reset" value="<?php echo $AppUI->_('clear'); ?>" class="button" name="sqlaction" onclick="clearIt();" />
- </td>
- <td align="right">
- <input type="submit" value="<?php echo $AppUI->_('add'); ?>" class="button" name="sqlaction2" />
- </td>
-</tr>
+
+ <table cellspacing="1" cellpadding="2" border="0" class="std" width="100%">
+ <tr>
+ <th colspan="2"><?php echo $AppUI->_('Add Permissions'); ?></th>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Module'); ?>:</td>
+ <td width="100%"><?php echo arraySelect($modules, 'permission_module', 'size="1" class="text"', 'grp,all', true); ?></td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Item'); ?>:</td>
+ <td>
+ <input type="text" name="permission_item_name" class="text" size="30" value="all" disabled="disabled" />
+ <input type="button" name="" class="text" value="..." onclick="popPermItem();" />
+ </td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" align="right"><?php echo $AppUI->_('Access'); ?>:</td>
+ <td>
+ <select name="permission_access" class="text">
+ <option value='1'><?php echo $AppUI->_('allow'); ?></option>
+ <option value='0'><?php echo $AppUI->_('deny'); ?></option>
+ </select>
+ </td>
+ </tr>
+ <?php
+ foreach ($perm_list as $perm_id => $perm_name) {
+ ?>
+ <tr>
+ <td nowrap="nowrap" align='right'><?php echo $AppUI->_($perm_name); ?>:</td>
+ <td>
+ <input type="checkbox" name="permission_type[]" value="<?php echo $perm_id; ?>" />
+ </td>
+ </tr>
+ <?php
+ }
+ ?>
+ <tr>
+ <td>
+ <input type="reset" value="<?php echo $AppUI->_('clear'); ?>" class="button" name="sqlaction" onclick="clearIt();" />
+ </td>
+ <td align="right">
+ <input type="submit" value="<?php echo $AppUI->_('add'); ?>" class="button" name="sqlaction2" />
+ </td>
+ </tr>
+ </table>
</form>
-</table>
<?php } ?>
</td>
</tr>
6 modules/calendar/view.php
View
@@ -112,7 +112,7 @@ function delIt() {
<table cellspacing="1" cellpadding="2" width="100%">
<tr>
<td align="right" nowrap="nowrap"><?php echo $AppUI->_('Event Title'); ?>:</td>
- <?php echo $htmlHelper->createCell('event_name', $event->event_name); ?>
+ <?php echo $htmlHelper->createCell('event_title', $event->event_name); ?>
</tr>
<tr>
<td align="right" nowrap="nowrap"><?php echo $AppUI->_('Type'); ?>:</td>
@@ -130,11 +130,11 @@ function delIt() {
<?php } ?>
<tr>
<td align="right" nowrap="nowrap"><?php echo $AppUI->_('Starts'); ?>:</td>
- <td class="hilite"><?php echo $AppUI->formatTZAwareTime($event->event_start_date, $df . ' ' . $tf); ?></td>
+ <?php echo $htmlHelper->createCell('event_start_datetime', $event->event_start_date); ?>
</tr>
<tr>
<td align="right" nowrap="nowrap"><?php echo $AppUI->_('Ends'); ?>:</td>
- <td class="hilite"><?php echo $AppUI->formatTZAwareTime($event->event_end_date, $df . ' ' . $tf); ?></td>
+ <?php echo $htmlHelper->createCell('event_end_datetime', $event->event_end_date); ?>
</tr>
<tr>
<td align="right" nowrap="nowrap"><?php echo $AppUI->_('Recurs'); ?>:</td>
2  modules/forums/forums.class.php
View
@@ -110,7 +110,7 @@ public function getAllowedForums($user_id, $company_id, $filter = -1, $orderby =
$q->addQuery('forum_id, forum_project, forum_description, forum_owner, forum_name');
$q->addQuery('forum_moderated, forum_create_date, forum_last_date');
$q->addQuery('sum(if(c.message_parent=-1,1,0)) as forum_topics, sum(if(c.message_parent>0,1,0)) as forum_replies');
- $q->addQuery('user_username, project_name, project_color_identifier, contact_display_name as owner_name');
+ $q->addQuery('user_username, project_name, project_color_identifier, contact_display_name as owner_name, user_id');
$q->addQuery('SUBSTRING(l.message_body,1,' . $max_msg_length . ') message_body');
$q->addQuery('LENGTH(l.message_body) message_length, watch_user, l.message_parent, l.message_id');
$q->addQuery('count(distinct v.visit_message) as visit_count, count(distinct c.message_id) as message_count');
50 modules/forums/index.php
View
@@ -60,13 +60,14 @@
// TODO: This is only in place to provide an pre-upgrade-safe
// state for versions earlier than v3.0
// At some point at/after v4.0, this should be deprecated
- $fieldList = array('', 'watch_user', 'forum_name', 'forum_topics',
- 'forum_replies', 'forum_last_date');
- $fieldNames = array('', 'Watch', 'Forum Name', 'Topics',
+ $fieldList = array('watch_user', 'forum_name', 'forum_description', 'forum_owner',
+ 'forum_topics', 'forum_replies', 'forum_last_date');
+ $fieldNames = array('Watch', 'Forum Name', 'Description', 'Owner', 'Topics',
'Replies', 'Last Post Info');
$module->storeSettings('forums', 'index_list', $fieldList, $fieldNames);
}
+$columnCount = 1 + count($fieldList);
?>
<form name="watcher" action="./index.php?m=forums&f=<?php echo $f; ?>" method="post" accept-charset="utf-8">
@@ -75,6 +76,7 @@
<table class="tbl list">
<tr>
+ <th></th>
<?php
foreach ($fieldNames as $index => $name) {
?><th nowrap="nowrap">
@@ -87,21 +89,18 @@
</tr>
<?php
$p = '';
- $now = new w2p_Utilities_Date();
+
foreach ($forums as $row) {
- $message_date = intval($row['forum_last_date']) ? new w2p_Utilities_Date($row['forum_last_date']) : null;
+ $htmlHelper->stageRowData($row);
if ($p != $row['forum_project']) {
- $create_date = $AppUI->formatTZAwareTime($row['forum_create_date'], $df);
$forum_project_name = ($row['project_name']) ? $row['project_name'] : 'No associated project';
$forum_project_color = ($row['project_color_identifier']) ? bestColor($row['project_color_identifier']) : '';
?>
<tr>
- <td colspan="6" style="background-color:#<?php echo $row['project_color_identifier']; ?>">
- <a href="?m=projects&a=view&project_id=<?php echo $row['forum_project']; ?>">
- <font color="<?php echo $forum_project_color; ?>">
+ <td colspan="<?php echo $columnCount; ?>" style="background-color:#<?php echo $row['project_color_identifier']; ?>">
+ <a href="?m=projects&a=view&project_id=<?php echo $row['forum_project']; ?>" style="color:<?php echo $forum_project_color; ?>">
<strong><?php echo $forum_project_name; ?></strong>
- </font>
</a>
</td>
</tr>
@@ -110,7 +109,7 @@
}
?>
<tr>
- <td nowrap="nowrap" align="center">
+ <td class="data">
<?php if ($row["forum_owner"] == $AppUI->user_id || canAdd('forums')) { ?>
<a href="?m=forums&a=addedit&forum_id=<?php echo $row['forum_id']; ?>" title="<?php echo $AppUI->_('edit'); ?>">
<?php echo w2PshowImage('icons/stock_edit-16.png', 16, 16, ''); ?>
@@ -121,37 +120,20 @@
} ?>
</td>
- <td nowrap="nowrap" align="center">
+ <td class="data">
<input type="checkbox" name="forum_<?php echo $row['forum_id']; ?>" <?php echo $row['watch_user'] ? 'checked="checked"' : ''; ?> />
</td>
- <td>
- <span style="font-size:10pt;font-weight:bold">
- <a href="?m=forums&a=viewer&forum_id=<?php echo $row['forum_id']; ?>"><?php echo $row['forum_name']; ?></a>
- </span>
- <br /><?php echo w2p_textarea($row['forum_description']); ?>
- <br /><font color="#777777"><?php echo $AppUI->_('Owner') . ' ' . $row['owner_name']; ?>,
- <?php echo $AppUI->_('Started') . ' ' . $create_date; ?>
- </font>
- </td>
+ <?php echo $htmlHelper->createCell('forum_name', $row['forum_name']); ?>
+ <?php echo $htmlHelper->createCell('forum_description', $row['forum_description']); ?>
+ <?php echo $htmlHelper->createCell('forum_owner', $row['forum_owner']); ?>
<?php echo $htmlHelper->createCell('topic_count', $row['forum_topics']); ?>
<?php echo $htmlHelper->createCell('reply_count', $row['forum_replies']); ?>
- <td width="225">
- <?php
- if ($message_date !== null) {
- echo $AppUI->formatTZAwareTime($row['forum_last_date'], $df . ' ' . $tf);
- } else {
- echo $AppUI->_('No posts');
- } ?>
- </td>
+ <?php echo $htmlHelper->createCell('forum_last_datetime', $row['forum_last_date']); ?>
</tr>
<?php } ?>
- </table>
-
- <table width="100%" cellspacing="0" cellpadding="0" border="0" class="std">
-
<tr>
- <td align="left">
+ <td align="left" colspan="<?php echo $columnCount; ?>">
<input type="submit" class="button" value="<?php echo $AppUI->_('update watches'); ?>" />
</td>
</tr>
18 modules/links/index_table.php
View
@@ -51,6 +51,7 @@
$module->storeSettings('links', 'index_list', $fieldList, $fieldNames);
}
+$columnCount = 2 + count($fieldList);
?>
<table class="tbl list">
<tr>
@@ -79,13 +80,12 @@
}
if ($showProject) {
$s = '<tr>';
- $s .= '<td colspan="10" style="background-color:#' . $row['project_color_identifier'] . '" style="border: outset 2px #eeeeee">';
- $s .= '<font color="' . bestColor($row['project_color_identifier']) . '">';
- if ($row['link_project'] > 0)
- $s .= '<a href="?m=projects&a=view&project_id=' . $row['link_project'] . '">' . $row['project_name'] . '</a>';
- else
+ $s .= '<td colspan="' . $columnCount . '" style=" border: outset #d1d1cd 1px; background-color:#' . $row['project_color_identifier'] . ';">';
+ if ($row['link_project'] > 0) {
+ $s .= '<a href="?m=projects&a=view&project_id=' . $row['link_project'] . '" style="color:'.bestColor($row['project_color_identifier']) . '; font-weight: bold; padding-top: 2px;">' . $row['project_name'] . '</a>';
+ } else {
$s .= $row['project_name'];
- $s .= '</font>';
+ }
$s .= '</td></tr>';
echo $s;
}
@@ -93,11 +93,11 @@
$fp = $row['link_project'];
?>
<tr>
- <td nowrap="nowrap" width="20">
+ <td class="data _edit">
<?php if ($canEdit) {
echo '<a href="./index.php?m=' . $m . '&a=addedit&link_id=' . $row['link_id'] . '">' . w2PshowImage('icons/stock_edit-16.png', '16', '16') . '</a>';
}
- echo '</td><td width="20">';
+ echo '</td><td class="data">';
echo '<a href="' . $row['link_url'] . '" target="_blank">' . w2PshowImage('forward.png', '16', '16') . '</a>';
?>
</td>
@@ -112,7 +112,7 @@
if ($canEdit && 'links' != $m) { ?>
<tr>
- <td colspan="<?php echo 2 + count($fieldList); ?>" align="right" valign="top" style="background-color:#ffffff">
+ <td colspan="<?php echo $columnCount; ?>" align="right" valign="top" style="background-color:#ffffff">
<input type="button" class=button value="<?php echo $AppUI->_('new link') ?>" onClick="javascript:window.location='./index.php?m=links&a=addedit&project_id=<?php echo $project_id; ?>&task_id=<?php echo $task_id; ?>'">
</td>
</tr>
4 modules/projectdesigner/index.php
View
@@ -462,9 +462,9 @@ function calcDuration(f, start_date, end_date, duration_fld, durntype_fld) {
<table border="0" cellpadding="4" cellspacing="0" width="100%" class="std view">
<tr>
- <td style="border: outset #d1d1cd 1px; background-color:#<?php echo $obj->project_color_identifier; ?>" colspan="2">
+ <td style="border: outset #d1d1cd 1px; background-color:#<?php echo $obj->project_color_identifier; ?>" colspan="2" class="data _identifier">
<a href="javascript: void(0);" name="fp" style="display:block" onclick="expand_collapse('project', 'tblProjects');update_workspace('project');">
- <div class="left" style="font-color: <?php echo bestColor($obj->project_color_identifier); ?>; font-weight: bold; padding-top: 2px;"><?php echo $AppUI->_('Project') . ': ' . $obj->project_name; ?></div>
+ <div class="left" style="color: <?php echo bestColor($obj->project_color_identifier); ?>; font-weight: bold; padding-top: 2px;"><?php echo $AppUI->_('Project') . ': ' . $obj->project_name; ?></div>
<div class="right">
<img id="project_expand" src="<?php echo w2PfindImage('icons/expand.gif', $m); ?>" width="12" height="12" border="0"
alt="" <?php echo (isset($view_options[0]['pd_option_view_project']) ? ($view_options[0]['pd_option_view_project'] ? 'style="display:none"' : 'style="display:"') : 'style="display:none"') ?>>
2  modules/projects/departments_tab.view.projects.php
View
@@ -116,7 +116,7 @@
$actual_end_date = intval($row['project_actual_end_date']) ? new w2p_Utilities_Date($row['project_actual_end_date']) : null;
$style = (($actual_end_date > $end_date) && !empty($end_date)) ? 'style="color:red; font-weight:bold"' : '';
- $s = '<tr><td width="65" align="right" style="border: outset #eeeeee 1px;background-color:#' . $row['project_color_identifier'] . '"><font color="' . bestColor($row['project_color_identifier']) . '">' . sprintf('%.1f%%', $row['project_percent_complete']) . '</font></td>';
+ $s = '<tr><td class="data" width="65" style="border: outset #eeeeee 1px;background-color:#' . $row['project_color_identifier'] . ';color:' . bestColor($row['project_color_identifier']) . '">' . sprintf('%.1f%%', $row['project_percent_complete']) . '</td>';
$s .= $htmlHelper->createCell('project_priority', $row['project_priority']);
$s .= $htmlHelper->createCell('project_name', $row['project_name']);
$s .= $htmlHelper->createCell('project_company', $row['project_company']);
3  modules/projects/projects.class.php
View
@@ -684,9 +684,10 @@ public function getForumList()
$q->addTable('forums');
$q->addQuery('forum_id, forum_project, forum_description, forum_owner,
forum_name, forum_message_count, forum_create_date, forum_last_date,
- project_name, project_color_identifier, project_id');
+ project_name, project_color_identifier, project_id, user_id');
$q->addJoin('projects', 'p', 'project_id = forum_project', 'inner');
$q->addWhere('forum_project = ' . (int) $this->project_id);
+ $q->addJoin('users', 'u', 'u.user_id = forum_owner');
$q->addOrder('forum_project, forum_name');
return $q->loadHashList('forum_id');
9 modules/projects/vw_forums.php
View
@@ -21,8 +21,9 @@
// TODO: This is only in place to provide an pre-upgrade-safe
// state for versions earlier than v3.0
// At some point at/after v4.0, this should be deprecated
- $fieldList = array('forum_name', 'forum_message_count', 'forum_last_date');
- $fieldNames = array('Forum Name', 'Messages', 'Last Post');
+ $fieldList = array('forum_name', 'forum_description', 'forum_owner',
+ 'forum_last_date');
+ $fieldNames = array('Forum Name', 'Description', 'Owner', 'Last Post Info');
$module->storeSettings('forums', 'projects_view', $fieldList, $fieldNames);
}
@@ -34,7 +35,6 @@
<?php foreach ($fieldNames as $index => $name) { ?>
<th><?php echo $AppUI->_($fieldNames[$index]); ?></th>
<?php } ?>
- <th></th>
</tr>
<?php
if (count($forums) > 0) {
@@ -55,9 +55,8 @@
echo $htmlHelper->createCell($fieldList[$index], $row[$fieldList[$index]], $customLookups);
}
?>
- <td></td>
</tr>
- <?php
+ <?php
}
} ?>
</table>
6 modules/projects/vw_logs.php
View
@@ -148,7 +148,7 @@ function delIt2(id) {
continue;
}
- $s .= '<tr bgcolor="white" valign="top"><td>';
+ $s .= '<tr bgcolor="white" valign="top"><td class="data _edit">';
if ($canEdit) {
$s .= '<a href="?m=tasks&a=view&task_id=' . $row['task_id'] . '&tab=1&task_log_id=' . $row['task_log_id'] . '">' . w2PshowImage('icons/stock_edit-16.png', 16, 16, '') . "\n\t\t</a>";
}
@@ -158,7 +158,7 @@ function delIt2(id) {
$s .= $htmlHelper->createCell($fieldList[$index], $row[$fieldList[$index]], $customLookups);
}
- $s .= '<td>';
+ $s .= '<td class="data _delete">';
if ($canDelete) {
$s .= '<a href="javascript:delIt2(' . $row['task_log_id'] . ');" title="' . $AppUI->_('delete log') . '">' . w2PshowImage('icons/stock_delete-16.png', 16, 16, '') . '</a>';
}
@@ -169,7 +169,7 @@ function delIt2(id) {
}
$s .= '<tr bgcolor="white" valign="top">';
$s .= '<td colspan="'.($hours_index + 1).'" align="right">' . $AppUI->_('Total Hours') . ' =</td>';
-$s .= $htmlHelper->createCell('total_duration', sprintf('%.2f', $hrs));
+$s .= $htmlHelper->createCell('task_log_hours', sprintf('%.2f', $hrs));
$s .= str_repeat('<td></td>', count($fieldList) - $hours_index); ;
$s .= '</tr>';
echo $s;
56 modules/projects/vw_sub_projects.php
View
@@ -4,7 +4,6 @@
}
global $project;
-$df = $AppUI->getPref('SHDATEFORMAT');
$projectPriority = w2PgetSysVal('ProjectPriority');
$projectStatus = w2PgetSysVal('ProjectStatus');
@@ -12,19 +11,23 @@
$project->project_status = -1;
$st_projects_arr = $project->getStructuredProjects();
?>
-<table width="100%" border="0" cellpadding="5" cellspacing="1" bgcolor="black">
-<tr>
-<th width="12">&nbsp;</th>
-<th class="hilite" width="12"><?php echo $AppUI->_('ID'); ?></th>
-<th><?php echo $AppUI->_('Project'); ?></th>
-<th><?php echo $AppUI->_('Company'); ?></th>
-<th><?php echo $AppUI->_('Start'); ?></th>
-<th><?php echo $AppUI->_('End'); ?></th>
-<th><?php echo $AppUI->_('P'); ?></th>
-<th><?php echo $AppUI->_('Status'); ?></th>
-</tr>
+<table cellpadding="5" cellspacing="1" class="list subprojects">
+ <tr>
+ <th width="12">&nbsp;</th>
+ <th class="hilite" width="12"><?php echo $AppUI->_('ID'); ?></th>
+ <th><?php echo $AppUI->_('Project'); ?></th>
+ <th><?php echo $AppUI->_('Company'); ?></th>
+ <th><?php echo $AppUI->_('Start'); ?></th>
+ <th><?php echo $AppUI->_('End'); ?></th>
+ <th><?php echo $AppUI->_('P'); ?></th>
+ <th><?php echo $AppUI->_('Status'); ?></th>
+ </tr>
<?php
$s = '';
+
+$htmlHelper = new w2p_Output_HTMLHelper($AppUI);
+$customLookups = array('project_status' => $projectStatus, 'project_priority' => $projectPriority);
+
if (is_array($st_projects_arr)) {
foreach ($st_projects_arr as $project) {
$line = $project[0];
@@ -32,26 +35,25 @@
if ($line['project_id']) {
$s_project = new CProject();
$s_project->loadFull(null, $line['project_id']);
- $start_date = intval($s_project->project_start_date) ? new w2p_Utilities_Date($s_project->project_start_date) : null;
- $end_date = intval($s_project->project_end_date) ? new w2p_Utilities_Date($s_project->project_end_date) : null;
- $actual_end_date = intval($s_project->project_actual_end_date) ? new w2p_Utilities_Date($s_project->project_actual_end_date) : null;
- $style = (($actual_end_date > $end_date) && !empty($end_date)) ? 'style="color:red; font-weight:bold"' : '';
- $x++;
- $row_class = ($x % 2) ? 'style="background:#fff;"' : 'style="background:#f0f0f0;"';
- $row_classr = ($x % 2) ? 'style="background:#fff;text-align:right;"' : 'style="background:#f0f0f0;text-align:right;"';
- $s .= '<tr><td ' . $row_class . ' align="center"><a href="./index.php?m=projects&a=addedit&project_id=' . $s_project->project_id . '"><img src="' . w2PfindImage('icons/' . ($project_id == $s_project->project_id ? 'pin' : 'pencil') . '.gif') . '" border="0" alt="" /></b></a></td>';
- $s .= '<td ' . $row_classr . ' nowrap="nowrap">' . $s_project->project_id . '</td>';
+
+ $row = get_object_vars($s_project);
+ $row['company_id'] = $row['project_company'];
+ $htmlHelper->stageRowData($row);
+
+ $s .= '<tr><td><a href="./index.php?m=projects&a=addedit&project_id=' . $s_project->project_id . '"><img src="' . w2PfindImage('icons/' . ($project_id == $s_project->project_id ? 'pin' : 'pencil') . '.gif') . '" border="0" alt="" /></a></td>';
+ $s .= '<td>' . $s_project->project_id . '</td>';
if ($level) {
$sd = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', ($level - 1)) . w2PshowImage('corner-dots.gif', 16, 12) . '&nbsp;' . '<a href="./index.php?m=projects&a=view&project_id=' . $s_project->project_id . '">' . $s_project->project_name . '</a>';
} else {
$sd = '<a href="./index.php?m=projects&a=view&project_id=' . $s_project->project_id . '">' . $s_project->project_name . '</a>';
}
- $s .= '<td ' . $row_class . '>' . $sd . '</td>';
- $s .= '<td ' . $row_class . '><a href="./index.php?m=companies&a=view&company_id=' . $s_project->project_company . '">' . $s_project->company_name . '</a></td>';
- $s .= '<td ' . $row_class . ' align="center">' . ($start_date ? $start_date->format($df) : '-') . '</td>';
- $s .= '<td ' . $row_class . ' align="center">' . ($end_date ? $end_date->format($df) : '-') . '</td>';
- $s .= '<td ' . $row_class . ' align="center">' . $projectPriority[$s_project->project_priority] . '</td>';
- $s .= '<td ' . $row_class . ' align="center">' . $projectStatus[$s_project->project_status] . '</td></tr>';
+ $s .= '<td class="data _name">' . $sd . '</td>';
+ $s .= $htmlHelper->createCell('company_name', $s_project->company_name);
+ $s .= $htmlHelper->createCell('project_start_date', $s_project->project_start_date);
+ $s .= $htmlHelper->createCell('project_end_date', $s_project->project_end_date);
+ $s .= $htmlHelper->createCell('project_priority', $s_project->project_priority, $customLookups);
+ $s .= $htmlHelper->createCell('project_status', $s_project->project_status, $customLookups);
+ $s .= '</tr>';
}
}
}
2  modules/system/modules/index.php
View
@@ -110,7 +110,7 @@
$s .= $htmlHelper->createCell('na', $row['mod_ui_name']);
$s .= $htmlHelper->createCell('mod_ui_icon', $row['mod_ui_icon']);
- $s .= '<td class="_status">';
+ $s .= '<td class="data _status">';
$s .= '<img src="' . w2PfindImage('/obj/' . ($row['mod_ui_active'] ? 'dotgreen.gif' : 'dotredanim.gif')) . '" alt="" />&nbsp;';
if ($canEdit) {
$s .= '<a href="' . $query_string . '&cmd=toggleMenu">';
40 modules/system/syskeys/index.php
View
@@ -83,25 +83,25 @@ function delIt(id) {
}
<?php } ?>
</script>
-
+<div style="height: 11px;"> </div>
<form name="sysValFrm" method="post" action="?m=system&u=syskeys&a=do_sysval_aed" accept-charset="utf-8">
- <input type="hidden" name="del" value="0" />
- <table class="tbl list">
- <tr>
- <th>&nbsp;</th>
- <th><?php echo $AppUI->_('Key Type'); ?></th>
- <th><?php echo $AppUI->_('Title'); ?></th>
- <th colspan="2"><?php echo $AppUI->_('Values'); ?></th>
- <th>&nbsp;</th>
- </tr>
- <?php
- foreach ($values as $row) {
- echo showRow($row['sysval_title'], $row['sysval_key_id'], $row['sysval_title'], $row['sysval_value']);
- }
- // add in the new key row:
- if (!$sysval_id) {
- echo showRow();
- }
- ?>
- </table>
+ <input type="hidden" name="del" value="0" />
+ <table class="tbl list">
+ <tr>
+ <th>&nbsp;</th>
+ <th><?php echo $AppUI->_('Key Type'); ?></th>
+ <th><?php echo $AppUI->_('Title'); ?></th>
+ <th colspan="2"><?php echo $AppUI->_('Values'); ?></th>
+ <th>&nbsp;</th>
+ </tr>
+ <?php
+ foreach ($values as $row) {
+ echo showRow($row['sysval_title'], $row['sysval_key_id'], $row['sysval_title'], $row['sysval_value']);
+ }
+ // add in the new key row:
+ if (!$sysval_id) {
+ echo showRow();
+ }
+ ?>
+ </table>
</form>
176 modules/system/translate.php
View
@@ -37,31 +37,31 @@
$trans = array();
foreach ($english as $k => $v) {
- if ($v != '0') {
- $trans[(is_int($k) ? $v : $k)] = array('english' => $v);
- }
+ if ($v != '0') {
+ $trans[(is_int($k) ? $v : $k)] = array('english' => $v);
+ }
}
if ($lang != 'en') {
- ob_start();
- // read language files from module's locale directory preferrably
- $localeFile = W2P_BASE_DIR . '/modules/' . $modules[$module] . '/locales/' . $lang . '/' . $modules[$module] . '.inc';
- if (file_exists($localeFile)) {
- readfile($localeFile);
- } else {
- $localeFile = W2P_BASE_DIR . '/locales/' . $lang . '/' . $modules[$module] . '.inc';
- if (file_exists($localeFile)) {
- readfile($localeFile);
- }
- }
- eval("\$locale=array(" . ob_get_contents() . "\n'0');");
- ob_end_clean();
+ ob_start();
+ // read language files from module's locale directory preferrably
+ $localeFile = W2P_BASE_DIR . '/modules/' . $modules[$module] . '/locales/' . $lang . '/' . $modules[$module] . '.inc';
+ if (file_exists($localeFile)) {
+ readfile($localeFile);
+ } else {
+ $localeFile = W2P_BASE_DIR . '/locales/' . $lang . '/' . $modules[$module] . '.inc';
+ if (file_exists($localeFile)) {
+ readfile($localeFile);
+ }
+ }
+ eval("\$locale=array(" . ob_get_contents() . "\n'0');");
+ ob_end_clean();
- foreach ($locale as $k => $v) {
- if ($v != '0') {
- $trans[$k]['lang'] = $v;
- }
- }
+ foreach ($locale as $k => $v) {
+ if ($v != '0') {
+ $trans[$k]['lang'] = $v;
+ }
+ }
}
ksort($trans);
@@ -90,73 +90,73 @@
$titleBlock->addCrumb('?m=system', 'system admin');
$titleBlock->show();
?>
-
+<div style="height: 11px;"> </div>
<form action="?m=system&a=translate_save" method="post" name="editlang" accept-charset="utf-8">
-<input type="hidden" name="module" value="<?php echo $modules[$module]; ?>" />
-<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
-<table class="tbl list">
-<tr>
- <th width="15%" nowrap="nowrap"><?php echo $AppUI->_('Abbreviation'); ?></th>
- <th width="40%" nowrap="nowrap"><?php echo $AppUI->_('English String'); ?></th>
- <th width="40%" nowrap="nowrap"><?php echo $AppUI->_('String') . ': ' . $AppUI->_($locales[$lang]); ?></th>
- <th width="5%" nowrap="nowrap"><?php echo $AppUI->_('delete'); ?></th>
-</tr>
-<?php
-$s = '';
-$index = 0;
-if ($lang == 'en') {
- $s .= '<tr>';
- $s .= '<td><input type="text" name="trans[' . $index . '][abbrev]" value="" size="20" class="text" /></td>';
- $s .= '<td><input type="text" name="trans[' . $index . '][english]" value="" size="40" class="text" /></td>';
- $s .= '<td colspan="2">' . $AppUI->_('New Entry') . '</td>';
- $s .= '</tr>';
-}
+ <input type="hidden" name="module" value="<?php echo $modules[$module]; ?>" />
+ <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
+ <table class="tbl list">
+ <tr>
+ <th width="15%" nowrap="nowrap"><?php echo $AppUI->_('Abbreviation'); ?></th>
+ <th width="40%" nowrap="nowrap"><?php echo $AppUI->_('English String'); ?></th>
+ <th width="40%" nowrap="nowrap"><?php echo $AppUI->_('String') . ': ' . $AppUI->_($locales[$lang]); ?></th>
+ <th width="5%" nowrap="nowrap"><?php echo $AppUI->_('delete'); ?></th>
+ </tr>
+ <?php
+ $s = '';
+ $index = 0;
+ if ($lang == 'en') {
+ $s .= '<tr>';
+ $s .= '<td><input type="text" name="trans[' . $index . '][abbrev]" value="" size="20" class="text" /></td>';
+ $s .= '<td><input type="text" name="trans[' . $index . '][english]" value="" size="40" class="text" /></td>';
+ $s .= '<td colspan="2">' . $AppUI->_('New Entry') . '</td>';
+ $s .= '</tr>';
+ }
-$index++;
-foreach ($trans as $k => $langs) {
- $s .= '<tr><td>';
- if ($k != $langs['english']) {
- $k = w2PformSafe($k, true);
- if ($lang == 'en') {
- $s .= '<input type="text" name="trans[' . $index . '][abbrev]" value="' . $k . '" size="20" class="text" />';
- } else {
- $s .= $k;
- }
- } else {
- $s .= '&nbsp;';
- }
- $s .= '</td><td>';
- $langs['english'] = w2PformSafe($langs['english'], true);
- if ($lang == 'en') {
- if (mb_strlen($langs['english']) < 40) {
- $s .= '<input type="text" name="trans[' . $index . '][english]" value="' . $langs['english'] . '" size="40" class="text" />';
- } else {
- $rows = round(mb_strlen($langs['english'] / 35)) + 1;
- $s .= '<textarea name="trans[' . $index . '][english]" cols="40" class="small" rows="' . $rows . '">' . $langs['english'] . '</textarea>';
- }
- } else {
- $s .= $langs['english'];
- $s .= '<input type="hidden" name="trans[' . $index . '][english]" value="' . ($k ? $k : $langs['english']) . '" size="20" class="text" />';
- }
- $s .= '</td><td>';
- if ($lang != 'en') {
- $langs['lang'] = w2PformSafe($langs['lang'], true);
- if (mb_strlen($langs['lang']) < 40) {
- $s .= '<input type="text" name="trans[' . $index . '][lang]" value="' . $langs['lang'] . '" size="40" class="text" />';
- } else {
- $rows = round(mb_strlen($langs['lang'] / 35)) + 1;
- $s .= '<textarea name="trans[' . $index . '][lang]" cols="40" class="small" rows="' . $rows . '">' . $langs['lang'] . '</textarea>';
- }
- }
- $s .= '</td><td align="center"><input type="checkbox" name="trans[' . $index . '][del]" /></td></tr>';
- $index++;
-}
-echo $s;
-?>
-<tr>
- <td colspan="4" align="right">
- <input type="submit" value="<?php echo $AppUI->_('submit'); ?>" class="button" />
- </td>
-</tr>
-</table>
+ $index++;
+ foreach ($trans as $k => $langs) {
+ $s .= '<tr><td>';
+ if ($k != $langs['english']) {
+ $k = w2PformSafe($k, true);
+ if ($lang == 'en') {
+ $s .= '<input type="text" name="trans[' . $index . '][abbrev]" value="' . $k . '" size="20" class="text" />';
+ } else {
+ $s .= $k;
+ }
+ } else {
+ $s .= '&nbsp;';
+ }
+ $s .= '</td><td>';
+ $langs['english'] = w2PformSafe($langs['english'], true);
+ if ($lang == 'en') {
+ if (mb_strlen($langs['english']) < 40) {
+ $s .= '<input type="text" name="trans[' . $index . '][english]" value="' . $langs['english'] . '" size="40" class="text" />';
+ } else {
+ $rows = round(mb_strlen($langs['english'] / 35)) + 1;
+ $s .= '<textarea name="trans[' . $index . '][english]" cols="40" class="small" rows="' . $rows . '">' . $langs['english'] . '</textarea>';
+ }
+ } else {
+ $s .= $langs['english'];
+ $s .= '<input type="hidden" name="trans[' . $index . '][english]" value="' . ($k ? $k : $langs['english']) . '" size="20" class="text" />';
+ }
+ $s .= '</td><td>';
+ if ($lang != 'en') {
+ $langs['lang'] = w2PformSafe($langs['lang'], true);
+ if (mb_strlen($langs['lang']) < 40) {
+ $s .= '<input type="text" name="trans[' . $index . '][lang]" value="' . $langs['lang'] . '" size="40" class="text" />';
+ } else {
+ $rows = round(mb_strlen($langs['lang'] / 35)) + 1;
+ $s .= '<textarea name="trans[' . $index . '][lang]" cols="40" class="small" rows="' . $rows . '">' . $langs['lang'] . '</textarea>';
+ }
+ }
+ $s .= '</td><td align="center"><input type="checkbox" name="trans[' . $index . '][del]" /></td></tr>';
+ $index++;
+ }
+ echo $s;
+ ?>
+ <tr>
+ <td colspan="4" align="right">
+ <input type="submit" value="<?php echo $AppUI->_('submit'); ?>" class="button" />
+ </td>
+ </tr>
+ </table>
</form>
2  modules/tasks/vw_logs.php
View
@@ -52,7 +52,7 @@ function delIt2(id) {
'task_log_name', 'task_log_related_url', 'task_log_creator',
'task_log_hours', 'task_log_costcode', 'task_log_description');
$fieldNames = array('Date', 'Ref', 'Summary', 'URL', 'User',
- 'Hours', 'Cost Code', 'Comments', '');
+ 'Hours', 'Cost Code', 'Comments');
$module->storeSettings('tasks', 'task_logs_tasks_view', $fieldList, $fieldNames);
}
28 style/common.css
View
@@ -224,6 +224,10 @@ input[type="checkbox"] {
border: outset #eeeeee 1px;
}
+._description {
+ white-space: normal;
+}
+
.budgets, .budgets input {
text-align: right;
}
@@ -547,4 +551,28 @@ span.cal-item * {
span.cal-item a {
padding-left: 3px;
padding-right: 3px;
+}
+
+.subprojects {
+ background-color: black;
+ border: 0px;
+ text-align: center;
+ white-space:nowrap;
+ width: 100%;
+}
+
+.subprojects tr:nth-child(even) {
+ background-color: #f0f0f0;
+}
+.subprojects tr:nth-child(odd) {
+ background-color: #fff;
+}
+
+.subprojects td.data {
+ background-color: inherit;
+ text-align: inherit;
+}
+
+.subprojects td._name {
+ text-align: left;
}
64 style/w2p-snowball/main.css
View
@@ -86,7 +86,7 @@ input:focus, textarea:focus {
background-color : #FFFFCC;
}
-.button, .crumb ul li a{
+.button, .crumb ul li div, .crumb-right li div {
font-family : tahoma,verdana,arial,Sans-Serif;
color : #666;
text-align : center;
@@ -386,6 +386,10 @@ table.mocal td.weekend {
vertical-align: top;
}
+table.mocal td img {
+ vertical-align: text-top;
+}
+
table.mocal .event {
}
@@ -448,49 +452,35 @@ table.tbl td.event td {
background-color: #fff0b0;
}
+.crumb-right div.crumb ul {
+ float: right;
+}
+
.crumb ul {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
+ margin-left: 5px;
+ padding: 0;
}
.crumb ul li {
- margin: 0px 0px 0px;
- padding: 1px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- color: #000000;
- text-decoration: none;
- display: inline; /* Remove this line arrange the buttons vertically */
+ margin: 2px 2px 2px;
+ font-family:arial,sans-serif;
+ color: #000000;
+ text-decoration: none;
+ display: inline; /* Remove this line arrange the buttons vertically */
+ float: left;
+ height: 22px;
+ padding-right: 5px; /* sliding doors padding */
+ border:0px;
}
.crumb ul li a {
- /*background-color: #F0F0E3; /* Change the background color*/
- background-color : #D4D0C8;
- padding: 2px 3px; /* Increase or decrease width and height */
- margin: 0px;
- display: inline;
- font-family: Verdana, Arial, Helvetica, sans-serif; /* Change the Font of the button */
- font-size: 10px; /* Change the button text size */
- border: 1px solid #D4D0C8; /* Button Border */
color: #000000;
- text-decoration: none;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- border-radius: 4px;
+ display: inline;
}
-.crumb ul li a:active {
- color: #AD0000;
- border-top: 1px solid #BBBB88; /* Button border on mouse over*/
- border-right: 1px solid #DDDDB0; /* Button border on mouse over*/
- border-bottom: 1px solid #DDDDB0; /* Button border on mouse over*/
- border-left: 1px solid #BBBB88; /* Button border on mouse over*/
- border-style: inset;
-}
-.crumb ul li a:hover {
- color: #FFFFFF;
- border: 1px solid #000000; /* Button Border */
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
+.crumb ul li span, .crumb ul li div {
+ display: block;
+ line-height: 14px;
+ padding: 2px 0 5px 10px;
}
-.crumb-right div.crumb {
- margin-top: -10px;
+a.delete div {
+ color: red;
}
74 style/wps-redmond/main.css
View
@@ -16,17 +16,10 @@ BODY {
vertical-align: top;
}
-.module-nav {
- margin-bottom: 7px;
-}
.module-nav .crumb-right {
margin-top: -3px;
}
-div.crumb {
- margin-top: 15px;
-}
-
/* Begin: Header Bar & Navigation for all pages */
div.titlebar {
background: url(images/titlegrad.jpg);
@@ -91,7 +84,7 @@ input:focus, textarea:focus {
background-color : #FFFFCC;
}
-.button{
+.button, .crumb ul li div, .crumb-right li div {
font-family : tahoma,verdana,arial,Sans-Serif;
color : #666;
text-align : center;
@@ -239,6 +232,7 @@ table.std TH {
background-image : url("images/header_bg.png");
background-image : repeat-x;
text-align: center;
+ white-space: nowrap;
}
table.addedit.pref td {
@@ -260,7 +254,6 @@ table.contacts td {
table.contacts td.hilite {
background-color: #ffffff;
- padding: 5px;
}
/* links in header blocks */
@@ -361,7 +354,8 @@ table.mocal td.weekend {
vertical-align: top;
}
-table.mocal .event {
+table.mocal td img {
+ vertical-align: text-top;
}
/* mini calendar - title area */
@@ -428,54 +422,30 @@ table.tbl td.event td {
}
.crumb ul {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
+ margin-left: 5px;
+ padding: 0;
}
.crumb ul li {
- margin: 0px 0px 0px;
- padding: 1px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- color: #000000;
- text-decoration: none;
- display: inline; /* Remove this line arrange the buttons vertically */
+ margin: 2px 2px 2px;
+ font-family:arial,sans-serif;
+ color: #000000;
+ text-decoration: none;
+ display: inline; /* Remove this line arrange the buttons vertically */
+ float: left;
+ height: 22px;
+ padding-right: 5px; /* sliding doors padding */
+ border:0px;
}
.crumb ul li a {
- /*background-color: #F0F0E3; /* Change the background color*/
- background-color : #D4D0C8;
- padding: 2px 3px; /* Increase or decrease width and height */
- margin: 0px;
- display: inline;
- font-family: Verdana, Arial, Helvetica, sans-serif; /* Change the Font of the button */
- font-size: 10px; /* Change the button text size */
- border: 1px solid #D4D0C8; /* Button Border */
color: #000000;
- text-decoration: none;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- border-radius: 4px;
-}
-.crumb ul li a:active {
- color: #AD0000;
- border-top: 1px solid #BBBB88; /* Button border on mouse over*/
- border-right: 1px solid #DDDDB0; /* Button border on mouse over*/
- border-bottom: 1px solid #DDDDB0; /* Button border on mouse over*/
- border-left: 1px solid #BBBB88; /* Button border on mouse over*/
- border-style: inset;
-}
-.crumb ul li a:hover {
- color: #FFFFFF;
- border: 1px solid #000000; /* Button Border */
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- border-radius:4px;
+ display: inline;
}
-
-.crumb-right div.crumb {
- margin-top: -10px;
+.crumb ul li span, .crumb ul li div {
+ display: block;
+ line-height: 14px;
+ padding: 2px 0 5px 10px;
}
-.spacer {
- height: 60px;
- width: 100%;
+a.delete div {
+ color: red;
}
12 style/wps-redmond/overrides.php
View
@@ -104,7 +104,17 @@ function show($extra = '', $js_tabs = false) {
}
function styleRenderBoxTop() {
- return '<div class="spacer">&nbsp;</div>';
+ global $AppUI, $currentInfoTabId, $m;
+ $uistyle = $AppUI->getPref('UISTYLE') ? $AppUI->getPref('UISTYLE') : w2PgetConfig('host_style');
+ if (!$uistyle) {
+ $uistyle = 'web2project';
+ }
+ if ($currentInfoTabId || $m == 'projectdesigner') {
+ return '';
+ }
+ $ret = '<div style="height: 70px">&nbsp;</div>';
+
+ return $ret;
}
function styleRenderBoxBottom() { }

No commit comments for this range

Something went wrong with that request. Please try again.