Skip to content

GitLab

Commit c122a881 authored by Evonne cheung's avatar Evonne cheung Committed by Robert Lyon
Browse files

Design changes for 1504 - from Evonne (Bug #1433776) 



Change-Id: I72e30cc723def00fecf65ea7855e48de5e054d6e
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 92985e6e
Hide whitespace changes
Inline Side-by-side
htdocs/lib/pieforms/pieform/renderers/multicolumntable.php
View file @ c122a881
......@@ -88,7 +88,7 @@ class FormRendererMultiColumnTable {/*{{{*/
}
$toggle = 0;
$datatable = false;
$result = "<table cellspacing=\"0\" border=\"0\"><tbody>\n";
$result = "<table cellspacing=\"0\" border=\"0\" class=\"fullwidth\"><tbody>\n";
foreach ($this->elements as $title => $data) {
if ($datatable) {
$toggle = 1 - $toggle;
......
htdocs/theme/default/static/style/style.css
View file @ c122a881
......@@ -446,29 +446,25 @@ div.pagination a {
/******************** Tertiary navigation ********************/
#tertiary-nav {
font-weight: bold;
background: #cbcbcb url(../images/submenu.gif) repeat-x 0 bottom;
}
#tertiary-nav ul {
margin: 0 auto;
padding: 0;
background: #FFFFFF;
margin: 0;
padding: 10px;
}
#tertiary-nav li {
display: inline-block;
list-style-type: none;
margin: 0;
padding: 0;
vertical-align: middle;
margin: 5px;
}
#tertiary-nav li a,
#tertiary-nav li a:link,
#tertiary-nav li a:visited,
#tertiary-nav li a:active {
display: inline-block;
padding: 5px 10px;
text-decoration: none;
color: #211C00;
border-right: 1px solid #b1b1b1;
border-left: 1px solid #dddddd;
background: #f7f9ee;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
#tertiary-nav li a:hover,
#tertiary-nav li.selected a:hover,
......@@ -481,15 +477,7 @@ div.pagination a {
#tertiary-nav li.selected a:visited,
#tertiary-nav li.selected a:active {
background: #FFFFFF url(../images/submenu-active.gif) repeat-x right top;
color: #4c711d;
border-right: 1px solid #c1c1c1;
border-left: 1px solid #dddddd;
}
#tertiary-nav li:first-child a,
#tertiary-nav li:first-child a:link,
#tertiary-nav li:first-child a:visited,
#tertiary-nav li:first-child a:active {
border-left: 0;
color: #211C00;
}
#tertiary-nav li a:hover,
#tertiary-nav li.selected a:hover,
......
htdocs/theme/raw/artefact/plans/blocktype/plans/templates/content.tpl
View file @ c122a881
{if $tags}<p class="tags s"><strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}</p>{/if}
<p class="detail">{$description}</p>
{if $tags}<p class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}</p>{/if}
{if $tasks.data}
<p>{$description}</p>
<table id="tasktable_{$blockid}" class="plansblocktable fullwidth">
<thead>
<tr>
......@@ -17,5 +17,5 @@
<div id="plans_page_container_{$blockid}" class="nojs-hidden-block">{$tasks.pagination|safe}</div>
{/if}
{else}
<p>{str tag='notasks' section='artefact.plans'}</p>
<p class="message">{str tag='notasks' section='artefact.plans'}</p>
{/if}
htdocs/theme/raw/auth/webservice/static/style/webservice.css
View file @ c122a881
......@@ -37,6 +37,12 @@ img#usersearch {
vertical-align: middle;
}
div.title,
div.title:first-child {
font-weight: bold;
margin-top: 10px;
}
div#verifier {
margin-top: 5px;
......@@ -78,44 +84,37 @@ span.response {
color: #EA33A6;
}
.webserviceconfigcontrols {
width: 70px;
padding: 3px 0 0 5px;
white-space: nowrap;
}
.webserviceconfigcontrols form {
display: inline-block;
margin-left: 5px;
}
#webservices_function_groups_add_service {
margin-right: 3px;
}
.heading {
line-height: 1.25em;
text-align: left;
font-size: 1.167em;
white-space: nowrap;
color: #42637b;
padding: 3px 5px;
font-weight: bold;
border-bottom: 1px solid #CCCCCC;
}
#logsearchformcontainer div {
display: inline-block;
margin-right: 3px;
vertical-align: top;
}
#logsearchformcontainer div label {
margin-right: 5px;
line-height: 28px;
}
#logsearchformcontainer div .select2-display-none {
display: none;
}
#logsearchformcontainer div input,
#logsearchformcontainer div select {
margin-left: 5px;
}
#logsearchform_onlyerrors_container {
display: block !important;
}
#activate_webservices .form-switch,
#activate_webservice_protos_soap .form-switch {
margin: 3px 0;
}
div.function_add,
#user_add {
margin: 10px 0 0 0;
}
\ No newline at end of file
htdocs/theme/raw/static/style/admin.css
View file @ c122a881
......@@ -30,6 +30,14 @@
#msgscol {
width: 50%;
}
#runinstall {
margin-bottom: 15px;
padding: 10px;
background-position: 12px 12px
}
#runinstall h3 {
margin-left: 24px;
}
/* Admin home > Overview */
.admin-warning-box {
background: #FFF3E0;
......@@ -854,4 +862,4 @@ table.iframesources td {
table.iframesources td img {
vertical-align: middle;
}
/* Extensions > Clean URLs */
/* Extensions > Clean URLs */
\ No newline at end of file
htdocs/theme/raw/static/style/progress_meter.css
View file @ c122a881
......@@ -3,49 +3,55 @@
position: absolute;
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.5);
opacity: 0.7;
background-color: #000000;
filter: alpha(opacity=70);
top: 0;
left: 0;
z-index: 9999;
position: fixed;
}
.meter-outline {
background: none repeat scroll 0 0 #fff;
border: 1px solid;
border: 5px solid #DDDDDD;
background-color: #FFFFFF;
position: relative;
padding: 20px;
width: 55%;
left: 22.5%;
top: 45%;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}
.meter-wrap {
left: 25%;
border: 1px solid;
border: 1px solid #999999;
background-color: #d4d4d4;
top: 50%;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.meter-wrap, .meter-value, .meter-text {
/* The width and height of your image */
height: 30px;
height: 40px;
}
.meter-wrap, .meter-value {
/* background: #bdbdbd url(/path/to/your-image.png) top left no-repeat; */
}
.meter-value {
background-color: #cff253;
background: #cff253; /* Old browsers */
background: -moz-linear-gradient(top, #cff253 0%, #9dc70d 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cff253), color-stop(100%,#9dc70d)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #cff253 0%,#9dc70d 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #cff253 0%,#9dc70d 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #cff253 0%,#9dc70d 100%); /* IE10+ */
background: linear-gradient(to bottom, #cff253 0%,#9dc70d 100%); /* W3C */
}
.meter-text {
position: absolute;
left:0;
padding-top: 5px;
padding-top: 12px;
text-align: center;
width: 100%;
font-weight: bold;
......
htdocs/theme/raw/static/style/style.css
View file @ c122a881
......@@ -35,7 +35,9 @@ select,
option,
legend,
fieldset,
button {
button,
.select2-container-multi .select2-choices .select2-search-field input,
.mce-container, .mce-container *, .mce-widget, .mce-widget * {
font-family: Arial, "Nimbus Sans L", Helvetica, sans-serif;
}
#container,
......@@ -468,7 +470,8 @@ thead th {
.bytes th,
.date th,
.password th,
.multitext th {
.multitext th,
.autocomplete th {
padding-top: 8px;
}
td {
......@@ -603,12 +606,15 @@ fieldset,
border-radius: 10px;
border: 1px solid #d1d1d1;
}
.pseudofieldset {
padding: 20px;
}
fieldset.collapsible {
padding: 10px 15px;
margin: 5px 0;
}
.pseudofieldset.collapsible {
padding: 10px 15px;
padding: 20px;
margin: 30px 0;
}
fieldset.collapsed,
......@@ -626,7 +632,6 @@ fieldset.collapsed,
clear: both;
margin-top: 30px;
}
.no-js fieldset.collapsed {
padding: 10px 15px;
-moz-border-radius: 10px;
......@@ -666,7 +671,7 @@ legend h4,
margin: 0;
}
.pseudofieldset .pseudolegend {
margin-top: -20px;
margin-top: -28px;
float: left;
padding: 0 2px;
background-color: #ffffff;
......@@ -729,6 +734,35 @@ select#uploadcsv_authinstance,
select#adduser_authinstance {
max-width: 380px;
}
/* select2 */
.select2-container-multi .select2-choices {
border-top: 1px solid #ABADB3;
border-right: 1px solid #DBDFE6;
border-bottom: 1px solid #E3E9EF;
border-left: 1px solid #E2E3EA;
font-size: 1em;
background: none;
}
.select2-container-multi .select2-choices .select2-search-field input {
margin: 0;
font-size: 1em;
}
.select2-drop {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.select2-results .select2-no-results,
.select2-results .select2-searching,
.select2-results .select2-ajax-error,
.select2-results .select2-selection-limit {
margin: 0;
padding: 3px 5px;
font-size: 0.75em;
}
.select2-results li {
margin: 0;
}
/* radio & checkbox */
.radio,
.checkbox {
......@@ -818,7 +852,6 @@ button.ui-datepicker-trigger {
input.calendar.required {
background-color: #FFF2F2;
}
/* mceEditor */
.mceEditor {
display: inline-block;
......@@ -832,6 +865,13 @@ input.calendar.required {
.mce-stack-layout-item .hidden {
display: none;
}
.mce-menubtn span {
line-height: 16px !important;
font-size: 0.866em;
}
.mce-btn button {
line-height: 16px !important;
}
/* files */
a.btn-addfile {
display: inline-block;
......@@ -1198,6 +1238,9 @@ ul.groupuserstatus li .btn {
vertical-align: top;
cursor: pointer !important;
overflow: hidden;
-webkit-border-radius: 0px !important;
-moz-border-radius: 0px !important;
border-radius: 0px !important;
}
.btn-big-edit {
background: transparent url(../images/btn_edit.png) no-repeat 0 0 !important;
......@@ -1236,6 +1279,9 @@ input#instconf_artefactids_close_upload_browse {
vertical-align: top;
cursor: pointer !important;
float: right;
-webkit-border-radius: 0px !important;
-moz-border-radius: 0px !important;
border-radius: 0px !important;
}
.btn-big-close:hover,
input#editpost_filebrowser_close_upload_browse:hover,
......@@ -1701,17 +1747,18 @@ div.rel {
.main-nav .dropdown-sub li.has-sub a {
background-image: url(../images/expand.png);
background-repeat: no-repeat;
background-position: 100% 50%;
background-position: calc(100% - 8px) 50%;
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
background: none repeat scroll 0 0 #cccccc;
}
#tertiary-nav ul {
margin: 0 auto;
max-width: 1280px;
min-width: 960px;
}
#tertiary-nav ul {
margin: 10px 0 0 0;
padding: 0;
background: none repeat scroll 0 0 #cccccc;
}
#tertiary-nav li {
display: inline-block;
......@@ -1734,6 +1781,10 @@ div.rel {
#tertiary-nav li.selected a:active {
color: #333333;
font-weight: bold;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background: #FFFFFF;
}
/******************** Dropdown tertiary navigation ********************/
.main-nav .dropdown-tertiary {
......@@ -2727,6 +2778,9 @@ tr.incomplete td {
.plantaskdescription {
padding-top: 8px;
}
.plansblocktable .completiondate {
padding-top: 3px;
}
/* Content > My notes */
#notes td.note-name .detail iframe {
overflow-x: hidden;
......@@ -4278,6 +4332,9 @@ form#requestfriendship {
/* Settings > Notifications */
/* Inbox */
#activitylist {
margin: 10px 0;
}
#activitylist th {
vertical-align: bottom;
}
......@@ -4289,7 +4346,7 @@ form#requestfriendship {
#delete_all_notifications {
float: right;
position: relative;
top: -30px;
top: -26px;
}
#delete_all_notifications td {
text-align: right;
......
htdocs/theme/raw/static/style/switchbox.css
View file @ c122a881
......@@ -17,9 +17,9 @@
border: 0;
}
.form-switch .switch-label {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
display: block;
overflow: hidden;
cursor: pointer;
......@@ -38,17 +38,17 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-box-shadow: inset #777 0 1px 1px;
box-shadow: inset #777 0 1px 1px;
-webkit-box-shadow: inset #676767 0 1px 1px;
box-shadow: inset #676767 0 1px 1px;
display: block;
float: left;
width: 50%;
height: 26px;
height: 30px;
padding: 0;
line-height: 26px;
font-size: 14px;
line-height: 30px;
font-size: 1em;
font-weight: normal;
color: white;
text-transform: uppercase;
}
.form-switch .switch-inner:before {
content: "ON";
......@@ -60,21 +60,20 @@
content: "OFF";
padding-right: 10px;
background-color: #BFBFBF;
color: #000000;
color: #494949;
text-align: right;
}
.form-switch .switch-switch {
-webkit-transition: all 0.3s ease-in 0s;
-o-transition: all 0.3s ease-in 0s;
transition: all 0.3s ease-in 0s;
-webkit-box-shadow: 0 1px 0 0 #777;
box-shadow: 0 1px 0 0 #777;
-moz-border-radius: 20px;
-webkit-border-radius: 20px;
border-radius: 20px;
-webkit-box-shadow: 0 1px 1px 0 #777;
box-shadow: 0 1px 1px 0 #777;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
display: block;
width: 10px;
width: 8px;
margin: 6px;
background: #ffffff;
position: absolute;
......
htdocs/theme/views.css
View file @ c122a881
......@@ -809,12 +809,15 @@ ul.artefactchooser-subtabs li.current a:active {
/******************** Configure blockinstance ********************/
.blockinstance.configure {
text-align: left;
padding: 1%;
padding: 10px;
z-index: 12 !important;
font-size: 0.75em;
position: fixed;
overflow-y: auto;
max-height: 90%;
max-height: calc(100% - 100px);
}
.blockinstance.configure .blockinstance-content {
margin-bottom: 20px;
}
#micro .configure {
font-size: 0.75em;
......
htdocs/webservice/admin/index.php
View file @ c122a881
......@@ -310,7 +310,7 @@ function webservices_master_switch_form() {
function webservices_protocol_switch_form() {
// enable/disable separate protocols of SOAP/XML-RPC/REST
$elements = array();
$elements['label'] = array('title' => ' ', 'type' => 'html', 'value' => '<span class="heading">' . get_string('protocol', 'auth.webservice') . '</span>');
$elements['label'] = array('title' => ' ', 'type' => 'html', 'value' => '<div class="title">' . get_string('protocol', 'auth.webservice') . '</div>');
foreach (array('soap', 'xmlrpc', 'rest', 'oauth') as $proto) {
$enabled = (get_config('webservice_' . $proto . '_enabled') || 0);
......@@ -359,7 +359,6 @@ function service_fg_edit_form() {
'servicegroup' => array(
'title' => ' ',
'datatable' => true,
'class' => 'heading',
'type' => 'html',
'value' => get_string('service', 'auth.webservice'),
),
......@@ -489,7 +488,7 @@ function service_fg_edit_form() {
,
'type' => 'html',
'key' => $service->name,
'class' => 'webserviceconfigcontrols',
'class' => 'webserviceconfigcontrols btns2 right',
);
}
}
......@@ -533,7 +532,6 @@ function service_tokens_edit_form() {
'token' => array(
'title' => ' ',
'datatable' => true,
'class' => 'heading',
'type' => 'html',
'value' => get_string('token', 'auth.webservice'),
),
......@@ -682,7 +680,7 @@ function service_tokens_edit_form() {
,
'type' => 'html',
'key' => $token->token,
'class' => 'webserviceconfigcontrols',
'class' => 'webserviceconfigcontrols btns2 right',
);
}
}
......@@ -752,7 +750,6 @@ function service_users_edit_form() {
'username' => array(
'title' => ' ',
'datatable' => true,
'class' => 'heading',
'type' => 'html',
'value' => get_string('username', 'auth.webservice'),
),
......@@ -982,7 +979,7 @@ function get_config_options_extended() {
'elements' => array(
'protos_help' => array(
'type' => 'html',
'value' => '<div>' . get_string('manage_protocols', 'auth.webservice') . '</div>',
'value' => '<div><p>' . get_string('manage_protocols', 'auth.webservice') . '</p></div>',
),
'enablewebserviceprotos' => array(
'type' => 'html',
......@@ -1001,26 +998,26 @@ function get_config_options_extended() {
'elements' => array(
'protos_help' => array(
'type' => 'html',
'value' => '<div>' . get_string('manage_certificates', 'auth.webservice', get_config('wwwroot') . 'admin/site/networking.php') . '</div>',
'value' => '<div><p>' . get_string('manage_certificates', 'auth.webservice', get_config('wwwroot') . 'admin/site/networking.php') . '</p></div>',
),
'pubkey' => array(
'type' => 'html',
'value' => '<div>' . get_string('publickey','admin') . '</div>' .
'<div>' . get_string('publickeydescription2', 'admin', 365) . '</div>' .
'value' => '<div class="title">' . get_string('publickey','admin') . '</div>' .
'<div class="detail">' . get_string('publickeydescription2', 'admin', 365) . '</div>' .
'<pre style="font-size: 0.7em; white-space: pre;">' . $openssl->certificate . '</pre>'
),
'sha1fingerprint' => array(
'type' => 'html',
'value' => '<div>' . get_string('sha1fingerprint', 'auth.webservice', $openssl->sha1_fingerprint) . '</div>',
'value' => '<div><p>' . get_string('sha1fingerprint', 'auth.webservice', $openssl->sha1_fingerprint) . '</p></div>',
),
'md5fingerprint' => array(
'type' => 'html',
'value' => '<div>' . get_string('md5fingerprint', 'auth.webservice', $openssl->md5_fingerprint) . '</div>',
'value' => '<div><p>' . get_string('md5fingerprint', 'auth.webservice', $openssl->md5_fingerprint) . '</p></div>',
),
'expires' => array(
'type' => 'html',