Skip to content
Snippets Groups Projects
Commit 4af91eca authored by Jared Hancock's avatar Jared Hancock
Browse files

Fix merge conflicts with ajax.reports.php

parents a9648019 fe2be7bd
Branches
Tags
No related merge requests found
Showing
with 441 additions and 21 deletions
New stuff in 1.7-dpr3
======================
New stuff in 1.7-dpr2
======================
......
......@@ -379,19 +379,33 @@ body {
font-size: 15px;
margin-left: 0;
padding-left: 0;
border-top:1px solid #ddd;
}
#faq ol li {
list-style: none;
margin: 0 0 10px 0;
margin: 0;
padding:0;
color: #999;
}
#faq ol li a {
display: block;
height: 16px;
display:block;
padding:5px 0;
height:auto !important;
overflow:hidden;
margin:0;
border-bottom:1px solid #ddd;
line-height: 16px;
padding-left: 24px;
background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
}
#faq ol li a:hover {
background-color:#e9f5ff;
}
.article-meta {
padding:5px;
background:#fafafa;
}
/* Knowledgebase */
#kb {
......@@ -401,12 +415,21 @@ body {
}
#kb > li {
margin: 0 0 5px 0;
padding: 10px;
width: auto;
float: left;
clear: both;
list-style: none;
padding:10px;
height:auto !important;
overflow:hidden;
margin:0;
background:url(../images/kb_category_bg.png) bottom left repeat-x;
border-bottom:1px solid #ddd;
}
#kb li i {
display:block;
width:32px;
height:32px;
float:left;
margin-right:6px;
background:url(../images/kb_large_folder.png) top left no-repeat;
}
#kb > li h4 {
......@@ -420,10 +443,51 @@ body {
#kb > li h4 a {
font-size: 14px;
padding-left: 24px;
background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
}
#kb-search {
padding:10px 0;
overflow:hidden;
}
#kb-search div {
clear:both;
overflow:hidden;
padding-top:5px;
}
#kb-search #query {
margin:0;
display:inline-block;
float:left;
width:200px;
margin-right:5px;
}
#kb-search #cid {
margin:0;
display:inline-block;
float:left;
width:200px;
margin-right:5px;
position:relative;
top:2px;
}
#kb-search #topic-id {
margin:0;
display:inline-block;
float:left;
width:410px;
}
#kb-search #searchSubmit {
margin:0;
display:inline-block;
float:left;
position:relative;
top:2px;
}
#breadcrumbs {
color: #333;
......@@ -644,6 +708,13 @@ a.refresh {
font-size: 12px;
padding: 5px;
}
#ticketThread table th span {
font-weight:normal;
color:#888;
padding-left:20px;
}
#ticketThread table td {
padding: 5px;
}
......
assets/default/images/kb_category_bg.png

937 B

assets/default/images/kb_large_folder.png

2.47 KiB

......@@ -28,21 +28,12 @@ define('OSTCLIENTINC',TRUE);
define('ASSETS_PATH',ROOT_PATH.'assets/default/');
//Check the status of the HelpDesk.
if(!is_object($cfg) || !$cfg->getId() || $cfg->isHelpDeskOffline()) {
if(!is_object($cfg) || !$cfg->getId() || $cfg->isHelpDeskOffline() || $cfg->isUpgradePending()) {
include('./offline.php');
exit;
}
//Forced upgrade? Version mismatch.
if(defined('THIS_VERSION') && strcasecmp($cfg->getVersion(),THIS_VERSION)) {
die('System is offline for an upgrade.');
exit;
}
/* include what is needed on client stuff */
require_once(INCLUDE_DIR.'class.client.php');
require_once(INCLUDE_DIR.'class.ticket.php');
......
css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png

260 B

css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png

251 B

css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png

178 B

css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png

104 B

css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png

125 B

css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png

105 B

css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png

3.67 KiB

css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png

90 B

css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png

129 B

css/ui-lightness/images/ui-icons_222222_256x240.png

4.27 KiB

css/ui-lightness/images/ui-icons_228ef1_256x240.png

4.27 KiB

css/ui-lightness/images/ui-icons_ef8c08_256x240.png

4.27 KiB

css/ui-lightness/images/ui-icons_ffd27a_256x240.png

4.27 KiB

css/ui-lightness/images/ui-icons_ffffff_256x240.png

4.27 KiB

This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment