diff --git a/include/client/faq.inc.php b/include/client/faq.inc.php index d0be23c9fd41b1e9d9572bdcdd854623e5e51a0c..a588eff5ff3618828e682f7cd363e8ca15544362 100644 --- a/include/client/faq.inc.php +++ b/include/client/faq.inc.php @@ -9,7 +9,7 @@ $category=$faq->getCategory(); <a href="index.php">All Categories</a> » <a href="faq.php?cid=<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></a> </div> -<div style="width:700;padding-top:2px; float:left;"> +<div style="width:700px;padding-top:2px; float:left;"> <strong style="font-size:16px;"><?php echo $faq->getQuestion() ?></strong> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"></div> diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php index 90b4e31eef10af37b71ba2ebef6edffc9dc63d7b..9f4375ca7f2f5a3979f9cc7bfae1e196e3892b46 100644 --- a/include/staff/apikeys.inc.php +++ b/include/staff/apikeys.inc.php @@ -39,7 +39,7 @@ else ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>API Keys</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php index 1a7316aa961b27f4a081c3f1d146ba5077ace76f..ef58ffda4dbe51a7c206dcbf0c0c6392430fd3f0 100644 --- a/include/staff/cannedresponses.inc.php +++ b/include/staff/cannedresponses.inc.php @@ -46,7 +46,7 @@ else $showing='No premade responses found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Canned Responses</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php index 293388d19485a03f63e71a167e466ac6015ce0a2..ca9d67b5005b325efd9c4004199e6a37e232d9d0 100644 --- a/include/staff/categories.inc.php +++ b/include/staff/categories.inc.php @@ -40,7 +40,7 @@ else $showing='No FAQ categories found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>FAQ Categories</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php index c682219b0331e089a22a6b38054dd83997a38962..f5a153dbc7f312cb68ee9a87cd3e1e4604bc9081 100644 --- a/include/staff/category.inc.php +++ b/include/staff/category.inc.php @@ -3,7 +3,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canManageFAQ()) die('Acc $info=array(); $qstr=''; if($category && $_REQUEST['a']!='add'){ - $title='Update Category :'.$category->getName(); + $title='Update Category: '.$category->getName(); $action='update'; $submit_text='Save Changes'; $info=$category->getHashtable(); diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php index 64b668463e38ca51b39ba9146b8242493687c175..f78f4b3f7ccccf4a0278669c172f4bc569fd767f 100644 --- a/include/staff/departments.inc.php +++ b/include/staff/departments.inc.php @@ -40,7 +40,7 @@ else $showing='No departments found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Departments</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php index 1d44df3ef2de432e915156f91670a899a8cc4be0..d1c07f439dfc91a1612bb408e03eb88e9a48b928 100644 --- a/include/staff/directory.inc.php +++ b/include/staff/directory.inc.php @@ -61,7 +61,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ". //echo $query; ?> <h2>Staff Members</h2> -<div style="width:700; float:left;"> +<div style="width:700px; float:left;"> <form action="directory.php" method="GET" name="filter"> <input type="text" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>" > <select name="did" id="did"> diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php index e5f035d1c254656d112879bd4753aaba7ba0908e..57bc48ff838c92a87fa62cc20eb59d163e21a821 100644 --- a/include/staff/emails.inc.php +++ b/include/staff/emails.inc.php @@ -42,7 +42,7 @@ else $showing='No emails found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Email Addresses</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/faq-category.inc.php b/include/staff/faq-category.inc.php index e7013192e995738c2f9be4f249c3292acac9ab53..f12ed8ae8f3d4c90b0245235525ce4160b6cd836 100644 --- a/include/staff/faq-category.inc.php +++ b/include/staff/faq-category.inc.php @@ -2,7 +2,7 @@ if(!defined('OSTSTAFFINC') || !$category || !$thisstaff) die('Access Denied'); ?> -<div style="width:700;padding-top:10px; float:left;"> +<div style="width:700px;padding-top:10px; float:left;"> <h2>Frequently Asked Questions</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> </div> diff --git a/include/staff/faq-view.inc.php b/include/staff/faq-view.inc.php index ee7d743e4044d93ea18971e055b842985f6f656b..0882197ecac5e223803a0284d08a6c9d5ab0bd55 100644 --- a/include/staff/faq-view.inc.php +++ b/include/staff/faq-view.inc.php @@ -10,7 +10,7 @@ $category=$faq->getCategory(); » <a href="kb.php?cid=<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></a> <span class="faded">(<?php echo $category->isPublic()?'Public':'Internal'; ?>)</span> </div> -<div style="width:700;padding-top:2px; float:left;"> +<div style="width:700px;padding-top:2px; float:left;"> <strong style="font-size:16px;"><?php echo $faq->getQuestion() ?></strong> <span class="faded"><?php echo $faq->isPublished()?'(Published)':''; ?></span> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php index ef1081422c941d1662dbbc3cfe83541a4858a45b..7ccecd79b85172ba7cda8e7d7b34fe179839ed71 100644 --- a/include/staff/filter.inc.php +++ b/include/staff/filter.inc.php @@ -121,7 +121,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); for($i=1; $i<=$n; $i++){ ?> <tr id="r<?php echo $i; ?>"> <td colspan="2"> - <div style="width:700; float:left;"> + <div style="width:700px; float:left;"> <select name="rule_w<?php echo $i; ?>"> <option value="">— Select One ‐</option> <?php diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php index 106f80586a0fe783546c281da38b88b6ba5327d4..1f39697189d11b028b345a87cb3e7b58f39b9f58 100644 --- a/include/staff/filters.inc.php +++ b/include/staff/filters.inc.php @@ -43,7 +43,7 @@ else ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Ticket Filters</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php index 64ea1a5b92ef8fff29238587182675a15c83b191..a100647b00ee88699253aa38186efd1604129a9d 100644 --- a/include/staff/groups.inc.php +++ b/include/staff/groups.inc.php @@ -39,7 +39,7 @@ else $showing='No groups found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>User Groups</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php index 1e15a023c5c964311042d0286b1d34d477944f30..ed927d9fe275e0cb1033ca17ea1bd823c61d6719 100644 --- a/include/staff/helptopics.inc.php +++ b/include/staff/helptopics.inc.php @@ -47,7 +47,7 @@ else $showing='No help topic found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Help Topics</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php index cb5fd243af2ada6e39e53b2b9a274705dd831ed5..a1822e26726a0c6ab9d172a15619434d53ea3707 100644 --- a/include/staff/pages.inc.php +++ b/include/staff/pages.inc.php @@ -47,7 +47,7 @@ else ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Site Pages</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php index 4be25699801138abf371d387138a1d6e2918b03b..43c8ea4fe31ad2be5f76912997e44a05f691ca81 100644 --- a/include/staff/settings-pages.inc.php +++ b/include/staff/settings-pages.inc.php @@ -87,7 +87,8 @@ $pages = Page::getPages(); <img src="../assets/default/images/logo.png" alt="Default Logo" valign="middle" style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5); - margin: 0.5em; height: 5em"/> + margin: 0.5em; height: 5em; + vertical-align: middle"/> </label> </td></tr> <tr> @@ -110,7 +111,8 @@ $pages = Page::getPages(); <img src="image.php?h=<?php echo $logo->getDownloadHash(); ?>" alt="Custom Logo" valign="middle" style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5); - margin: 0.5em; height: 5em;"/> + margin: 0.5em; height: 5em; + vertical-align: middle;"/> </label> <?php if ($logo->getId() != $current) { ?> <label> diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php index a731b7492faa874a43e6aac9c6243faafdeed410..079de4103e5b4de2deda7fa95d8b2ade40c22a41 100644 --- a/include/staff/slaplans.inc.php +++ b/include/staff/slaplans.inc.php @@ -39,7 +39,7 @@ else ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Service Level Agreements</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php index dcf708aa72431a113c0203e72f618d60f8200e1f..8820397524951559a8529c936b7b7cabe29cac53 100644 --- a/include/staff/staffmembers.inc.php +++ b/include/staff/staffmembers.inc.php @@ -55,7 +55,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ". //echo $query; ?> <h2>Staff Members</h2> -<div style="width:700; float:left;"> +<div style="width:700px; float:left;"> <form action="staff.php" method="GET" name="filter"> <input type="hidden" name="a" value="filter" > <select name="did" id="did"> diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php index f63cdb40e6c864657b630b88b4ce059c17ab817e..0d33d7dfb036bcbcae2e2c467ad65d07ca0d3d4b 100644 --- a/include/staff/teams.inc.php +++ b/include/staff/teams.inc.php @@ -38,7 +38,7 @@ else $showing='No teams found!'; ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Teams</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php index 1e1057353bfa82eadaca4d08857d7061fa0ce9fd..8f18d82d84eba62ce396136553c7bd70507c934a 100644 --- a/include/staff/templates.inc.php +++ b/include/staff/templates.inc.php @@ -42,7 +42,7 @@ else ?> -<div style="width:700;padding-top:5px; float:left;"> +<div style="width:700px;padding-top:5px; float:left;"> <h2>Email Templates</h2> </div> <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> diff --git a/scp/css/login.css b/scp/css/login.css index a15d4d12e5b0aec8970d802e0095ad53be00620f..c2512a2bf8cb478236298561a7b88da18ccccd6c 100644 --- a/scp/css/login.css +++ b/scp/css/login.css @@ -1,15 +1,6 @@ -* { - box-sizing: border-box; - position: relative; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -*:focus { - outline-color: rgb(207,16,118); - outline-style: auto; - outline-width: 5px; - z-index:1000; +input:focus { + border: 1px solid rgb(207,16,118); + box-shadow: 0 0 4px rgb(207,16,118); } :-webkit-input-placeholder { @@ -43,7 +34,6 @@ body { body, input { font-family: helvetica, arial, sans-serif; - font-size: 100%/1.5; color: #000; } @@ -59,11 +49,16 @@ input[type=reset], input[type=submit], input[type=button] { border:1px solid #2a67ac; border-right:2px solid #2a67ac; border-bottom:3px solid #2a67ac; + box-shadow: 2px 2px 8px rgba(42, 103, 172, 0.5); background:#fff; width:400px; margin:10% auto 0 auto; padding:1em; + padding-bottom: 1em; text-align:center; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } h1 { @@ -96,23 +91,24 @@ form { fieldset { border:none; - margin:0; + margin:0.25em; padding:0; } fieldset input { display:block; - width:100%; margin-bottom:1em; border:1px solid #ccc; + border:1px solid rgba(0,0,0,0.3); background:#fff; - padding:2px; + padding:2px 4px; + width: 96%; } input.submit { display:inline-block; float:right; - margin:0; + margin:0.25em; height:24px; line-height:24px; font-weight:bold; diff --git a/scp/css/scp.css b/scp/css/scp.css index 27da30ce79989c3007dcf13bf1d50a30ead23dd0..560eaae90a0c87e41d976a05a787ae3a7f2b3fea 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -544,8 +544,6 @@ a.print { } .form_table input[type=radio], .form_table input[type=checkbox] { - position:relative; - top:3px; margin-left:0; padding-left:0; } @@ -1124,7 +1122,7 @@ h2 .reload { #faq { clear: both; margin: 0; - padding: 5 0 10px 5px; + padding: 5px 0 10px 5px; } #faq ol { font-size: 15px;