Commit d3ae6064 authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files
parent f78c3841
......@@ -6,5 +6,5 @@
</tbody>
</table>
{/if}
<a class="morelink" href="{$show_all.url}">{$show_all.message} &raquo;</a>
<div class="morelinkwrap"><a class="morelink" href="{$show_all.url}">{$show_all.message} &raquo;</a></div>
</div>
......@@ -88,7 +88,7 @@
<a href="{$WWWROOT}user/view.php?id={$view.owner}">{$view.sharedby}</a>
{/if}
{if $view.submittedtime}
<span class="date s"> ({str tag=timeofsubmission section=view}: {$view.submittedtime|format_date})</span>
<span class="date s"><br />({str tag=timeofsubmission section=view}: {$view.submittedtime|format_date})</span>
{/if}
<div>{$view.shortdescription}</div>
{if $view.tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$view.owner tags=$view.tags}</div>{/if}
......
......@@ -23,7 +23,7 @@
{/foreach}
</table>
{if $desiredtypes}
<a class="morelink" href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a></div>
<div class="cb"></div>
{/if}
<script>
......
......@@ -14,4 +14,4 @@
</tr>
</table>
{/if}
<a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}">{str tag=gotoforums section=interaction.forum} &raquo;</a>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
......@@ -15,6 +15,6 @@
</tr>
</table>
{/if}
<a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
<div class="cb"></div>
</div>
......@@ -21,5 +21,5 @@
{/if}
</div>
{if !$wholewall}
<a class="morelink" href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'} &raquo;</a>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'} &raquo;</a></div>
{/if}
......@@ -100,6 +100,9 @@
padding: 5px;
margin: 5px 0;
}
.forummods .inlinelist {
vertical-align: middle;
}
.forummods a {
margin-right: 5px;
}
......
......@@ -165,7 +165,8 @@ button,
.buttondk,
input.button,
input.select,
input#files_filebrowser_edit_artefact {
input#files_filebrowser_edit_artefact,
ul.groupuserstatus li a {
background: #0b1962 url(../images/btn-bkgd.gif) repeat-x top;
border-color: #476ee2 #011e3a #011e3a #476ee2;
color: #FFF !important;
......@@ -178,7 +179,8 @@ button:hover,
.buttondk:hover,
input.button:hover,
input.select:hover,
input#files_filebrowser_edit_artefact:hover {
input#files_filebrowser_edit_artefact:hover,
ul.groupuserstatus li a:hover {
background: #012cac url(../images/btn-bkgd-hover.gif) repeat-x top;
border-color: #011e3a #476ee2 #476ee2 #011e3a;
color: #FFF;
......@@ -191,7 +193,8 @@ button:active,
.buttondk:active,
input.button:active,
input.select:active,
input#files_filebrowser_edit_artefact:active {
input#files_filebrowser_edit_artefact:active,
ul.groupuserstatus li a:active {
background: #012cac url(../images/btn-bkgd-hover.gif) repeat-x 1px;
border-color: #011e3a #476ee2 #476ee2 #011e3a;
color: #FFF;
......@@ -390,11 +393,9 @@ ul.in-page-tabs {
line-height: 25px;
height: 25px;
font-size: 12px;
display: block;
}
ul.in-page-tabs li {
margin: 0 3px 0 0 !important;
float: left;
height: 25px;
line-height: 25px;
}
......@@ -403,7 +404,8 @@ ul.in-page-tabs li a:link,
ul.in-page-tabs li a:visited,
ul.in-page-tabs li a:active {
color: #FFF;
padding: 4px 10px 5px 10px;
padding: 4px 10px;
padding: 4px 10px 5px 10px\0/;
text-decoration: none;
background: #00084F;
line-height: 26px;
......@@ -420,7 +422,8 @@ ul.in-page-tabs li a.current-tab:active {
border-left: 1px solid #ddd;
border-top: 1px solid #ddd;
border-right: 1px solid #ddd;
padding: 4px 10px 5px 10px;
border-bottom: 1px solid #FFF;
padding: 4px 10px;
}
.subpage {
......@@ -559,4 +562,11 @@ div.sideblock h3 a:hover {
}
.viewheader .title {
color: #FFF;
}
#containerX #top-wrapper a,
#containerX #top-wrapper a:hover,
#containerX #top-wrapper a:active {
color: #ffffff;
}
\ No newline at end of file
/********************** Top pane of Edit View *************************/
#top-pane {
#top-pane,
#middle-pane,
#page #bottom-pane,
#blocksinstruction {
background: #1D499F;
}
#middle-pane label {
color: #FFFFFF;
}
#blocksinstruction {
font-weight: normal;
font-style: italic;
color: #FFFFFF;
}
/* The tabs that allow you to select a blocktype category */
#category-list ul {
height: 25px;
......
......@@ -143,7 +143,6 @@ ul.in-page-tabs li a.current-tab {
#top-pane,
#layout-link,
#btn-displaymyview,
#blocksinstruction,
.blockinstance-controls input {
display: none;
......
......@@ -144,7 +144,8 @@ button,
.buttondk,
input.button,
input.select,
input#files_filebrowser_edit_artefact {
input#files_filebrowser_edit_artefact,
ul.groupuserstatus li a {
border-color: #d5ed8a #496000 #496000 #d5ed8a;
background: #547b23 url(../images/btn-bkgd.gif) repeat-x left top;
color: #FFF !important;
......@@ -157,7 +158,8 @@ button:hover,
.buttondk:hover,
input.button:hover,
input.select:hover,
input#files_filebrowser_edit_artefact:hover {
input#files_filebrowser_edit_artefact:hover,
ul.groupuserstatus li a:hover {
background: #94a44a url(../images/btn-bkgd-hover.gif) repeat-x left top;
text-decoration: none;
}
......@@ -169,7 +171,8 @@ button:active,
.buttondk:active,
input.button:active,
input.select:active,
input#files_filebrowser_edit_artefact:active {
input#files_filebrowser_edit_artefact:active,
ul.groupuserstatus li a:active {
border-color: #496000 #d5ed8a #d5ed8a #496000;
background: #94a44a url(../images/btn-bkgd-hover.gif) repeat-x left 1px;
color: #FFF;
......
......@@ -186,7 +186,8 @@ button,
.buttondk,
input.button,
input.select,
input#files_filebrowser_edit_artefact {
input#files_filebrowser_edit_artefact,
ul.groupuserstatus li a {
background: #1b3b46 url(../images/mainnav-bg.gif) repeat-x center;
border-color: #386d82 #1A292F #1A292F #386d82;
color: #FFF !important;
......@@ -199,7 +200,8 @@ button:hover,
.buttondk:hover,
input.button:hover,
input.select:hover,
input#files_filebrowser_edit_artefact:hover {
input#files_filebrowser_edit_artefact:hover,
ul.groupuserstatus li a:hover {
color: #FFF;
text-decoration:none;
background: #254e5c url(../images/mainnav-bg-hover.gif) repeat-x center;
......@@ -213,7 +215,8 @@ button:active,
.buttondk:active,
input.button:active,
input.select:active,
input#files_filebrowser_edit_artefact:active {
input#files_filebrowser_edit_artefact:active,
ul.groupuserstatus li a:active {
background: #254e5c url(../images/mainnav-bg-hover.gif) repeat-x center;
border-color: #1A292F #386d82 #386d82 #1A292F;
color: #FFF;
......
/* Views */
/********************** Top pane of Edit View *************************/
#top-pane,
#middle-pane,
#page #bottom-pane,
#blocksinstruction {
background: #1C3740;
}
/* The tabs that allow you to select a blocktype category */
#category-list {
margin-left:10px;
}
#category-list li {
margin: 0 3px 0 0;
margin: 0 3px 0 0 !important;
float: left;
height: 25px;
background: none;
line-height: 25px;
}
#category-list li a,
#category-list li a:link,
#category-list li a:visited,
#category-list li a:active {
border: 0;
background: #1C3740;
color: #FFF;
font-weight: normal;
padding: 5px 10px 6px 10px;
background: #1C3740 url(../images/mainnav-bg.gif) repeat-x center;
}
#category-list li a:hover {
color: #BEE3F1;
color: #FFF;
background: #1C3740 url(../images/mainnav-bg.gif) repeat-x center;
text-decoration: underline;
}
#category-list li.current a,
#category-list li.current a:link,
#category-list li.current a:visited,
#category-list li.current a:active {
background: #00AEF1;
color: #FFF;
color: #FFF;
font-weight: bold;
padding: 5px 10px 6px 10px;
background: #00AEF1 url(../images/subnav-bg.gif) repeat-x center;
}
/* The panel that contains the blocktype icons */
......@@ -34,6 +50,9 @@
.blocktype div {
color: #BEE3F1;
}
#column-container {
background: #080D0F;
}
/********************** Bottom pane of Edit View *************************/
......
......@@ -148,7 +148,6 @@ ul.in-page-tabs li a.current-tab {
#top-pane,
#layout-link,
#btn-displaymyview,
#blocksinstruction,
.blockinstance-controls input {
display: none;
......
......@@ -29,11 +29,9 @@ body {
body, caption, th, td, input, textarea, select, option, legend, fieldset, button {
font-family: Arial, "Nimbus Sans L", Helvetica, sans-serif;
}
pre, code {
pre, code, tt {
font-size: 1.1667em; /* Monospace fonts can be hard to read */
font-family: "Courier New", "DejaVu Sans Mono", monospace;
}
pre, tt {
white-space: pre-wrap;
}
body#micro {
......@@ -201,7 +199,7 @@ td.narrow {
border-bottom: 1px solid #ccc;
}
/* table with tfoot border-top */
#searchresults tfoot td, #adminstitutionslist tfoot td, #profileicons tfoot td, #activitylist tfoot td {
#searchresults tfoot td, #adminstitutionslist tfoot td, #profileicons tfoot td, #activitylist tfoot td, .tag-results #results {
border-top: 1px solid #ccc;
}
/* table with gap between rows */
......@@ -377,6 +375,8 @@ select {
fieldset {
padding: 10px 15px;
margin: 5px 0;
border-radius: 10px;
-moz-border-radius: 10px;
}
* html fieldset {
width: 90%;
......@@ -392,6 +392,9 @@ fieldset.collapsed {
margin: 0;
border: 0;
}
fieldset table {
margin-top: 10px;
}
fieldset.collapsed div, fieldset.collapsed table {
position: absolute;
display: none;
......@@ -442,8 +445,8 @@ input.error, select.error {
.errmsg {
color: #dd0221;
font-size: .9167em;
background: #ffd3d9 url(../images/failure.gif) no-repeat 4px 4px;
padding-left: 24px !important;
background: #ffd3d9 url(../images/failure.gif) no-repeat 4px 3px;
padding: 3px 3px 3px 24px !important;
}
.postedon {
color: #888;
......@@ -470,6 +473,7 @@ input.submit, input.cancel, button, .buttondk, input.button, input.select, input
cursor: default;
color: #333;
* overflow: visible;
* width: 1;
}
/** links that need to look like buttons **/
.btn {
......@@ -485,6 +489,7 @@ input.submit, input.cancel, button, .buttondk, input.button, input.select, input
cursor: default;
color: #333;
* overflow: visible;
* width: 1;
}
/** hover for buttons **/
.btn:hover, input.submit:hover, input.cancel:hover, button:hover, .buttondk:hover, input.button:hover, input.select:hover, input#files_filebrowser_edit_artefact:hover {
......@@ -527,6 +532,13 @@ div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.
line-height: 2.1em;
* width: 1;
* overflow: visible;
* display: block;
* height: 30px;
}
.rbuttons a {
* width: 1;
* overflow: visible;
* display: block;
}
.viewheader .rbuttons {
line-height: 1.8em;
......@@ -572,10 +584,10 @@ div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.
#usf_submit {
border-color: #a3a3a3 #a3a3a3 #a3a3a3 #e3e3e3;
margin: 0;
padding: 2px 3px;
background: #c6c5d7 url(../images/btn-bkgd.gif) repeat-x left top;
border-width: 1px 1px 1px 0;
* border-width: 1px 1px 1px 1px;
padding: 2px 3px;
* padding: 1px 3px 1px 3px;
color: #333;
cursor: pointer;
font-size: 1em;
......@@ -587,7 +599,7 @@ div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.
border-color: #7d99ae #003c74 #003c74 #7d99ae;
margin: 0;
padding: 3px;
* padding: 0 3px 0 3px;
* padding: 1px 3px 1px 3px;
background: #c6c5d7 url(../images/btn-bkgd.gif) repeat-x left top;
border-width: 1px 1px 1px 1px;
color: #333;
......@@ -670,7 +682,6 @@ a.btn-big-del {
.btn-pending {
background: transparent url(../images/icon-pending.gif) no-repeat 3px center;
padding-left: 17px !important;
color: #888;
}
.btn-login {
background: transparent url(../images/icon-login.gif) no-repeat left center;
......@@ -864,7 +875,7 @@ div.rbuttons .small-logo {
}
#usf_query_container input {
width: 130px;
padding: 2px 3px;
padding: 2px 3px 3px 3px;
}
* html #usf_query_container input {
padding: 2px;
......@@ -961,7 +972,7 @@ ul.edit-view-tabs li {
}
ul.in-page-tabs li a, ul.in-page-tabs li a:link, ul.in-page-tabs li a:visited, ul.in-page-tabs li a:active,
ul.edit-view-tabs li a, ul.edit-view-tabs li a:link, ul.edit-view-tabs li a:visited, ul.edit-view-tabs li a:active {
padding: 3px 10px;
padding: 4px 10px;
background: #EEEEEE;
text-decoration: none;
}
......@@ -973,9 +984,6 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
padding: 4px 10px;
cursor: default;
}
ul.edit-view-tabs li.displaymyview {
margin: 0 !important;
}
.subpage {
border: 1px solid #d1d1d1;
padding: 10px !important;
......@@ -1176,7 +1184,7 @@ div.sideblock ul li {
padding: 0;
}
#sb-onlineusers li {
line-height: 2.1em;
line-height: 2.3333em;
}
#lastminutes {
float: right;
......@@ -1440,7 +1448,7 @@ a.tag {
}
.userlisttable tbody tr th {
text-align: left !important;
padding: 3px 0 !important;
padding: 0 !important;
font-size: 1em;
color: #333;
}
......@@ -1498,10 +1506,10 @@ table.attachments td {
background: url(../images/privatebg.gif) repeat top left;
}
#wall .wallpostdelete {
background: url(../images/mini-delete.gif) no-repeat;
background: transparent url(../images/remove-block.png) no-repeat left top;
border: 0;
width: 9px;
height: 9px;
width: 16px;
height: 16px;
cursor: pointer;
float: right;
font-size: 1%;
......@@ -1509,6 +1517,7 @@ table.attachments td {
}
.wallpost .userinfo {
float: left;
line-height: 2em;
}
.wallpost .userinfo img {
float: left;
......@@ -1517,6 +1526,7 @@ table.attachments td {
}
.wallpost .text {
margin-left: 31px;
margin-right: 20px;
margin-bottom: 3px;
font-size: .9167em;
clear: left;
......@@ -1849,6 +1859,10 @@ table.attachments td {
#export #whattoexport-buttons div {
padding-bottom: 3px;
}
#export .element div label,
#export #whattoexport-buttons div label {
line-height: 1.6667em;
}
#export #whatviewsselection {
width: 96%;
margin: 0 auto;
......@@ -1897,41 +1911,86 @@ p.progress-text {
}
/* My Groups *//* My Friends */
ul.groupuserstatus {
width: 180px;
font-size: .9167em;
margin: 0 0 0 10px;
position: absolute;
right: 0;
top: 0;
font-size: 1em;
margin: 0;
color: #888888;
z-index: 2;
}
.grouphomepage .group-info .admincontrol {
display: none;
ul.groupuserstatus li {
list-style: none;
margin: 0;
padding: 0;
text-align: right;
}
.grouphome-admincontrol {
ul.groupuserstatus li a {
font-size: 1em;
line-height: 2.3333em;
border-width: 1px;
border-style: solid;
border-color: #7d99ae #003c74 #003c74 #7d99ae;
margin: 0;
padding: 3px 5px;
background: #c6c5d7 url(../images/btn-bkgd.gif) repeat-x left top;
text-decoration: none;
cursor: default;
color: #333;
* overflow: visible;
}
.admincontrol {
text-align:right;
ul.groupuserstatus li a:hover {
background: #FFF url(../images/btn-bkgd-hover.gif) repeat-x left top;
text-decoration: none;
cursor: default;
}
.planstatus {
width: 180px;
text-align: right;
ul.groupuserstatus li a:active {
border-color: #003c74 #7d99ae #7d99ae #003c74;
background: #FFF url(../images/btn-bkgd-hover.gif) repeat-x left top;
}
.jointhisgroup form.pieform table th {
padding: 0;
#findgroups .findgroupsdetails,
#mygroups .mygroupsdetails {
margin-right: 200px;
}
#findgroups ul.groupuserstatus,
#mygroups ul.groupuserstatus {
width: 185px;
font-size: .9167em;
line-height: 1.2em;
margin: 0;
color: #888888;
position: inherit;
* position: relative;
}
.jointhisgroup form table td {
#findgroups ul.groupuserstatus li,
#mygroups ul.groupuserstatus li {
list-style: none;
margin: 0;
padding: 0;
width: 180px;
text-align: right;
}
.jointhisgroup form table td input {
border: 0;
background: transparent url(../images/icon-request.gif) no-repeat 3px center;
padding-left: 13px;
cursor: pointer;
color: #0000CC !important;
ul.groupuserstatus form,
ul.groupuserstatus table {
text-align: right;
float: right;
}
.jointhisgroup form table td input:hover {
border: 0;
background: transparent url(../images/icon-request.gif) no-repeat 3px center;
padding-left: 13px;
cursor: pointer;
ul.groupuserstatus table th,
ul.groupuserstatus table td {
border-bottom: 0;
background: none;
padding: 0 !important;
text-align: right;
}
.invite form#invite {
float: none;
}
/*.grouphomepage .group-info .admincontrol {
display: none;
}*/
.planstatus {
width: 180px;
text-align: right;
}
.friendinfo li.approvefriend form input {
border: 0;
......@@ -1975,13 +2034,13 @@ div.groupbox ul {
div.groupbox li.last {
margin-top: 5px;
}
ul.groupuserstatus li, #friendslist ul.actionlist li {
#friendslist ul.actionlist li {