Commit 14755331 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Raw theme: Remove remaining crud from style.css

parent cf0f9d37
......@@ -41,6 +41,7 @@ if (!empty($member)) {
foreach ($member as $i) {
$elements[] = array(
'type' => 'submit',
'class' => 'btn-del',
'name' => '_leave_' . $i->institution,
'confirm' => get_string('reallyleaveinstitution'),
'title' => get_string('youareamemberof', 'mahara',
......
......@@ -39,6 +39,7 @@ $wwwroot = get_config('wwwroot');
$enc_delete = json_encode(get_string('delete', 'artefact.blog'));
$enc_confirmdelete = json_encode(get_string('deleteblog?', 'artefact.blog'));
$enc_addpost = json_encode(get_string('addpost', 'artefact.blog'));
$enc_settings = json_encode(get_string('settings', 'artefact.blog'));
// This JavaScript creates a table to display the blog entries.
$js = <<<EOF
......@@ -59,10 +60,11 @@ var bloglist = new TableRenderer(
return td;
},
function (r) {
var deleteButton = BUTTON(null, {$enc_delete});
var deleteButton = A({'class': 'btn-del', 'href': ''}, {$enc_delete});
connect(deleteButton, 'onclick', function (e) {
e.stop();
if (!confirm({$enc_confirmdelete})) {
return;
return false;
}
sendjsonrequest(
'index.json.php',
......@@ -75,11 +77,14 @@ var bloglist = new TableRenderer(
bloglist.doupdate();
}
);
return false;
});
return TD(null, deleteButton);
},
function(r) {
return TD(null, DIV({'class':'addicon fr'}, A({'href':'{$wwwroot}artefact/blog/post.php?blog=' + r.id}, {$enc_addpost})));
return TD(null, [
deleteButton,
DIV(null, A({'class': 'btn-edit', 'href':'{$wwwroot}artefact/blog/settings/?id=' + r.id}, {$enc_settings})),
A({'class': 'btn-add', 'href':'{$wwwroot}artefact/blog/post.php?blog=' + r.id}, {$enc_addpost})
]);
}
]
);
......
{include file="header.tpl"}
<div id="myblogs">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
</span>
<div id="myblogs rel">
<div class="rbuttons">
<a class="btn-add" href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
</div>
<table id="bloglist" class="hidden tablerenderer fullwidth">
<thead>
<tr>
......
{include file="header.tpl"}
<div id="myblogs">
<div id="myblogs rel">
<span class="addicon fr">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</span>
<div class="rbuttons">
<div><a class="btn-add" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a></div>
<div><a class="btn-edit" href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a></div>
</div>
<p>{$blog->get('description')}</p>
......
......@@ -18,16 +18,8 @@
<tr>
<th><label>{str tag=tags}</label></th>
<td>
<div>
<table class="help-wrapper">
<tbody>
<tr>
<td><input name="{$prefix}_edit_tags" size="40" id="{$prefix}_edit_tags" value="{foreach from=$fileinfo->tags item=tag name=tags}{if !$smarty.foreach.tags.first}, {/if}{$tag}{/foreach}" /></td>
<td class="helpcontainer"><span>{contextualhelp plugintype='artefact' pluginname='file' section='tags'}</span></td>
</tr>
</tbody>
</table>
</div>
<input name="{$prefix}_edit_tags" size="40" id="{$prefix}_edit_tags" value="{foreach from=$fileinfo->tags item=tag name=tags}{if !$smarty.foreach.tags.first}, {/if}{$tag}{/foreach}" />
<span>{contextualhelp plugintype='artefact' pluginname='file' section='tags'}</span>
</td>
</tr>
{if $groupinfo}
......
......@@ -84,3 +84,8 @@ form#files .filelist td {
font-size: 11px;
padding: 3px 0;
}
.filelist .disabled {
color: #C3C3C3;
}
......@@ -98,6 +98,7 @@ if ($forums && $membership) {
'elements' => array(
'submit' => array(
'type' => 'submit',
'class' => 'btn-subscribe',
'value' => $forum->subscribed ? get_string('Unsubscribe', 'interaction.forum') : get_string('Subscribe', 'interaction.forum'),
'help' => $i == 0 ? true : false
),
......
......@@ -43,7 +43,7 @@
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id|escape}&amp;returnto=index" id="btn-delete">{str tag=delete}</a>
</td>
{/if}
{if $forum->subscribe}<td class="nowrap">{$forum->subscribe}</td>{/if}
{if $forum->subscribe}<td class="nowrap s">{$forum->subscribe}</td>{/if}
</tr>
{/foreach}
</table>
......
......@@ -41,6 +41,16 @@
#subscribe_topic div {
display: inline;
}
.btn-subscribe input.submit {
background: url(../images/icon-subscribe.gif) no-repeat left 5px;
font-weight: bold;
font-size: 0.9em;
height: 1.8em;
padding-left: 1em;
cursor: pointer;
border: none;
}
.nowrap {
white-space: nowrap;
......
......@@ -149,6 +149,7 @@ if ($membership) {
'elements' => array(
'submit' => array(
'type' => 'submit',
'class' => 'btn-subscribe',
'value' => $forum->subscribed ? get_string('unsubscribefromforum', 'interaction.forum') : get_string('subscribetoforum', 'interaction.forum'),
'help' => true
),
......
......@@ -567,31 +567,6 @@ function keepElementInViewport(element) {
}
}
// this function creates a pre-augmented tags control
function create_tags_control(name, value, options) {
var elements = [];
options = update({
'size': 40
},
options
);
if (typeof(value) == 'object') {
value = value.join(', ');
}
if (!value) {
value = '';
}
var tagControl = INPUT({'name': name, 'size': options.size, 'value': value});
var tagshelp = SPAN(null); tagshelp.innerHTML = get_string('tags.help');
elements.push(augment_tags_control(tagControl, true));
elements.push(TABLE({'class': 'help-wrapper'}, TBODY(null, TR(null, TD(null, tagControl), TD({'class': 'helpcontainer'}, tagshelp)))));
return DIV(null, elements);
}
// this function takes an existing input element and augments it
function augment_tags_control(elem, returnContainer) {
elem = getElement(elem);
......
/* fieldset.collapsed .mceEditor {
display: none;
}
fieldset.collapsed .mceEditor td {
border: 0;
}*/
This diff is collapsed.
......@@ -31,7 +31,6 @@
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-delete" type="button" value="{str tag='delete'}" onClick="{$markdel}" />
</div>
<div id="messagediv"></div></td>
</tr>
</tfoot>
</table>
......
{include file="header.tpl"}
<div id="column-full">
<div class="maincontent">
<h2>{str tag="changepassword"}</h2>
<h1>{str tag="changepassword"}</h1>
<p>{str tag="changepasswordinfo"}</p>
{if $loginasoverridepasswordchange}<div class="message">{$loginasoverridepasswordchange}</div>{/if}
{$change_password_form}
</div>
</div>
{include file="footer.tpl"}
......@@ -11,7 +11,7 @@
</div>
<div id="selfsearchresults">
<h3>{str tag="Results"}</h3>
<table id="searchresults" class="hidden tablerenderer">
<table id="searchresults" class="hidden tablerenderer fullwidth">
<tbody>
</tbody>
</table>
......
......@@ -56,7 +56,7 @@
{/if}
</ul>
<div class="center">
<a href="{$WWWROOT}?logout" class="btn-link" id="btn-logout">{str tag="logout"}</a>
<a href="{$WWWROOT}?logout" class="btn-link" id="btn-logout">{str tag="logout"}</a>&nbsp;
<a href="{$WWWROOT}account/" class="btn-link">{str tag="settings"}</a>
</div>
{if $USERMASQUERADING} <div id="changeuser">{$becomeyouagain}</div>
......
......@@ -242,14 +242,14 @@ function editaccess_validate(Pieform $form, $values) {
$loggedinaccess = false;
if ($values['accesslist']) {
foreach ($values['accesslist'] as &$item) {
if (!isset($item['startdate'])) {
if (empty($item['startdate'])) {
$item['startdate'] = null;
}
else if (!$item['startdate'] = strtotime($item['startdate'])) {
$form->set_error('accesslist', get_string('unrecogniseddateformat', 'view'));
break;
}
if (!isset($item['stopdate'])) {
if (empty($item['stopdate'])) {
$item['stopdate'] = null;
}
else if (!$item['stopdate'] = strtotime($item['stopdate'])) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment